Added empty method to ScanResult for less redundancy

2 files changed, 14 insertions, 12 deletions

diff --git a/src/main/java/com/it_jaros/jscanner/ScanResult.java b/src/main/java/com/it_jaros/jscanner/ScanResult.java
index 723b7e6..85d9a36 100644
--- a/src/main/java/com/it_jaros/jscanner/ScanResult.java
+++ b/src/main/java/com/it_jaros/jscanner/ScanResult.java
@@ -1,8 +1,6 @@
 package com.it_jaros.jscanner;
 
-import java.util.BitSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public record ScanResult(
         String host,
@@ -10,4 +8,14 @@ public record ScanResult(
         BitSet filteredPorts,
         Map<Integer, ServiceType> bannerRecognition,
         List<ScanFailure> errors
-) {}
+) {
+    public static ScanResult empty(String host) {
+        return new ScanResult(
+                host,
+                new BitSet(PortRange.MAX_PORT),
+                new BitSet(PortRange.MAX_PORT),
+                Collections.emptyMap(),
+                Collections.emptyList()
+        );
+    }
+}
diff --git a/src/main/java/com/it_jaros/jscanner/Scanner.java b/src/main/java/com/it_jaros/jscanner/Scanner.java
index b35161f..e3c886b 100644
--- a/src/main/java/com/it_jaros/jscanner/Scanner.java
+++ b/src/main/java/com/it_jaros/jscanner/Scanner.java
@@ -221,7 +221,7 @@ public class Scanner implements AutoCloseable {
                 scan.getHostCounter().inc();
                 scan.getHostTotalCounter().inc();
                 if (cancelled) {
-                    return null;
+                    return ScanResult.empty(host);
                 }
                 return scanHostPorts();
             } finally {
@@ -233,13 +233,7 @@ public class Scanner implements AutoCloseable {
         private ScanResult scanHostPorts() {
             if (!disableOnlineCheck && !checkHostOnline(host)) {
                 // Unreachable host
-                return new ScanResult(
-                        host,
-                        new BitSet(PortRange.MAX_PORT),
-                        new BitSet(PortRange.MAX_PORT),
-                        new HashMap<>(),
-                        List.of()
-                );
+                return ScanResult.empty(host);
             }
 
             final PortRange portRange = new PortRange(scan.getPorts());