Boundaries: Added PortList class to encapsulate BitSet and thus have a

clear boundary to the outside world that uses the result

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/it_jaros/jscanner/ProgressBar.java b/src/main/java/com/it_jaros/jscanner/ProgressBar.java
index 795c9bb..3a38069 100644
--- a/src/main/java/com/it_jaros/jscanner/ProgressBar.java
+++ b/src/main/java/com/it_jaros/jscanner/ProgressBar.java
@@ -2,7 +2,7 @@ package com.it_jaros.jscanner;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.util.BitSet;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -75,12 +75,12 @@ public class ProgressBar {
         sb.append("\n");
         if (!result.openPorts().isEmpty()) {
             sb.append(
-                    String.format("\t (%d) open:\t%s%n", result.openPorts().cardinality(), map(result.openPorts(), result.bannerRecognition()))
+                    String.format("\t (%d) open:\t%s%n", result.openPorts().size(), map(result.openPorts().getPorts(), result.bannerRecognition()))
             );
         }
         if (showFilteredPorts && !result.filteredPorts().isEmpty()) {
             sb.append(
-                    String.format("\t (%d) filtered:\t%s%n", result.filteredPorts().cardinality(), map(result.filteredPorts()))
+                    String.format("\t (%d) filtered:\t%s%n", result.filteredPorts().size(), map(result.filteredPorts().getPorts()))
             );
         }
         sb.append("\n");
@@ -88,12 +88,12 @@ public class ProgressBar {
         System.out.flush();
     }
 
-    private static String map(BitSet ports) {
-        return ports.stream().mapToObj(String::valueOf).collect(Collectors.joining(","));
+    private static String map(List<Integer> ports) {
+        return ports.stream().map(String::valueOf).collect(Collectors.joining(","));
     }
 
-    private static String map(BitSet ports, Map<Integer, ServiceType> bannerRecognition) {
-        return ports.stream().mapToObj(port -> {
+    private static String map(List<Integer> ports, Map<Integer, ServiceType> bannerRecognition) {
+        return ports.stream().map(port -> {
             ServiceType serviceType = bannerRecognition.getOrDefault(port, ServiceType.UNKNOWN);
 
             if (serviceType == ServiceType.UNKNOWN) {