Misc. cleanup

Author: oschwald

pom.xml

@@ -77,8 +77,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
     </plugins>

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

@@ -21,7 +21,7 @@
 public class Decoder {
     private final FileChannel in;
 
-    private final boolean DEBUG = false;
+    private final boolean DEBUG;
     // XXX - This is only for unit testings. We should possibly make a
     // constructor to set this
     boolean POINTER_TEST_HACK = false;
@@ -53,15 +53,13 @@ void setOffset(long offset) {
             this.offset = offset;
         }
 
-        Type getType() {
-            return this.type;
-        }
     }
 
     public Decoder(FileChannel in, long pointerBase) {
         this.in = in;
         this.pointerBase = pointerBase;
         this.objectMapper = new ObjectMapper();
+        this.DEBUG = System.getenv().get("MAXMIND_DB_DECODER_DEBUG") != null;
     }
 
     // FIXME - Move most of this method to a switch statement
@@ -160,13 +158,13 @@ public Result decode(long offset) throws MaxMindDbException, IOException {
         long new_offset = offset + size;
         switch (type) {
             case UTF8_STRING:
-                TextNode s = new TextNode(this.decodeString(bytes));
+                TextNode s = new TextNode(Decoder.decodeString(bytes));
                 return new Result(s, type, new_offset);
             case DOUBLE:
-                DoubleNode d = this.decodeDouble(bytes);
+                DoubleNode d = Decoder.decodeDouble(bytes);
                 return new Result(d, type, new_offset);
             case BYTES:
-                BinaryNode b = new BinaryNode(this.decodeBytes(bytes));
+                BinaryNode b = new BinaryNode(Decoder.decodeBytes(bytes));
                 return new Result(b, type, new_offset);
             case UINT16:
                 IntNode i = Decoder.decodeUint16(bytes);
@@ -232,12 +230,12 @@ private Result decodePointer(int ctrlByte, long offset) throws IOException {
                 + pointerSize);
     }
 
-    private String decodeString(byte[] bytes) {
+    private static String decodeString(byte[] bytes) {
         return new String(bytes, Charset.forName("UTF-8"));
     }
 
     // XXX - nop
-    private byte[] decodeBytes(byte[] bytes) {
+    private static byte[] decodeBytes(byte[] bytes) {
         return bytes;
     }
 
@@ -261,8 +259,8 @@ static BigIntegerNode decodeUint128(byte[] bytes) {
         return new BigIntegerNode(new BigInteger(1, bytes));
     }
 
-    private DoubleNode decodeDouble(byte[] bytes) {
-        return new DoubleNode(new Double(new String(bytes,
+    private static DoubleNode decodeDouble(byte[] bytes) {
+        return new DoubleNode(Double.parseDouble(new String(bytes,
                 Charset.forName("US-ASCII"))));
     }
 
@@ -315,7 +313,7 @@ private Result decodeMap(long size, long offset) throws MaxMindDbException,
             offset = valueResult.getOffset();
 
             if (this.DEBUG) {
-                Log.debug("Key " + i, key.toString());
+                Log.debug("Key " + i, key);
                 Log.debug("Value " + i, value.toString());
             }
             map.put(key, value);

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

@@ -34,10 +34,6 @@ static void debugBinary(String name, int value) {
         Log.debug(name, Integer.toBinaryString(value));
     }
 
-    private static void debug(String string, byte b) {
-        Log.debug(string, Integer.toBinaryString(b & 0xFF));
-    }
-
     static void debug(String name, String value) {
         debug(name + ": " + value);
     }

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

@@ -6,17 +6,17 @@
 
 // XXX - if we make this public, add getters
 class Metadata {
-    Integer binaryFormatMajorVersion;
-    Integer binaryFormatMinorVersion;
-    BigInteger buildEpoch;
-    String databaseType;
-    JsonNode description;
-    Integer ipVersion;
-    Long nodeCount;
-    Long recordSize;
-    int nodeByteSize;
-    long searchTreeSize;
-    JsonNode languages;
+    final int binaryFormatMajorVersion;
+    final int binaryFormatMinorVersion;
+    private final BigInteger buildEpoch;
+    final String databaseType;
+    final JsonNode description;
+    final int ipVersion;
+    final long nodeCount;
+    final int recordSize;
+    final int nodeByteSize;
+    final long searchTreeSize;
+    final JsonNode languages;
 
     // XXX - think about how I want to construct this. Maybe look at how JSON
     // parsers deal with types
@@ -31,8 +31,8 @@ public Metadata(JsonNode metadata) {
         this.description = metadata.get("description");
         this.ipVersion = metadata.get("ip_version").asInt();
         this.nodeCount = metadata.get("node_count").asLong();
-        this.recordSize = metadata.get("record_size").asLong();
-        this.nodeByteSize = (int) (this.recordSize / 4);
+        this.recordSize = metadata.get("record_size").asInt();
+        this.nodeByteSize = this.recordSize / 4;
         this.searchTreeSize = this.nodeCount * this.nodeByteSize;
 
     }

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

@@ -9,20 +9,20 @@
 import java.util.Arrays;
 
 public class Reader {
-    private static int DATA_SECTION_SEPARATOR_SIZE = 16;
-    private static byte METADATE_START_MARKER[] = { (byte) 0xAB, (byte) 0xCD,
+    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 boolean DEBUG = false;
+    private final boolean DEBUG;
     private final Decoder decoder;
     private final Metadata metadata;
-    private final long dataSectionEnd;
     private final FileChannel fc;
+    private final RandomAccessFile raf;
 
     public Reader(File database) throws MaxMindDbException, IOException {
-
-        RandomAccessFile raf = new RandomAccessFile(database, "r");
-        this.fc = raf.getChannel();
+        this.DEBUG = System.getenv().get("MAXMIND_DB_READER_DEBUG") != null;
+        this.raf = new RandomAccessFile(database, "r");
+        this.fc = this.raf.getChannel();
         // XXX - we will want
         // MappedByteBuffer in = fc.map(FileChannel.MapMode.READ_ONLY, 0,
         // fc.size());
@@ -50,9 +50,6 @@ public Reader(File database) throws MaxMindDbException, IOException {
                             + "). Is this a valid MaxMind DB file?");
         }
 
-        // XXX - right?
-        this.dataSectionEnd = start - METADATE_START_MARKER.length;
-
         Decoder metadataDecoder = new Decoder(this.fc, 0);
 
         this.metadata = new Metadata(metadataDecoder.decode(start).getObject());
@@ -159,7 +156,7 @@ private long[] readNode(long nodeNumber) throws IOException,
     private long[] splitNodeIntoRecords(ByteBuffer bytes)
             throws MaxMindDbException {
         long[] nodes = new long[2];
-        switch (this.metadata.recordSize.intValue()) {
+        switch (this.metadata.recordSize) {
             case 24:
                 nodes[0] = Util.decodeLong(Arrays.copyOfRange(bytes.array(), 0,
                         3));
@@ -215,11 +212,11 @@ private Object resolveDataPointer(long pointer) throws MaxMindDbException,
     private long findMetadataStart() throws IOException {
         long fileSize = this.fc.size();
 
-        FILE: for (long i = 0; i < fileSize - METADATE_START_MARKER.length + 1; i++) {
-            for (int j = 0; j < METADATE_START_MARKER.length; j++) {
+        FILE: for (long i = 0; i < fileSize - METADATA_START_MARKER.length + 1; i++) {
+            for (int j = 0; j < METADATA_START_MARKER.length; j++) {
                 ByteBuffer b = ByteBuffer.wrap(new byte[1]);
                 this.fc.read(b, fileSize - i - j - 1);
-                if (b.get(0) != METADATE_START_MARKER[METADATE_START_MARKER.length
+                if (b.get(0) != METADATA_START_MARKER[METADATA_START_MARKER.length
                         - j - 1]) {
                     continue FILE;
                 }

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

@@ -8,7 +8,7 @@ public static Type get(int i) {
         return Type.values()[i];
     }
 
-    public static Type get(byte b) {
+    private static Type get(byte b) {
         // bytes are signed, but we want to treat them as unsigned here
         // XXX - Type.values() might be expensive. Consider caching it.
         return Type.get(b & 0xFF);