immutable ContainerNodes to avoid deep copies

Note, this requires Jackson 2.7.x.
maxmind · Jan 12, 2016 · 945605b · 945605b
1 parent 3490a7d
commit 945605b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.6.4</version>
+            <version>2.7.0</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/src/main/java/com/maxmind/db/CHMCache.java b/src/main/java/com/maxmind/db/CHMCache.java
@@ -4,7 +4,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ContainerNode;
 
 /**
  * A simplistic cache using a {@link ConcurrentHashMap}. There's no eviction
@@ -42,9 +41,6 @@ public JsonNode get(int key, Loader loader) throws IOException {
                 }
             }
         }
-        if (value instanceof ContainerNode) {
-            value = value.deepCopy();
-        }
         return value;
     }
 

diff --git a/src/main/java/com/maxmind/db/Decoder.java b/src/main/java/com/maxmind/db/Decoder.java
@@ -6,6 +6,11 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -257,26 +262,27 @@ private static BooleanNode decodeBoolean(int size)
     }
 
     private JsonNode decodeArray(int size) throws IOException {
-        ArrayNode array = OBJECT_MAPPER.createArrayNode();
 
+        List<JsonNode> array = new ArrayList<JsonNode>(size);
         for (int i = 0; i < size; i++) {
             JsonNode r = this.decode();
             array.add(r);
         }
 
-        return array;
+        return new ArrayNode(OBJECT_MAPPER.getNodeFactory(), Collections.unmodifiableList(array));
     }
 
     private JsonNode decodeMap(int size) throws IOException {
-        ObjectNode map = OBJECT_MAPPER.createObjectNode();
+        int capacity = (int) (size / 0.75F + 1.0F);
+        Map<String, JsonNode> map = new HashMap<String, JsonNode>(capacity);
 
         for (int i = 0; i < size; i++) {
             String key = this.decode().asText();
             JsonNode value = this.decode();
-            map.set(key, value);
+            map.put(key, value);
         }
 
-        return map;
+        return new ObjectNode(OBJECT_MAPPER.getNodeFactory(), Collections.unmodifiableMap(map));
     }
 
     private byte[] getByteArray(int length) {