Misc cleanup

Author: oschwald

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

@@ -309,7 +309,6 @@ private Result decodeMap(int size, int offset) throws IOException {
         }
 
         return new Result(map, offset);
-
     }
 
     private int[] sizeFromCtrlByte(int ctrlByte, int offset) {

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

@@ -43,7 +43,7 @@ public enum FileMode {
     /**
      * Constructs a Reader for the MaxMind DB format. The file passed to it must
      * be a valid MaxMind DB file such as a GeoIP2 database file.
-     * 
+     *
      * @param database
      *            the MaxMind DB file to use.
      * @throws IOException
@@ -56,7 +56,7 @@ public MaxMindDbReader(File database) throws IOException {
     /**
      * Constructs a Reader for the MaxMind DB format. The file passed to it must
      * be a valid MaxMind DB file such as a GeoIP2 database file.
-     * 
+     *
      * @param database
      *            the MaxMind DB file to use.
      * @param fileMode
@@ -66,14 +66,7 @@ public MaxMindDbReader(File database) throws IOException {
      */
     public MaxMindDbReader(File database, FileMode fileMode) throws IOException {
         this.threadBuffer = new ThreadBuffer(database, fileMode);
-        int start = this.findMetadataStart();
-
-        if (start < 0) {
-            throw new InvalidDatabaseException(
-                    "Could not find a MaxMind DB metadata marker in this file ("
-                            + database.getName()
-                            + "). Is this a valid MaxMind DB file?");
-        }
+        int start = this.findMetadataStart(database.getName());
 
         Decoder metadataDecoder = new Decoder(this.threadBuffer, 0);
         this.metadata = new Metadata(metadataDecoder.decode(start).getNode());
@@ -87,7 +80,7 @@ public MaxMindDbReader(File database, FileMode fileMode) throws IOException {
 
     /**
      * Looks up the <code>address</code> in the MaxMind DB.
-     * 
+     *
      * @param ipAddress
      *            the IP address to look up.
      * @return the record for the IP address.
@@ -99,7 +92,6 @@ public JsonNode get(InetAddress ipAddress) throws IOException {
         if (pointer == 0) {
             return null;
         }
-        this.threadBuffer.get().position(pointer);
         return this.resolveDataPointer(pointer);
     }
 
@@ -162,7 +154,6 @@ private int readNode(int nodeNumber, int index)
             throws InvalidDatabaseException {
         ByteBuffer buffer = this.threadBuffer.get();
         int baseOffset = nodeNumber * this.metadata.nodeByteSize;
-        buffer.position(baseOffset);
 
         switch (this.metadata.recordSize) {
             case 24:
@@ -206,12 +197,12 @@ private JsonNode resolveDataPointer(int pointer) throws IOException {
     /*
      * Apparently searching a file for a sequence is not a solved problem in
      * Java. This searches from the end of the file for metadata start.
-     * 
+     *
      * This is an extremely naive but reasonably readable implementation. There
      * are much faster algorithms (e.g., Boyer-Moore) for this if speed is ever
      * an issue, but I suspect it won't be.
      */
-    private int findMetadataStart() {
+    private int findMetadataStart(String databaseName) throws InvalidDatabaseException {
         ByteBuffer buffer = this.threadBuffer.get();
         int fileSize = buffer.capacity();
 
@@ -225,7 +216,10 @@ private int findMetadataStart() {
             }
             return fileSize - i;
         }
-        return -1;
+        throw new InvalidDatabaseException(
+               "Could not find a MaxMind DB metadata marker in this file ("
+                        + databaseName
+                        + "). Is this a valid MaxMind DB file?");
     }
 
     Metadata getMetadata() {
@@ -234,12 +228,12 @@ Metadata getMetadata() {
 
     /**
      * Closes the MaxMind DB and returns resources to the system.
-     * 
+     *
      * @throws IOException
      *             if an I/O error occurs.
      */
     @Override
     public void close() throws IOException {
         this.threadBuffer.close();
     }
-}
+}

src/test/java/com/maxmind/maxminddb/ReaderTest.java

@@ -19,7 +19,7 @@ public class ReaderTest {
 
     @Test
     public void test() throws InvalidDatabaseException, IOException {
-        for (long recordSize : new long[] { 24 }) { // 24, 28, 32 }) {
+        for (long recordSize : new long[] { 24, 28, 32 }) {
             for (int ipVersion : new int[] { 4, 6 }) {
                 String fileName = "test-data/Test-IPv" + ipVersion + "-"
                         + recordSize + ".mmdb";
@@ -31,7 +31,6 @@ public void test() throws InvalidDatabaseException, IOException {
                 } else {
                     this.testIpV6(reader, fileName);
                 }
-
             }
         }
     }
@@ -53,7 +52,6 @@ private void testMetadata(MaxMindDbReader reader, int ipVersion, long recordSize
 
         assertEquals(description, metadata.description);
         assertEquals(recordSize, metadata.recordSize);
-
     }
 
     private void testIpV4(MaxMindDbReader reader, String fileName)
@@ -128,6 +126,5 @@ private void testIpV6(MaxMindDbReader reader, String fileName)
         for (String ip : new String[] { "1.1.1.33", "255.254.253.123", "89fa::" }) {
             assertNull(reader.get(InetAddress.getByName(ip)));
         }
-
     }
 }