Throw RuntimeException

Author: faktas2

src/main/java/com/maxmind/db/Networks.java

@@ -16,11 +16,10 @@
  */
 public class Networks<T> implements Iterator<DatabaseRecord<T>> {
     private final Reader reader;
-    private ArrayList<NetworkNode> nodes;
+    private final ArrayList<NetworkNode> nodes;
     private NetworkNode lastNode;
-    private boolean skipAliasedNetworks;
-    private Exception err;
-    private ByteBuffer buffer; /* Stores the buffer for Next() calls */
+    private final boolean skipAliasedNetworks;
+    private final ByteBuffer buffer; /* Stores the buffer for Next() calls */
     private Class<T> typeParameterClass;
 
     /**
@@ -57,14 +56,6 @@ public class Networks<T> implements Iterator<DatabaseRecord<T>> {
         this(reader, false);
     }
 
-    /**
-     * Returns if Networks had any errors.
-     * @return Exception The exception to the Networks iteration.
-     */
-    public Exception getErr() {
-        return this.err;
-    }
-
     /**
      * Sets the Class for the data type in DataRecord.
      * @param cls The class object. ( For example, Map.class )
@@ -82,10 +73,6 @@ public void setDataClass(Class<T> cls) {
      */
     @Override
     public DatabaseRecord<T> next() {
-        if (this.err != null) {
-            return null;
-        } 
-
         try {
             T data = this.reader.resolveDataPointer(
                 this.buffer, this.lastNode.pointer, this.typeParameterClass);
@@ -112,8 +99,7 @@ public DatabaseRecord<T> next() {
 
             return new DatabaseRecord<T>(data, InetAddress.getByAddress(ip), prefixLength);
         } catch (IOException e) {
-            this.err = e;
-            return null;
+            throw new NetworksIterationException(e.getMessage());
         }
     }
 
@@ -136,9 +122,6 @@ public boolean isInIpv4Subtree(byte[] ip) {
     */
     @Override
     public boolean hasNext()  {
-        if (this.err != null) {
-            return false;
-        }
         while (!this.nodes.isEmpty()) {
             // Pop the last one.
             NetworkNode node = this.nodes.remove(this.nodes.size() - 1);
@@ -160,8 +143,7 @@ public boolean hasNext()  {
 
                 byte[] ipRight = Arrays.copyOf(node.ip, node.ip.length);
                 if (ipRight.length <= (node.prefix >> 3)) {
-                    this.err = new InvalidDatabaseException("Invalid search tree");
-                    return false;
+                    throw new NetworksIterationException("Invalid search tree");
                 }
 
                 ipRight[node.prefix >> 3] |= 1 << (7 - (node.prefix % 8));
@@ -173,8 +155,7 @@ public boolean hasNext()  {
                     this.nodes.add(new NetworkNode(ipRight, node.prefix, rightPointer));
                     node.pointer = this.reader.readNode(this.buffer, node.pointer, 0);
                 } catch (InvalidDatabaseException e) {
-                    this.err = e;
-                    return false;
+                    throw new NetworksIterationException(e.getMessage());
                 }
             }
         }

src/main/java/com/maxmind/db/NetworksIterationException.java

@@ -0,0 +1,7 @@
+package com.maxmind.db;
+
+public class NetworksIterationException extends RuntimeException { 
+    NetworksIterationException(String message) {
+        super(message);
+    }
+}

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

@@ -91,7 +91,6 @@ public void testNetworks() throws IOException, InvalidDatabaseException, Invalid
                 while(networks.hasNext()) {
                     DatabaseRecord<Map<String, String>> iteration = networks.next();
                     Map<String, String> data = iteration.getData();
-                    assertNull(networks.getErr());
 
                     InetAddress actualIPInData = InetAddress.getByName(data.get("ip"));
 
@@ -100,7 +99,6 @@ public void testNetworks() throws IOException, InvalidDatabaseException, Invalid
                         actualIPInData);
                 }
 
-                assertNull(networks.getErr());
                 reader.close();
             }
         }
@@ -113,11 +111,14 @@ public void testNetworksWithInvalidSearchTree() throws IOException, InvalidNetwo
 
         Networks networks = reader.networks(false);
         networks.setDataClass(Map.class);
-        while(networks.hasNext()){
-            DatabaseRecord iteration = networks.next();
-        }
 
-        assertTrue(networks.getErr() instanceof InvalidDatabaseException);
+        Exception exception = assertThrows(RuntimeException.class, () -> {
+            while(networks.hasNext()){
+                DatabaseRecord iteration = networks.next();
+            }
+        });
+
+        assertEquals("Invalid search tree", exception.getMessage());
         reader.close();
     }
 
@@ -346,7 +347,6 @@ public void testNetworksWithin() throws IOException, InvalidNetworkException{
                     innerIPs.add(iteration.getNetwork().toString());
                 }
 
-                assertNull(networks.getErr());
                 assertArrayEquals(test.expected, innerIPs.toArray());
 
                 reader.close();
@@ -385,7 +385,6 @@ public void testGeoIPNetworksWithin() throws IOException, InvalidNetworkExceptio
                 innerIPs.add(iteration.getNetwork().toString());
             }
 
-            assertNull(networks.getErr());
             assertArrayEquals(test.expected, innerIPs.toArray());
 
             reader.close();