JAVA-877: move org.bson.LazyDBList to com.mongodb

trnl · trnl · commit 93271bbde0f4 · 2013-08-15T14:28:47.000+03:00
diff --git a/src/main/com/mongodb/DBCollection.java b/src/main/com/mongodb/DBCollection.java
@@ -19,8 +19,6 @@
 package com.mongodb;
 
 // Mongo
-
-import org.bson.LazyDBList;
 import org.bson.types.ObjectId;
 
 import java.util.ArrayList;
diff --git a/src/main/com/mongodb/LazyDBCallback.java b/src/main/com/mongodb/LazyDBCallback.java
@@ -16,6 +16,7 @@
 package com.mongodb;
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.logging.Logger;
 
 import org.bson.LazyBSONCallback;
@@ -45,6 +46,11 @@ public Object createObject( byte[] data, int offset ){
         return o;
     }
 
+    @Override
+    public List createArray(byte[] data, int offset) {
+        return new LazyDBList(data, offset, this);
+    }
+
     public Object createDBRef( String ns, ObjectId id ){
         return new DBRef( _db, ns, id );
     }
diff --git a/src/main/com/mongodb/LazyDBList.java b/src/main/com/mongodb/LazyDBList.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2008 - 2013 10gen, Inc. <http://10gen.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb;
+
+import org.bson.LazyBSONCallback;
+import org.bson.io.BSONByteBuffer;
+
+public class LazyDBList extends org.bson.LazyDBList {
+
+    public LazyDBList(final byte[] data, final LazyBSONCallback callback) {
+        super(data, callback);
+    }
+
+    public LazyDBList(final byte[] data, final int offset, final LazyBSONCallback callback) {
+        super(data, offset, callback);
+    }
+
+    public LazyDBList(final BSONByteBuffer buffer, final LazyBSONCallback callback) {
+        super(buffer, callback);
+    }
+
+    public LazyDBList(final BSONByteBuffer buffer, final int offset, final LazyBSONCallback callback) {
+        super(buffer, offset, callback);
+    }
+}
diff --git a/src/main/org/bson/LazyBSONCallback.java b/src/main/org/bson/LazyBSONCallback.java
@@ -64,7 +64,7 @@ public Object createObject( byte[] data, int offset ){
 
     @SuppressWarnings("rawtypes")
 	public List createArray( byte[] data, int offset ){
-        return new LazyDBList( data, offset, this );
+        return new LazyBSONList( data, offset, this );
     }
 
     public Object createDBRef( String ns, ObjectId id ){
diff --git a/src/main/org/bson/LazyDBList.java b/src/main/org/bson/LazyDBList.java
@@ -10,8 +10,9 @@
 
 /**
  * @author scotthernandez
- *
+ * @deprecated Please use {@link com.mongodb.LazyDBList} instead.
  */
+@Deprecated
 public class LazyDBList extends LazyBSONList implements DBObject {
     private static final long serialVersionUID = -4415279469780082174L;
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public Object createObject( byte[] data, int offset ){`
`64`	`64`
`65`	`65`	`@SuppressWarnings("rawtypes")`
`66`	`66`	`public List createArray( byte[] data, int offset ){`
`67`		`- return new LazyDBList( data, offset, this );`
	`67`	`+ return new LazyBSONList( data, offset, this );`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public Object createDBRef( String ns, ObjectId id ){`