Tidied code

Author: oschwald

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

@@ -32,8 +32,9 @@ final class BufferHolder {
                 // Also closes the underlying channel.
                 file.close();
             } catch (final IOException e) {
-                // If an exception was underway when we entered the finally block,
-                // don't stomp over it due to an error closing the file and channel.
+                // If an exception was underway when we entered the finally
+                // block, don't stomp over it due to an error closing the file
+                // and channel.
                 if (!threw) {
                     throw e;
                 }

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

@@ -82,7 +82,8 @@ public Reader(File database, FileMode fileMode) throws IOException {
     }
 
     private Reader(BufferHolder bufferHolder, String name) throws IOException {
-        this.bufferHolderReference = new AtomicReference<BufferHolder>(bufferHolder);
+        this.bufferHolderReference = new AtomicReference<BufferHolder>(
+                bufferHolder);
 
         ByteBuffer buffer = bufferHolder.get();
         int start = this.findMetadataStart(buffer, name);
@@ -144,7 +145,8 @@ record = this.readNode(buffer, record, bit);
         throw new InvalidDatabaseException("Something bad happened");
     }
 
-    private int startNode(ByteBuffer buffer, int bitLength) throws InvalidDatabaseException {
+    private int startNode(ByteBuffer buffer, int bitLength)
+            throws InvalidDatabaseException {
         // Check if we are looking up an IPv4 address in an IPv6 tree. If this
         // is the case, we can skip over the first 96 nodes.
         if (this.metadata.ipVersion == 6 && bitLength == 32) {
@@ -155,7 +157,8 @@ private int startNode(ByteBuffer buffer, int bitLength) throws InvalidDatabaseEx
         return 0;
     }
 
-    private int findIpV4StartNode(ByteBuffer buffer) throws InvalidDatabaseException {
+    private int findIpV4StartNode(ByteBuffer buffer)
+            throws InvalidDatabaseException {
         if (this.metadata.ipVersion == 4) {
             return 0;
         }
@@ -194,7 +197,8 @@ private int readNode(ByteBuffer buffer, int nodeNumber, int index)
         }
     }
 
-    private JsonNode resolveDataPointer(ByteBuffer buffer, int pointer) throws IOException {
+    private JsonNode resolveDataPointer(ByteBuffer buffer, int pointer)
+            throws IOException {
         int resolved = (pointer - this.metadata.nodeCount)
                 + this.metadata.searchTreeSize;
 
@@ -206,8 +210,8 @@ private JsonNode resolveDataPointer(ByteBuffer buffer, int pointer) throws IOExc
 
         // We only want the data from the decoder, not the offset where it was
         // found.
-        Decoder decoder = new Decoder(buffer,
-                this.metadata.searchTreeSize + DATA_SECTION_SEPARATOR_SIZE);
+        Decoder decoder = new Decoder(buffer, this.metadata.searchTreeSize
+                + DATA_SECTION_SEPARATOR_SIZE);
         return decoder.decode(resolved).getNode();
     }
 

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

@@ -69,8 +69,8 @@ public void mmapThreadTest() throws IOException, InterruptedException,
         }
     }
 
-    private static void threadTest(final Reader reader) throws InterruptedException,
-            ExecutionException {
+    private static void threadTest(final Reader reader)
+            throws InterruptedException, ExecutionException {
         Callable<JsonNode> task = new Callable<JsonNode>() {
             @Override
             public JsonNode call() throws UnknownHostException, IOException {

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

@@ -306,7 +306,8 @@ private void testBrokenDataPointer(Reader reader) throws IOException,
     }
 
     @Test
-    public void testClosedReaderThrowsException() throws IOException, URISyntaxException {
+    public void testClosedReaderThrowsException() throws IOException,
+            URISyntaxException {
         URI file = ReaderTest.class.getResource(
                 "/maxmind-db/test-data/MaxMind-DB-test-decoder.mmdb").toURI();
         Reader reader = new Reader(new File(file));