Renamed BsonDocumentWrapper document property to wrappedDocument

jyemin · jyemin · commit 01a259ba8df7 · 2014-06-13T10:51:58.000-04:00
diff --git a/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java b/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java
@@ -59,7 +59,7 @@ public void encode(final BsonWriter writer, final BsonDocumentWrapper value) {
             bsonDocumentCodec.encode(writer, value);
         } else {
             Encoder encoder = value.getEncoder();
-            encoder.encode(writer, value.getDocument());
+            encoder.encode(writer, value.getWrappedDocument());
         }
     }
 
diff --git a/bson/src/main/org/bson/types/BsonDocumentWrapper.java b/bson/src/main/org/bson/types/BsonDocumentWrapper.java
@@ -39,26 +39,26 @@ public class BsonDocumentWrapper<T> extends BsonDocument {
 
     private static final long serialVersionUID = 4164303588753136248L;
 
-    private final transient T document;
+    private final transient T wrappedDocument;
     private final transient Encoder<T> encoder;
     private BsonDocument unwrapped;
 
     /**
      * Construct a new instance with the given document and encoder for the document.
      *
-     * @param document the wrapped document
+     * @param wrappedDocument the wrapped document
      * @param encoder  the encoder for the wrapped document
      */
-    public BsonDocumentWrapper(final T document, final Encoder<T> encoder) {
-        if (document == null) {
+    public BsonDocumentWrapper(final T wrappedDocument, final Encoder<T> encoder) {
+        if (wrappedDocument == null) {
             throw new IllegalArgumentException("Document can not be null");
         }
-        this.document = document;
+        this.wrappedDocument = wrappedDocument;
         this.encoder = encoder;
     }
 
-    public T getDocument() {
-        return document;
+    public T getWrappedDocument() {
+        return wrappedDocument;
     }
 
     public Encoder<T> getEncoder() {
@@ -151,7 +151,7 @@ private BsonDocument getUnwrapped() {
         if (unwrapped == null) {
             BsonDocument unwrapped = new BsonDocument();
             BsonWriter writer = new BsonDocumentWriter(unwrapped);
-            encoder.encode(writer, document);
+            encoder.encode(writer, wrappedDocument);
             this.unwrapped = unwrapped;
         }
         return unwrapped;
diff --git a/driver/src/main/org/mongodb/operation/BsonDocumentWrapperHelper.java b/driver/src/main/org/mongodb/operation/BsonDocumentWrapperHelper.java
@@ -30,7 +30,7 @@ final class BsonDocumentWrapperHelper {
     static <T> List<T> toList(final BsonArray array) {
         List<T> list = new ArrayList<T>();
         for (BsonValue cur : array) {
-            list.add(((BsonDocumentWrapper<T>) cur).getDocument());
+            list.add(((BsonDocumentWrapper<T>) cur).getWrappedDocument());
         }
         return list;
     }
@@ -40,7 +40,7 @@ static <T> T toDocument(final BsonDocument document) {
         if (document == null) {
             return null;
         }
-        return ((BsonDocumentWrapper<T>) document).getDocument();
+        return ((BsonDocumentWrapper<T>) document).getWrappedDocument();
     }
 
     private BsonDocumentWrapperHelper() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void encode(final BsonWriter writer, final BsonDocumentWrapper value) {`
`59`	`59`	`bsonDocumentCodec.encode(writer, value);`
`60`	`60`	`} else {`
`61`	`61`	`Encoder encoder = value.getEncoder();`
`62`		`- encoder.encode(writer, value.getDocument());`
	`62`	`+ encoder.encode(writer, value.getWrappedDocument());`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ final class BsonDocumentWrapperHelper {`
`30`	`30`	`static <T> List<T> toList(final BsonArray array) {`
`31`	`31`	`List<T> list = new ArrayList<T>();`
`32`	`32`	`for (BsonValue cur : array) {`
`33`		`- list.add(((BsonDocumentWrapper<T>) cur).getDocument());`
	`33`	`+ list.add(((BsonDocumentWrapper<T>) cur).getWrappedDocument());`
`34`	`34`	`}`
`35`	`35`	`return list;`
`36`	`36`	`}`
`@@ -40,7 +40,7 @@ static <T> T toDocument(final BsonDocument document) {`
`40`	`40`	`if (document == null) {`
`41`	`41`	`return null;`
`42`	`42`	`}`
`43`		`- return ((BsonDocumentWrapper<T>) document).getDocument();`
	`43`	`+ return ((BsonDocumentWrapper<T>) document).getWrappedDocument();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private BsonDocumentWrapperHelper() {`