Use var in some of the places

Author: marschall

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

@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -52,10 +51,10 @@ private static void threadTest(final Reader reader)
     private static void runThreads(Callable<Map<?, ?>> task)
         throws InterruptedException, ExecutionException {
         int threadCount = 256;
-        List<Callable<Map<?, ?>>> tasks = Collections.nCopies(threadCount, task);
+        var tasks = Collections.nCopies(threadCount, task);
         ExecutorService executorService = Executors
             .newFixedThreadPool(threadCount);
-        List<Future<Map<?, ?>>> futures = executorService.invokeAll(tasks);
+        var futures = executorService.invokeAll(tasks);
 
         for (Future<Map<?, ?>> future : futures) {
             Map<?, ?> record = future.get();

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

@@ -85,11 +85,11 @@ public void testNetworks() throws IOException, InvalidDatabaseException, Invalid
                 File file = getFile("MaxMind-DB-test-ipv" + ipVersion + "-" + recordSize + ".mmdb");
 
                 Reader reader = new Reader(file);
-                Networks<?> networks = reader.networks(false, Map.class);
+                var networks = reader.networks(false, Map.class);
 
                 while(networks.hasNext()) {
-                    DatabaseRecord<?> iteration = networks.next();
-                    Map<?, ?> data = (Map<?, ?>) iteration.getData();
+                    var iteration = networks.next();
+                    var data = (Map<?, ?>) iteration.getData();
 
                     InetAddress actualIPInData = InetAddress.getByName((String) data.get("ip"));
 
@@ -110,7 +110,7 @@ public void testNetworksWithInvalidSearchTree() throws IOException, InvalidNetwo
         File file = getFile("MaxMind-DB-test-broken-search-tree-24.mmdb");
         Reader reader = new Reader(file);
 
-        Networks<?> networks = reader.networks(false, Map.class);
+        var networks = reader.networks(false, Map.class);
 
         Exception exception = assertThrows(RuntimeException.class, () -> {
             while(networks.hasNext()){
@@ -339,11 +339,11 @@ public void testNetworksWithin() throws IOException, InvalidNetworkException{
                 Network network = new Network(address, test.prefix);
 
                 boolean includeAliasedNetworks = !test.skipAliasedNetworks;
-                Networks<?> networks = reader.networksWithin(network, includeAliasedNetworks, Map.class);
+                var networks = reader.networksWithin(network, includeAliasedNetworks, Map.class);
 
                 List<String> innerIPs  = new ArrayList<>();
                 while(networks.hasNext()){
-                    DatabaseRecord<?> iteration = networks.next();
+                    var iteration = networks.next();
                     innerIPs.add(iteration.getNetwork().toString());
                 }
 
@@ -376,11 +376,11 @@ public void testGeoIPNetworksWithin() throws IOException, InvalidNetworkExceptio
             InetAddress address = InetAddress.getByName(test.network);
             Network network = new Network(address, test.prefix);
 
-            Networks<?> networks = reader.networksWithin(network, test.skipAliasedNetworks, Map.class);
+            var networks = reader.networksWithin(network, test.skipAliasedNetworks, Map.class);
 
             ArrayList<String> innerIPs = new ArrayList<>();
             while(networks.hasNext()){
-                DatabaseRecord<?> iteration = networks.next();
+                var iteration = networks.next();
                 innerIPs.add(iteration.getNetwork().toString());
             }
 
@@ -432,7 +432,7 @@ public void testGetRecord() throws IOException {
         };
         for (GetRecordTest test : stringTests) {
             try (Reader reader = new Reader(test.db)) {
-                DatabaseRecord<String> record = reader.getRecord(test.ip, String.class);
+                var record = reader.getRecord(test.ip, String.class);
 
                 assertEquals(test.network, record.getNetwork().toString());
 
@@ -497,7 +497,7 @@ public void testDecodingTypesPointerDecoderFile() throws IOException {
     }
 
     private void testDecodingTypes(Reader reader, boolean booleanValue) throws IOException {
-        Map<?, ?> record = reader.get(InetAddress.getByName("::1.1.1.0"), Map.class);
+        var record = reader.get(InetAddress.getByName("::1.1.1.0"), Map.class);
 
         if (booleanValue) {
             assertTrue((boolean) record.get("boolean"));
@@ -510,19 +510,19 @@ private void testDecodingTypes(Reader reader, boolean booleanValue) throws IOExc
 
         assertEquals("unicode! ☯ - ♫", record.get("utf8_string"));
 
-        List<?> array = (List<?>) record.get("array");
+        var array = (List<?>) record.get("array");
         assertEquals(3, array.size());
         assertEquals(1, (long) array.get(0));
         assertEquals(2, (long) array.get(1));
         assertEquals(3, (long) array.get(2));
 
-        Map<?, ?> map = (Map<?, ?>) record.get("map");
+        var map = (Map<?, ?>) record.get("map");
         assertEquals(1, map.size());
 
-        Map<?, ?> mapX = (Map<?, ?>) map.get("mapX");
+        var mapX = (Map<?, ?>) map.get("mapX");
         assertEquals(2, mapX.size());
 
-        List<?> arrayX = (List<?>) mapX.get("arrayX");
+        var arrayX = (List<?>) mapX.get("arrayX");
         assertEquals(3, arrayX.size());
         assertEquals(7, (long) arrayX.get(0));
         assertEquals(8, (long) arrayX.get(1));
@@ -814,18 +814,18 @@ public void testZerosStream() throws IOException {
     }
 
     private void testZeros(Reader reader) throws IOException {
-        Map<?, ?> record = reader.get(InetAddress.getByName("::"), Map.class);
+        var record = reader.get(InetAddress.getByName("::"), Map.class);
 
         assertFalse((boolean) record.get("boolean"));
 
         assertArrayEquals(new byte[0], (byte[]) record.get("bytes"));
 
         assertEquals("", record.get("utf8_string"));
 
-        List<?> array = (List<?>) record.get("array");
+        var array = (List<?>) record.get("array");
         assertEquals(0, array.size());
 
-        Map<?, ?> map = (Map<?, ?>) record.get("map");
+        var map = (Map<?, ?>) record.get("map");
         assertEquals(0, map.size());
 
         assertEquals(0, (double) record.get("double"), 0.000000001);
@@ -1006,14 +1006,14 @@ public TestDataTypeMismatchInModel(
     public void testDecodeConcurrentHashMap() throws IOException {
         this.testReader = new Reader(getFile("GeoIP2-City-Test.mmdb"));
 
-        Map<?, ?> m = this.testReader.get(
+        var m = this.testReader.get(
             InetAddress.getByName("2.125.160.216"),
             ConcurrentHashMap.class
         );
 
-        List<?> subdivisions = (List<?>) m.get("subdivisions");
+        var subdivisions = (List<?>) m.get("subdivisions");
 
-        Map<?, ?> eng = (Map<?, ?>) subdivisions.get(0);
+        var eng = (Map<?, ?>) subdivisions.get(0);
 
         String isoCode = (String) eng.get("iso_code");
         assertEquals("ENG", isoCode);