[Improve][IPLookupV2] 部分方法重命名，使其更清晰

9 files changed, 75 insertions, 84 deletions

diff --git a/dat/asn_v4.mmdb b/dat/asn_v4.mmdb
new file mode 100644
index 0000000..68d267c
--- /dev/null
+++ b/dat/asn_v4.mmdb
diff --git a/dat/asn_v6.mmdb b/dat/asn_v6.mmdb
new file mode 100644
index 0000000..ad5f669
--- /dev/null
+++ b/dat/asn_v6.mmdb
diff --git a/dat/ip_v4_built_in.mmdb b/dat/ip_v4_built_in.mmdb
new file mode 100644
index 0000000..d775b92
--- /dev/null
+++ b/dat/ip_v4_built_in.mmdb
diff --git a/dat/ip_v4_user_defined.mmdb b/dat/ip_v4_user_defined.mmdb
new file mode 100644
index 0000000..4453480
--- /dev/null
+++ b/dat/ip_v4_user_defined.mmdb
diff --git a/dat/ip_v6_built_in.mmdb b/dat/ip_v6_built_in.mmdb
new file mode 100644
index 0000000..a2943a6
--- /dev/null
+++ b/dat/ip_v6_built_in.mmdb
diff --git a/dat/ip_v6_user_defined.mmdb b/dat/ip_v6_user_defined.mmdb
new file mode 100644
index 0000000..2a33ecb
--- /dev/null
+++ b/dat/ip_v6_user_defined.mmdb
diff --git a/src/main/java/com/geedgenetworks/utils/AsnLookup.java b/src/main/java/com/geedgenetworks/utils/AsnLookup.java
index 022999f..11bf870 100644
--- a/src/main/java/com/geedgenetworks/utils/AsnLookup.java
+++ b/src/main/java/com/geedgenetworks/utils/AsnLookup.java
@@ -3,25 +3,16 @@ package com.geedgenetworks.utils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.collect.ObjectArrays;
-import com.maxmind.db.CHMCache;
 import com.geedgenetworks.domain.LocationResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
-import static com.geedgenetworks.utils.AbstractDatabaseReader.UNKNOWN;
-
 /**
  * @ClassName AsnLookup
  * @Description  IP查询AS号
@@ -137,41 +128,41 @@ public class AsnLookup extends AbstractDatabaseReader {
 
         /**
          *
-         * @param publicAsnDatabaseFile  加载ASN database文件,不区分IPv4/6
+         * @param databaseFile  加载ASN database文件,不区分IPv4/6
          * @return
          */
-        public Builder loadDataFile(String publicAsnDatabaseFile) {
-            this.publicAsnDatabaseFile = publicAsnDatabaseFile;
+        public Builder loadDataFile(String databaseFile) {
+            this.publicAsnDatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param publicAsnDatabaseStream 加载ASN database流,不区分IPv4/6
+         * @param databaseStream 加载ASN database流,不区分IPv4/6
          * @return
          */
-        public Builder loadDataFile(InputStream publicAsnDatabaseStream) {
-            this.publicAsnDatabaseStream = publicAsnDatabaseStream;
+        public Builder loadDataFile(InputStream databaseStream) {
+            this.publicAsnDatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param publicAsnV4DatabaseFile  加载ASN IPv4 database文件
+         * @param databaseFile  加载ASN IPv4 database文件
          * @return
          */
-        public Builder loadDataFileV4(String publicAsnV4DatabaseFile) {
-            this.publicAsnV4DatabaseFile = publicAsnV4DatabaseFile;
+        public Builder loadDataFileV4(String databaseFile) {
+            this.publicAsnV4DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param publicAsnV4DatabaseStream 加载ASN IPv4 database流
+         * @param databaseStream 加载ASN IPv4 database流
          * @return
          */
-        public Builder loadDataFileV4(InputStream publicAsnV4DatabaseStream) {
-            this.publicAsnV4DatabaseStream = publicAsnV4DatabaseStream;
+        public Builder loadDataFileV4(InputStream databaseStream) {
+            this.publicAsnV4DatabaseStream = databaseStream;
             return this;
         }
 
@@ -179,80 +170,80 @@ public class AsnLookup extends AbstractDatabaseReader {
 
         /**
          *
-         * @param publicAsnV6DatabaseFile 加载ASN IPv6 database文件
+         * @param databaseFile 加载ASN IPv6 database文件
          * @return
          */
-        public Builder loadDataFileV6(String publicAsnV6DatabaseFile) {
-            this.publicAsnV6DatabaseFile = publicAsnV6DatabaseFile;
+        public Builder loadDataFileV6(String databaseFile) {
+            this.publicAsnV6DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param publicAsnV6DatabaseStream 加载ASN IPv6 database流
+         * @param databaseStream 加载ASN IPv6 database流
          * @return
          */
-        public Builder loadDataFileV6(InputStream publicAsnV6DatabaseStream) {
-            this.publicAsnV6DatabaseStream = publicAsnV6DatabaseStream;
+        public Builder loadDataFileV6(InputStream databaseStream) {
+            this.publicAsnV6DatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param privateAsnDatabaseFile 加载ASN database文件,不区分IPv4/6
+         * @param databaseFile 加载ASN database文件,不区分IPv4/6
          * @return
          */
-        public Builder loadDataFilePrivate(String privateAsnDatabaseFile) {
-            this.privateAsnDatabaseFile = privateAsnDatabaseFile;
+        public Builder loadDataFilePrivate(String databaseFile) {
+            this.privateAsnDatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param privateAsnDatabaseStream 加载ASN database流,不区分IPv4/6
+         * @param databaseStream 加载ASN database流,不区分IPv4/6
          * @return
          */
-        public Builder loadDataFilePrivate(InputStream privateAsnDatabaseStream) {
-            this.privateAsnDatabaseStream = privateAsnDatabaseStream;
+        public Builder loadDataFilePrivate(InputStream databaseStream) {
+            this.privateAsnDatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param privateAsnV4DatabaseFile 加载ASN IPv4 database文件
+         * @param databaseFile 加载ASN IPv4 database文件
          * @return
          */
-        public Builder loadDataFilePrivateV4(String privateAsnV4DatabaseFile) {
-            this.privateAsnV4DatabaseFile = privateAsnV4DatabaseFile;
+        public Builder loadDataFilePrivateV4(String databaseFile) {
+            this.privateAsnV4DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param privateAsnV4DatabaseStream 加载ASN IPv4 database流
+         * @param databaseStream 加载ASN IPv4 database流
          * @return
          */
-        public Builder loadDataFilePrivateV4(InputStream privateAsnV4DatabaseStream) {
-            this.privateAsnV4DatabaseStream = privateAsnV4DatabaseStream;
+        public Builder loadDataFilePrivateV4(InputStream databaseStream) {
+            this.privateAsnV4DatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param privateAsnV6DatabaseFile 加载ASN IPv6 database文件
+         * @param databaseFile 加载ASN IPv6 database文件
          * @return
          */
-        public Builder loadDataFilePrivateV6(String privateAsnV6DatabaseFile) {
-            this.privateAsnV6DatabaseFile = privateAsnV6DatabaseFile;
+        public Builder loadDataFilePrivateV6(String databaseFile) {
+            this.privateAsnV6DatabaseFile = databaseFile;
             return this;
         }
         /**
          *
-         * @param privateAsnV6DatabaseStream 加载ASN IPv6 database流
+         * @param databaseStream 加载ASN IPv6 database流
          * @return
          */
-        public Builder loadDataFilePrivateV6(InputStream privateAsnV6DatabaseStream) {
-            this.privateAsnV6DatabaseStream = privateAsnV6DatabaseStream;
+        public Builder loadDataFilePrivateV6(InputStream databaseStream) {
+            this.privateAsnV6DatabaseStream = databaseStream;
             return this;
         }
 
diff --git a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
index 5830473..08b1c71 100644
--- a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
+++ b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
@@ -295,124 +295,124 @@ public final class IpLookupV2 extends AbstractDatabaseReader implements IPLocato
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN database文件,不区分IPv4/6
+         * @param databaseFile 加载ASN database文件,不区分IPv4/6
          * @return
          */
-        public Builder loadAsnDataFile(String asnDatabaseFile) {
-            this.publicAsnDatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFile(String databaseFile) {
+            this.publicAsnDatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN database流,不区分IPv4/6
+         * @param databaseStream 加载ASN database流,不区分IPv4/6
          * @return
          */
-        public Builder loadAsnDataFile(InputStream asnDatabaseStream) {
-            this.publicAsnDatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFile(InputStream databaseStream) {
+            this.publicAsnDatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN IPv4 database文件
+         * @param databaseFile 加载ASN IPv4 database文件
          * @return
          */
-        public Builder loadAsnDataFileV4(String asnDatabaseFile) {
-            this.publicAsnV4DatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFileV4(String databaseFile) {
+            this.publicAsnV4DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN IPv4 database流
+         * @param databaseStream 加载ASN IPv4 database流
          * @return
          */
-        public Builder loadAsnDataFileV4(InputStream asnDatabaseStream) {
-            this.publicAsnV4DatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFileV4(InputStream databaseStream) {
+            this.publicAsnV4DatabaseStream = databaseStream;
             return this;
         }
 
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN IPv6 database文件
+         * @param databaseFile 加载ASN IPv6 database文件
          * @return
          */
-        public Builder loadAsnDataFileV6(String asnDatabaseFile) {
-            this.publicAsnV6DatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFileV6(String databaseFile) {
+            this.publicAsnV6DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN IPv6 database流
+         * @param databaseStream 加载ASN IPv6 database流
          * @return
          */
-        public Builder loadAsnDataFileV6(InputStream asnDatabaseStream) {
-            this.publicAsnV6DatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFileV6(InputStream databaseStream) {
+            this.publicAsnV6DatabaseStream = databaseStream;
             return this;
         }
 
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN database文件,不区分IPv4/6
+         * @param databaseFile 加载ASN database文件,不区分IPv4/6
          * @return
          */
-        public Builder loadAsnDataFilePrivate(String asnDatabaseFile) {
-            this.privateAsnDatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFilePrivate(String databaseFile) {
+            this.privateAsnDatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN database流,不区分IPv4/6
+         * @param databaseStream 加载ASN database流,不区分IPv4/6
          * @return
          */
-        public Builder loadAsnDataFilePrivate(InputStream asnDatabaseStream) {
-            this.privateAsnDatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFilePrivate(InputStream databaseStream) {
+            this.privateAsnDatabaseStream = databaseStream;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN IPv4 database文件
+         * @param databaseFile 加载ASN IPv4 database文件
          * @return
          */
-        public Builder loadAsnDataFilePrivateV4(String asnDatabaseFile) {
-            this.privateAsnV4DatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFilePrivateV4(String databaseFile) {
+            this.privateAsnV4DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN IPv4 database流
+         * @param databaseStream 加载ASN IPv4 database流
          * @return
          */
-        public Builder loadAsnDataFilePrivateV4(InputStream asnDatabaseStream) {
-            this.privateAsnV4DatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFilePrivateV4(InputStream databaseStream) {
+            this.privateAsnV4DatabaseStream = databaseStream;
             return this;
         }
 
 
         /**
          *
-         * @param asnDatabaseFile 加载ASN IPv6 database文件
+         * @param databaseFile 加载ASN IPv6 database文件
          * @return Builder
          */
-        public Builder loadAsnDataFilePrivateV6(String asnDatabaseFile) {
-            this.privateAsnV6DatabaseFile = asnDatabaseFile;
+        public Builder loadAsnDataFilePrivateV6(String databaseFile) {
+            this.privateAsnV6DatabaseFile = databaseFile;
             return this;
         }
 
         /**
          *
-         * @param asnDatabaseStream 加载ASN IPv6 database流
+         * @param databaseStream 加载ASN IPv6 database流
          * @return
          */
-        public Builder loadAsnDataFilePrivateV6(InputStream asnDatabaseStream) {
-            this.privateAsnV6DatabaseStream = asnDatabaseStream;
+        public Builder loadAsnDataFilePrivateV6(InputStream databaseStream) {
+            this.privateAsnV6DatabaseStream = databaseStream;
             return this;
         }
 
diff --git a/src/test/java/com/geedgenetworks/test/IpLookupV2Test.java b/src/test/java/com/geedgenetworks/test/IpLookupV2Test.java
index 8e969e6..6a1481b 100644
--- a/src/test/java/com/geedgenetworks/test/IpLookupV2Test.java
+++ b/src/test/java/com/geedgenetworks/test/IpLookupV2Test.java
@@ -80,10 +80,10 @@ public class IpLookupV2Test {
     @Test
     public void testLoadPrivateIPv4MMDBFiles() {
         try {
-           IpLookupV2 ipLookupV4 = new IpLookupV2.Builder(false)
+           IpLookupV2 ipLookup = new IpLookupV2.Builder(false)
                    .loadDataFilePrivateV4(new FileInputStream(new File("dat/ip_v4_user_defined.mmdb")))
                    .build();
-           assertEquals(ipLookupV4.getDbReaders().get(AbstractDatabaseReader.IpVersion.IPv4.name()).size(), 1);
+           assertEquals(ipLookup.getDbReaders().get(AbstractDatabaseReader.IpVersion.IPv4.name()).size(), 1);
         }catch (FileNotFoundException e) {
             logger.error(" File is not found:", e);
         }
@@ -133,7 +133,7 @@ public class IpLookupV2Test {
 
     @Test
     public void testIpLookupByStream() {
-        assertEquals(ipLookupByDatabase.countryLookup("120.221.155.223"), "China");
+        assertEquals(ipLookupByStream.countryLookup("120.221.155.223"), "China");
         assertEquals(ipLookupByStream.provinceLookup("120.221.155.223"), "Shandong");
         assertEquals(ipLookupByStream.cityLookup("120.221.155.223"), "Other");
         assertEquals(ipLookupByStream.cityLookupDetail("120.221.155.223").split("\\" + AbstractDatabaseReader.LOCATION_SEPARATOR).length, 3);