Merge pull request #61 from maxmind/greg/minor-cleanup

Minor pre-release cleanups

Author: horgh

.travis.yml

@@ -17,13 +17,19 @@ matrix:
     - jdk: openjdk8
     - jdk: openjdk11
       env: RUN_SNYK=true
+    - jdk: openjdk11
     - jdk: openjdk12
+    - jdk: openjdk13
     - jdk: openjdk-ea
     - jdk: oraclejdk8
       dist: trusty
     - jdk: oraclejdk11
+    - jdk: oraclejdk12
+    - jdk: oraclejdk13
+    - jdk: oraclejdk-ea
   allow_failures:
     - jdk: openjdk-ea
+    - jdk: oraclejdk-ea
 env:
   global:
     - secure: KXF3RVBZDxeASAnleYlTaqvxRRB9FSzSAdVV9h7Kw81+p4UO64b8CPJR1p4fLIVwAp8C4R8h0xZDN3pAv/iyeA4ndIeh9tQXNZBm737RE5x+6x6nf/shP/Em1w9T1s3KmretXoTFK5NJGv2yTesgaIAV/JV1OFvlG6ArswhrPFc=

pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.0</version>
+            <version>2.10.1</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -18,7 +18,7 @@ final class BufferHolder {
     BufferHolder(File database, FileMode mode) throws IOException {
         try (
                 final RandomAccessFile file = new RandomAccessFile(database, "r");
-                final FileChannel channel = file.getChannel();
+                final FileChannel channel = file.getChannel()
         ) {
             if (mode == FileMode.MEMORY) {
                 this.buffer = ByteBuffer.wrap(new byte[(int) channel.size()]);

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

@@ -28,7 +28,7 @@ final class Decoder {
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-    private static final int[] POINTER_VALUE_OFFSETS = { 0, 0, 1 << 11, (1 << 19) + ((1) << 11), 0 };
+    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
@@ -132,14 +132,14 @@ private JsonNode decode() throws IOException {
         int size = ctrlByte & 0x1f;
         if (size >= 29) {
             switch (size) {
-            case 29:
-                size = 29 + buffer.get();
-                break;
-            case 30:
-                size = 285 + decodeInteger(2);
-                break;
-            default:
-                size = 65821 + decodeInteger(3);
+                case 29:
+                    size = 29 + buffer.get();
+                    break;
+                case 30:
+                    size = 285 + decodeInteger(2);
+                    break;
+                default:
+                    size = 65821 + decodeInteger(3);
             }
         }
 

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

@@ -14,8 +14,8 @@ public final class Network {
     /**
      * Construct a <code>Network</code>
      *
-     * @param ipAddress An IP address in the network. This does not have to be
-     *                 the first address in the network.
+     * @param ipAddress    An IP address in the network. This does not have to be
+     *                     the first address in the network.
      * @param prefixLength The prefix length for the network.
      */
     public Network(InetAddress ipAddress, int prefixLength) {

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

@@ -1,5 +1,7 @@
 package com.maxmind.db;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -8,8 +10,6 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 /**
  * Instances of this class provide a reader for the MaxMind DB format. IP
  * addresses can be looked up using the <code>get</code> method.
@@ -59,7 +59,7 @@ public Reader(File database) throws IOException {
      * GeoIP2 database file.
      *
      * @param database the MaxMind DB file to use.
-     * @param cache backing cache instance
+     * @param cache    backing cache instance
      * @throws IOException if there is an error opening or reading from the file.
      */
     public Reader(File database, NodeCache cache) throws IOException {
@@ -82,7 +82,7 @@ public Reader(InputStream source) throws IOException {
      * {@link FileMode#MEMORY}, without using a <code>File</code> instance.
      *
      * @param source the InputStream that contains the MaxMind DB file.
-     * @param cache backing cache instance
+     * @param cache  backing cache instance
      * @throws IOException if there is an error reading from the Stream.
      */
     public Reader(InputStream source, NodeCache cache) throws IOException {
@@ -109,7 +109,7 @@ public Reader(File database, FileMode fileMode) throws IOException {
      *
      * @param database the MaxMind DB file to use.
      * @param fileMode the mode to open the file with.
-     * @param cache backing cache instance
+     * @param cache    backing cache instance
      * @throws IOException if there is an error opening or reading from the file.
      */
     public Reader(File database, FileMode fileMode, NodeCache cache) throws IOException {
@@ -144,6 +144,7 @@ private Reader(BufferHolder bufferHolder, String name, NodeCache cache) throws I
     public JsonNode get(InetAddress ipAddress) throws IOException {
         return getRecord(ipAddress).getData();
     }
+
     /**
      * Looks up <code>ipAddress</code> in the MaxMind DB.
      *
@@ -291,7 +292,6 @@ public Metadata getMetadata() {
     }
 
     /**
-     /**
      * <p>
      * Closes the database.
      * </p>

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

@@ -14,11 +14,11 @@ public final class Record {
     /**
      * Create a new record.
      *
-     * @param data the data for the record in the database.
-     * @param ipAddress the IP address used in the lookup.
+     * @param data         the data for the record in the database.
+     * @param ipAddress    the IP address used in the lookup.
      * @param prefixLength the network prefix length associated with the record in the database.
      */
-    public Record( JsonNode data, InetAddress ipAddress, int prefixLength) {
+    public Record(JsonNode data, InetAddress ipAddress, int prefixLength) {
         this.data = data;
         this.network = new Network(ipAddress, prefixLength);
     }

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

@@ -1,5 +1,4 @@
 /**
  * @author greg
- *
  */
 package com.maxmind.db;

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

@@ -11,7 +11,6 @@
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -274,19 +273,19 @@ private static Map<ObjectNode, byte[]> maps() {
         ObjectNode one = om.createObjectNode();
         one.put("en", "Foo");
         maps.put(one, new byte[]{(byte) 0xe1, /* en */0x42, 0x65, 0x6e,
-        /* Foo */0x43, 0x46, 0x6f, 0x6f});
+                /* Foo */0x43, 0x46, 0x6f, 0x6f});
 
         ObjectNode two = om.createObjectNode();
         two.put("en", "Foo");
         two.put("zh", "人");
         maps.put(two, new byte[]{(byte) 0xe2,
-        /* en */
+                /* en */
                 0x42, 0x65, 0x6e,
-        /* Foo */
+                /* Foo */
                 0x43, 0x46, 0x6f, 0x6f,
-        /* zh */
+                /* zh */
                 0x42, 0x7a, 0x68,
-        /* 人 */
+                /* 人 */
                 0x43, (byte) 0xe4, (byte) 0xba, (byte) 0xba});
 
         ObjectNode nested = om.createObjectNode();
@@ -295,11 +294,11 @@ private static Map<ObjectNode, byte[]> maps() {
         maps.put(nested, new byte[]{(byte) 0xe1, /* name */
                 0x44, 0x6e, 0x61, 0x6d, 0x65, (byte) 0xe2,/* en */
                 0x42, 0x65, 0x6e,
-        /* Foo */
+                /* Foo */
                 0x43, 0x46, 0x6f, 0x6f,
-        /* zh */
+                /* zh */
                 0x42, 0x7a, 0x68,
-        /* 人 */
+                /* 人 */
                 0x43, (byte) 0xe4, (byte) 0xba, (byte) 0xba});
 
         ObjectNode guess = om.createObjectNode();
@@ -309,11 +308,11 @@ private static Map<ObjectNode, byte[]> maps() {
         guess.set("languages", languages);
         maps.put(guess, new byte[]{(byte) 0xe1,/* languages */
                 0x49, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x73,
-        /* array */
+                /* array */
                 0x2, 0x4,
-        /* en */
+                /* en */
                 0x42, 0x65, 0x6e,
-        /* zh */
+                /* zh */
                 0x42, 0x7a, 0x68});
 
         return maps;
@@ -326,16 +325,16 @@ private static Map<ArrayNode, byte[]> arrays() {
         ArrayNode f1 = om.createArrayNode();
         f1.add("Foo");
         arrays.put(f1, new byte[]{0x1, 0x4,
-        /* Foo */
+                /* Foo */
                 0x43, 0x46, 0x6f, 0x6f});
 
         ArrayNode f2 = om.createArrayNode();
         f2.add("Foo");
         f2.add("人");
         arrays.put(f2, new byte[]{0x2, 0x4,
-        /* Foo */
+                /* Foo */
                 0x43, 0x46, 0x6f, 0x6f,
-        /* 人 */
+                /* 人 */
                 0x43, (byte) 0xe4, (byte) 0xba, (byte) 0xba});
 
         ArrayNode empty = om.createArrayNode();

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

@@ -55,7 +55,7 @@ public void test() throws IOException {
         }
     }
 
-    class GetRecordTest {
+    static class GetRecordTest {
         InetAddress ip;
         File db;
         String network;