Renamed some methods and params

Author: oschwald

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

@@ -20,9 +20,9 @@ public class Reader {
     private final long dataSectionEnd;
     private final FileChannel fc;
 
-    public Reader(File dataSource) throws MaxMindDbException, IOException {
+    public Reader(File database) throws MaxMindDbException, IOException {
 
-        RandomAccessFile raf = new RandomAccessFile(dataSource, "r");
+        RandomAccessFile raf = new RandomAccessFile(database, "r");
         this.fc = raf.getChannel();
         // XXX - we will want
         // MappedByteBuffer in = fc.map(FileChannel.MapMode.READ_ONLY, 0,
@@ -47,7 +47,7 @@ public Reader(File dataSource) throws MaxMindDbException, IOException {
         if (start < 0) {
             throw new MaxMindDbException(
                     "Could not find a MaxMind DB metadata marker in this file ("
-                            + dataSource.getName()
+                            + database.getName()
                             + "). Is this a valid MaxMind DB file?");
         }
 
@@ -68,7 +68,7 @@ public Reader(File dataSource) throws MaxMindDbException, IOException {
     }
 
     // FIXME - figure out what we are returning
-    Object dataForAddress(InetAddress address) throws MaxMindDbException,
+    public Object get(InetAddress address) throws MaxMindDbException,
             IOException {
 
         long pointer = this.findAddressInTree(address);

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

@@ -64,7 +64,7 @@ private void testIpV4(Reader reader, String fileName)
 
             assertEquals("found expected data record for " + address + " in "
                     + fileName, data,
-                    reader.dataForAddress(InetAddress.getByName(address)));
+                    reader.get(InetAddress.getByName(address)));
         }
 
         Map<String, String> pairs = new HashMap<String, String>();
@@ -81,11 +81,11 @@ private void testIpV4(Reader reader, String fileName)
 
             assertEquals("found expected data record for " + address + " in "
                     + fileName, data,
-                    reader.dataForAddress(InetAddress.getByName(address)));
+                    reader.get(InetAddress.getByName(address)));
         }
 
         for (String ip : new String[] { "1.1.1.33", "255.254.253.123" }) {
-            assertNull(reader.dataForAddress(InetAddress.getByName(ip)));
+            assertNull(reader.get(InetAddress.getByName(ip)));
         }
     }
 
@@ -101,7 +101,7 @@ private void testIpV6(Reader reader, String fileName)
 
             assertEquals("found expected data record for " + address + " in "
                     + fileName, data,
-                    reader.dataForAddress(InetAddress.getByName(address)));
+                    reader.get(InetAddress.getByName(address)));
         }
 
         Map<String, String> pairs = new HashMap<String, String>();
@@ -120,11 +120,11 @@ private void testIpV6(Reader reader, String fileName)
 
             assertEquals("found expected data record for " + address + " in "
                     + fileName, data,
-                    reader.dataForAddress(InetAddress.getByName(address)));
+                    reader.get(InetAddress.getByName(address)));
         }
 
         for (String ip : new String[] { "1.1.1.33", "255.254.253.123", "89fa::" }) {
-            assertNull(reader.dataForAddress(InetAddress.getByName(ip)));
+            assertNull(reader.get(InetAddress.getByName(ip)));
         }
 
     }