Same optimization for scanHostPorts as for runScan. Moved producer into

same method using function and generics

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/it_jaros/jscanner/PortRange.java b/src/main/java/com/it_jaros/jscanner/PortRange.java
index 8159336..9e66371 100644
--- a/src/main/java/com/it_jaros/jscanner/PortRange.java
+++ b/src/main/java/com/it_jaros/jscanner/PortRange.java
@@ -1,9 +1,10 @@
 package com.it_jaros.jscanner;
 
 import java.util.BitSet;
+import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public class PortRange {
+public class PortRange implements Iterator<Integer> {
 
     public static final int MIN_PORT = 1;
     public static final int MAX_PORT = 65535;
@@ -79,7 +80,8 @@ public class PortRange {
         }
     }
 
-    public int next() {
+    @Override
+    public Integer next() {
         int p = availablePorts.nextSetBit(currentPortCursor);
         if (p > 0) {
             availablePorts.clear(p);
@@ -91,6 +93,7 @@ public class PortRange {
         throw new NoSuchElementException("Reached end of port range");
     }
 
+    @Override
     public boolean hasNext() {
         return availablePorts.nextSetBit(currentPortCursor) > 0;
     }