Renamed Reader to MaxMindDbReader

Author: oschwald

sample/Benchmark.java

@@ -6,16 +6,16 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.net.InetAddresses;
 import com.maxmind.maxminddb.InvalidDatabaseException;
-import com.maxmind.maxminddb.Reader;
-import com.maxmind.maxminddb.Reader.FileMode;
+import com.maxmind.maxminddb.MaxMindDbReader;
+import com.maxmind.maxminddb.MaxMindDbReader.FileMode;
 
 public class Benchmark {
 
     public static void main(String[] args) throws IOException,
             InvalidDatabaseException {
         File file = new File("GeoIP2-City.mmdb");
 
-        Reader r = new Reader(file, FileMode.MEMORY_MAPPED);
+        MaxMindDbReader r = new MaxMindDbReader(file, FileMode.MEMORY_MAPPED);
         Random random = new Random();
         int count = 1000000;
         long startTime = System.nanoTime();

…n/java/com/maxmind/maxminddb/Reader.java …m/maxmind/maxminddb/MaxMindDbReader.javasrc/main/java/com/maxmind/maxminddb/Reader.java renamed to src/main/java/com/maxmind/maxminddb/MaxMindDbReader.java src/main/java/com/maxmind/maxminddb/Reader.java renamed to src/main/java/com/maxmind/maxminddb/MaxMindDbReader.java

@@ -12,7 +12,7 @@
  * Instances of this class provide a reader for the MaxMind DB format. IP
  * addresses can be looked up using the <code>get</code> method.
  */
-public final class Reader implements Closeable {
+public final class MaxMindDbReader implements Closeable {
     private static final int DATA_SECTION_SEPARATOR_SIZE = 16;
     private static final byte[] METADATA_START_MARKER = { (byte) 0xAB,
             (byte) 0xCD, (byte) 0xEF, 'M', 'a', 'x', 'M', 'i', 'n', 'd', '.',
@@ -48,7 +48,7 @@ public enum FileMode {
      * @throws IOException
      *             if there is an error opening or reading from the file.
      */
-    public Reader(File database) throws IOException {
+    public MaxMindDbReader(File database) throws IOException {
         this(database, FileMode.MEMORY_MAPPED);
     }
 
@@ -63,7 +63,7 @@ public Reader(File database) throws IOException {
      * @throws IOException
      *             if there is an error opening or reading from the file.
      */
-    public Reader(File database, FileMode fileMode) throws IOException {
+    public MaxMindDbReader(File database, FileMode fileMode) throws IOException {
         this.DEBUG = System.getenv().get("MAXMIND_DB_READER_DEBUG") != null;
         this.threadBuffer = new ThreadBuffer(database, fileMode);
 

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

@@ -8,7 +8,7 @@
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
 
-import com.maxmind.maxminddb.Reader.FileMode;
+import com.maxmind.maxminddb.MaxMindDbReader.FileMode;
 
 final class ThreadBuffer extends ThreadLocal<ByteBuffer> implements Closeable {
     // XXX - DO NOT PASS THIS OUTSIDE THIS CLASS.

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

@@ -9,7 +9,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.maxmind.maxminddb.Reader.FileMode;
+import com.maxmind.maxminddb.MaxMindDbReader.FileMode;
 
 public class PointerTest {
     @SuppressWarnings("static-method")

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

@@ -23,7 +23,7 @@ public void test() throws InvalidDatabaseException, IOException {
             for (int ipVersion : new int[] { 4, 6 }) {
                 String fileName = "test-data/Test-IPv" + ipVersion + "-"
                         + recordSize + ".mmdb";
-                Reader reader = new Reader(new File(fileName));
+                MaxMindDbReader reader = new MaxMindDbReader(new File(fileName));
                 this.testMetadata(reader, ipVersion, recordSize);
 
                 if (ipVersion == 4) {
@@ -36,7 +36,7 @@ public void test() throws InvalidDatabaseException, IOException {
         }
     }
 
-    private void testMetadata(Reader reader, int ipVersion, long recordSize) {
+    private void testMetadata(MaxMindDbReader reader, int ipVersion, long recordSize) {
 
         Metadata metadata = reader.getMetadata();
 
@@ -56,7 +56,7 @@ private void testMetadata(Reader reader, int ipVersion, long recordSize) {
 
     }
 
-    private void testIpV4(Reader reader, String fileName)
+    private void testIpV4(MaxMindDbReader reader, String fileName)
             throws InvalidDatabaseException, IOException {
 
         for (int i = 0; i <= 5; i++) {
@@ -92,7 +92,7 @@ private void testIpV4(Reader reader, String fileName)
     }
 
     // XXX - logic could be combined with above
-    private void testIpV6(Reader reader, String fileName)
+    private void testIpV6(MaxMindDbReader reader, String fileName)
             throws InvalidDatabaseException, IOException {
         String[] subnets = new String[] { "::1:ffff:ffff", "::2:0:0",
                 "::2:0:40", "::2:0:50", "::2:0:58" };