Added a close method for closing all of the file handles. Removed some old comments and cleaned up some method signatures.

Author: oschwald

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

@@ -60,7 +60,6 @@ public Decoder(FileChannel in, long pointerBase) {
         this.DEBUG = System.getenv().get("MAXMIND_DB_DECODER_DEBUG") != null;
     }
 
-    // FIXME - Move most of this method to a switch statement
     public Result decode(long offset) throws MaxMindDbException, IOException {
         this.in.position(offset);
         if (this.DEBUG) {
@@ -125,7 +124,6 @@ public Result decode(long offset) throws MaxMindDbException, IOException {
         offset = sizeArray[1];
 
         if (this.DEBUG) {
-            // FIXME - cast or whatever
             Log.debug("Size", String.valueOf(size));
         }
 

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

@@ -8,6 +8,8 @@
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 public class Reader {
     private static final int DATA_SECTION_SEPARATOR_SIZE = 16;
     private static final byte[] METADATA_START_MARKER = { (byte) 0xAB,
@@ -63,8 +65,7 @@ public Reader(File database) throws MaxMindDbException, IOException {
         }
     }
 
-    // FIXME - figure out what we are returning
-    public Object get(InetAddress address) throws MaxMindDbException,
+    public JsonNode get(InetAddress address) throws MaxMindDbException,
             IOException {
 
         long pointer = this.findAddressInTree(address);
@@ -136,7 +137,6 @@ long record = nodes[bit];
             nodeNum = record;
         }
 
-        // XXX - Can we get down here?
         throw new MaxMindDbException("Something bad happened");
     }
 
@@ -184,8 +184,8 @@ private long[] splitNodeIntoRecords(ByteBuffer bytes)
         }
     }
 
-    private Object resolveDataPointer(long pointer) throws MaxMindDbException,
-            IOException {
+    private JsonNode resolveDataPointer(long pointer)
+            throws MaxMindDbException, IOException {
         long resolved = (pointer - this.metadata.nodeCount)
                 + this.metadata.searchTreeSize;
 
@@ -230,4 +230,13 @@ private long findMetadataStart() throws IOException {
     public Metadata getMetadata() {
         return this.metadata;
     }
+
+    public void close() throws IOException {
+        if (this.fc != null) {
+            this.fc.close();
+        }
+        if (this.raf != null) {
+            this.raf.close();
+        }
+    }
 }