Removed un-needed parameter and made some protected methods private

jyemin · jyemin · commit 0e446bd09002 · 2014-06-13T10:51:58.000-04:00
diff --git a/driver/src/main/org/mongodb/codecs/DocumentCodec.java b/driver/src/main/org/mongodb/codecs/DocumentCodec.java
@@ -127,6 +127,26 @@ public void encode(final BsonWriter writer, final Document document) {
         writer.writeEndDocument();
     }
 
+    @Override
+    public Document decode(final BsonReader reader) {
+        Document document = new Document();
+
+        reader.readStartDocument();
+        while (reader.readBSONType() != BsonType.END_OF_DOCUMENT) {
+            String fieldName = reader.readName();
+            document.put(fieldName, readValue(reader));
+        }
+
+        reader.readEndDocument();
+
+        return document;
+    }
+
+    @Override
+    public Class<Document> getEncoderClass() {
+        return Document.class;
+    }
+
     private void beforeFields(final BsonWriter bsonWriter, final Document document) {
         if (document.containsKey(ID_FIELD_NAME)) {
             bsonWriter.writeName(ID_FIELD_NAME);
@@ -139,7 +159,7 @@ private boolean skipField(final String key) {
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
-    protected void writeValue(final BsonWriter writer, final Object value) {
+    private void writeValue(final BsonWriter writer, final Object value) {
         if (value == null) {
             writer.writeNull();
         } else {
@@ -148,22 +168,7 @@ protected void writeValue(final BsonWriter writer, final Object value) {
         }
     }
 
-    @Override
-    public Document decode(final BsonReader reader) {
-        Document document = new Document();
-
-        reader.readStartDocument();
-        while (reader.readBSONType() != BsonType.END_OF_DOCUMENT) {
-            String fieldName = reader.readName();
-            document.put(fieldName, readValue(reader, fieldName));
-        }
-
-        reader.readEndDocument();
-
-        return document;
-    }
-
-    protected Object readValue(final BsonReader reader, final String fieldName) {
+    private Object readValue(final BsonReader reader) {
         BsonType bsonType = reader.getCurrentBsonType();
         if (bsonType == BsonType.NULL) {
             reader.readNull();
@@ -172,10 +177,4 @@ protected Object readValue(final BsonReader reader, final String fieldName) {
             return registry.get(bsonTypeClassMap.get(bsonType)).decode(reader);
         }
     }
-
-    @Override
-    public Class<Document> getEncoderClass() {
-        return Document.class;
-    }
-
 }
