More refactoring

Author: oschwald

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

@@ -32,10 +32,8 @@ public class Decoder {
     class Result {
         private final JsonNode obj;
         private long offset;
-        private final Type type;
 
-        Result(JsonNode obj, Type t, long offset) {
-            this.type = t;
+        Result(JsonNode obj, long offset) {
             this.obj = obj;
             this.offset = offset;
 
@@ -159,28 +157,28 @@ public Result decode(long offset) throws MaxMindDbException, IOException {
         switch (type) {
             case UTF8_STRING:
                 TextNode s = new TextNode(Decoder.decodeString(bytes));
-                return new Result(s, type, new_offset);
+                return new Result(s, new_offset);
             case DOUBLE:
                 DoubleNode d = Decoder.decodeDouble(bytes);
-                return new Result(d, type, new_offset);
+                return new Result(d, new_offset);
             case BYTES:
                 BinaryNode b = new BinaryNode(Decoder.decodeBytes(bytes));
-                return new Result(b, type, new_offset);
+                return new Result(b, new_offset);
             case UINT16:
                 IntNode i = Decoder.decodeUint16(bytes);
-                return new Result(i, type, new_offset);
+                return new Result(i, new_offset);
             case UINT32:
                 LongNode l = Decoder.decodeUint32(bytes);
-                return new Result(l, type, new_offset);
+                return new Result(l, new_offset);
             case INT32:
                 IntNode int32 = Decoder.decodeInt32(bytes);
-                return new Result(int32, type, new_offset);
+                return new Result(int32, new_offset);
             case UINT64:
                 BigIntegerNode bi = Decoder.decodeUint64(bytes);
-                return new Result(bi, type, new_offset);
+                return new Result(bi, new_offset);
             case UINT128:
                 BigIntegerNode uint128 = Decoder.decodeUint128(bytes);
-                return new Result(uint128, type, new_offset);
+                return new Result(uint128, new_offset);
             default:
                 throw new MaxMindDbException("Unknown or unexpected type: "
                         + type.name());
@@ -207,8 +205,7 @@ private Result decodePointer(int ctrlByte, long offset) throws IOException {
             Log.debug("Buffer", buffer);
         }
 
-        buffer.put(0, pointerSize == 4 ? (byte) 0
-                : (byte) (ctrlByte & 0x7));
+        buffer.put(0, pointerSize == 4 ? (byte) 0 : (byte) (ctrlByte & 0x7));
 
         long packed = Util.decodeLong(buffer.array());
 
@@ -226,8 +223,7 @@ private Result decodePointer(int ctrlByte, long offset) throws IOException {
             Log.debug("Pointer to", String.valueOf(pointer));
         }
 
-        return new Result(new LongNode(pointer), Type.POINTER, offset
-                + pointerSize);
+        return new Result(new LongNode(pointer), offset + pointerSize);
     }
 
     private static String decodeString(byte[] bytes) {
@@ -260,14 +256,14 @@ static BigIntegerNode decodeUint128(byte[] bytes) {
     }
 
     private static DoubleNode decodeDouble(byte[] bytes) {
-        return new DoubleNode(Double.parseDouble(new String(bytes,
-                Charset.forName("US-ASCII"))));
+        return new DoubleNode(Double.parseDouble(new String(bytes, Charset
+                .forName("US-ASCII"))));
     }
 
     private Result decodeBoolean(long size, long offset) {
         BooleanNode b = size == 0 ? BooleanNode.FALSE : BooleanNode.TRUE;
 
-        return new Result(b, Type.BOOLEAN, offset);
+        return new Result(b, offset);
     }
 
     private Result decodeArray(long size, long offset)
@@ -292,7 +288,7 @@ private Result decodeArray(long size, long offset)
             Log.debug("Decoded array", array.toString());
         }
 
-        return new Result(array, Type.ARRAY, offset);
+        return new Result(array, offset);
     }
 
     private Result decodeMap(long size, long offset) throws MaxMindDbException,
@@ -323,7 +319,7 @@ private Result decodeMap(long size, long offset) throws MaxMindDbException,
             Log.debug("Decoded map", map.toString());
         }
 
-        return new Result(map, Type.MAP, offset);
+        return new Result(map, offset);
 
     }
 

src/main/java/com/maxmind/maxminddb/Reader.java

@@ -10,8 +10,9 @@
 
 public class Reader {
     private static final int DATA_SECTION_SEPARATOR_SIZE = 16;
-    private static final byte[] METADATA_START_MARKER = { (byte) 0xAB, (byte) 0xCD,
-            (byte) 0xEF, 'M', 'a', 'x', 'M', 'i', 'n', 'd', '.', 'c', 'o', 'm' };
+    private static final byte[] METADATA_START_MARKER = { (byte) 0xAB,
+            (byte) 0xCD, (byte) 0xEF, 'M', 'a', 'x', 'M', 'i', 'n', 'd', '.',
+            'c', 'o', 'm' };
 
     private final boolean DEBUG;
     private final Decoder decoder;
@@ -57,7 +58,7 @@ public Reader(File database) throws MaxMindDbException, IOException {
         this.decoder = new Decoder(this.fc, this.metadata.searchTreeSize
                 + DATA_SECTION_SEPARATOR_SIZE);
 
-        if (DEBUG) {
+        if (this.DEBUG) {
             Log.debug(this.metadata.toString());
         }
     }
@@ -87,7 +88,7 @@ long findAddressInTree(InetAddress address) throws MaxMindDbException,
             rawAddress = newAddress;
         }
 
-        if (DEBUG) {
+        if (this.DEBUG) {
             Log.debugNewLine();
             Log.debug("IP address", address);
             Log.debug("IP address", rawAddress);
@@ -105,7 +106,7 @@ long findAddressInTree(InetAddress address) throws MaxMindDbException,
 
             long record = nodes[bit];
 
-            if (DEBUG) {
+            if (this.DEBUG) {
                 Log.debug("Nodes", Arrays.toString(nodes));
                 Log.debug("Bit #", i);
                 Log.debug("Bit value", bit);
@@ -115,20 +116,20 @@ long record = nodes[bit];
             }
 
             if (record == this.metadata.nodeCount) {
-                if (DEBUG) {
+                if (this.DEBUG) {
                     Log.debug("Record is empty");
                 }
                 return 0;
             }
 
             if (record >= this.metadata.nodeCount) {
-                if (DEBUG) {
+                if (this.DEBUG) {
                     Log.debug("Record is a data pointer");
                 }
                 return record;
             }
 
-            if (DEBUG) {
+            if (this.DEBUG) {
                 Log.debug("Record is a node number");
             }
 
@@ -147,7 +148,7 @@ private long[] readNode(long nodeNumber) throws IOException,
 
         this.fc.read(buffer);
 
-        if (DEBUG) {
+        if (this.DEBUG) {
             Log.debug("Node bytes", buffer);
         }
         return this.splitNodeIntoRecords(buffer);
@@ -188,7 +189,7 @@ private Object resolveDataPointer(long pointer) throws MaxMindDbException,
         long resolved = (pointer - this.metadata.nodeCount)
                 + this.metadata.searchTreeSize;
 
-        if (DEBUG) {
+        if (this.DEBUG) {
             long treeSize = this.metadata.searchTreeSize;
 
             Log.debug("Resolved data pointer", "( " + pointer + " - "

src/main/java/com/maxmind/maxminddb/package-info.java

@@ -3,6 +3,6 @@
  */
 /**
  * @author greg
- *
+ * 
  */
 package com.maxmind.maxminddb;