Remove pointerTestHack

src/main/java/com/maxmind/db/Decoder.java

@@ -22,16 +22,12 @@
  *
  * This class CANNOT be shared between threads
  */
-final class Decoder {
+class Decoder {
 
     private static final Charset UTF_8 = StandardCharsets.UTF_8;
 
     private static final int[] POINTER_VALUE_OFFSETS = {0, 0, 1 << 11, (1 << 19) + (1 << 11), 0};
 
-    // XXX - This is only for unit testings. We should possibly make a
-    // constructor to set this
-    boolean pointerTestHack = false;
-
     private final NodeCache cache;
 
     private final long pointerBase;
@@ -65,7 +61,7 @@ final class Decoder {
 
     private final NodeCache.Loader cacheLoader = this::decode;
 
-    public <T> T decode(int offset, Class<T> cls) throws IOException {
+    <T> T decode(int offset, Class<T> cls) throws IOException {
         if (offset >= this.buffer.capacity()) {
             throw new InvalidDatabaseException(
                 "The MaxMind DB file's data section contains bad data: "
@@ -104,19 +100,7 @@ private <T> DecodedValue decode(Class<T> cls, java.lang.reflect.Type genericType
             int packed = this.decodeInteger(base, pointerSize);
             long pointer = packed + this.pointerBase + POINTER_VALUE_OFFSETS[pointerSize];
 
-            // for unit testing
-            if (this.pointerTestHack) {
-                return new DecodedValue(pointer);
-            }
-
-            int targetOffset = (int) pointer;
-            int position = buffer.position();
-
-            CacheKey key = new CacheKey(targetOffset, cls, genericType);
-            DecodedValue o = cache.get(key, cacheLoader);
-
-            buffer.position(position);
-            return o;
+            return decodePointer(pointer, cls, genericType);
         }
 
         if (type.equals(Type.EXTENDED)) {
@@ -151,6 +135,18 @@ private <T> DecodedValue decode(Class<T> cls, java.lang.reflect.Type genericType
         return new DecodedValue(this.decodeByType(type, size, cls, genericType));
     }
 
+    DecodedValue decodePointer(long pointer, Class<?> cls, java.lang.reflect.Type genericType)
+            throws IOException {
+        int targetOffset = (int) pointer;
+        int position = buffer.position();
+
+        CacheKey key = new CacheKey(targetOffset, cls, genericType);
+        DecodedValue o = cache.get(key, cacheLoader);
+
+        buffer.position(position);
+        return o;
+    } 
+
     private <T> Object decodeByType(
         Type type,
         int size,

src/test/java/com/maxmind/db/DecoderTest.java

@@ -429,8 +429,7 @@ private static <T> void testTypeDecoding(Type type, Map<T, byte[]> tests)
             try (FileChannel fc = DecoderTest.getFileChannel(input)) {
                 MappedByteBuffer mmap = fc.map(MapMode.READ_ONLY, 0, fc.size());
 
-                Decoder decoder = new Decoder(cache, mmap, 0);
-                decoder.pointerTestHack = true;
+                Decoder decoder = new TestDecoder(cache, mmap, 0);
 
                 // XXX - this could be streamlined
                 if (type.equals(Type.BYTES)) {

src/test/java/com/maxmind/db/TestDecoder.java

@@ -0,0 +1,18 @@
+package com.maxmind.db;
+
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+
+final class TestDecoder extends Decoder {
+
+    TestDecoder(NodeCache cache, ByteBuffer buffer, long pointerBase) {
+        super(cache, buffer, pointerBase);
+    }
+
+    @Override
+    DecodedValue decodePointer(long pointer, Class<?> cls, Type genericType) {
+        // bypass cache
+        return new DecodedValue(pointer);
+    }
+
+}