From 46e02524a9f22df4db8239eca5bb88e54ad7a63c Mon Sep 17 00:00:00 2001 From: Matthias Jaros Date: Fri, 21 Aug 2026 23:17:49 +0200 Subject: Replaced if else if else with switch. Added final to final variables --- src/main/java/com/it_jaros/jns/scan/Scanner.java | 10 ++++++---- .../java/com/it_jaros/jns/scan/engine/ProducerThread.java | 10 +++++----- src/main/java/com/it_jaros/jns/scan/engine/ScanHostTask.java | 11 +++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/it_jaros/jns/scan/Scanner.java b/src/main/java/com/it_jaros/jns/scan/Scanner.java index 32f1182..6608ee7 100644 --- a/src/main/java/com/it_jaros/jns/scan/Scanner.java +++ b/src/main/java/com/it_jaros/jns/scan/Scanner.java @@ -63,10 +63,12 @@ public class Scanner implements AutoCloseable { private void runConsumerLoop(ProducerState state, Consumer consumer) { while (state.running().get() || state.inPipeline().get() > 0) { PollState poll = getPollStateOfScanResult(state); - if (poll instanceof PollState.Success(ScanResult value)) { - consumer.accept(value); - } else if (poll instanceof PollState.Failure(Throwable error)) { - mapToScanResult(error).ifPresent(consumer); + switch (poll) { + case PollState.Success(ScanResult value) -> consumer.accept(value); + case PollState.Failure(Throwable error) -> mapToScanResult(error).ifPresent(consumer); + case PollState.Unavailable ignore -> { + // we do nothing + } } } } diff --git a/src/main/java/com/it_jaros/jns/scan/engine/ProducerThread.java b/src/main/java/com/it_jaros/jns/scan/engine/ProducerThread.java index f02e379..059c77b 100644 --- a/src/main/java/com/it_jaros/jns/scan/engine/ProducerThread.java +++ b/src/main/java/com/it_jaros/jns/scan/engine/ProducerThread.java @@ -36,9 +36,9 @@ public class ProducerThread { * @return */ public ProducerState startProducer( - Iterator queue, - int maxWorkers, - Function> taskFactory + final Iterator queue, + final int maxWorkers, + final Function> taskFactory ) { final AtomicInteger inPipeline = new AtomicInteger(0); final AtomicBoolean running = new AtomicBoolean(true); @@ -64,13 +64,13 @@ public class ProducerThread { return new ProducerState<>(running, inPipeline, completionService); } - private void runProducerLoop(ProducerContext context) throws InterruptedException { + private void runProducerLoop(final ProducerContext context) throws InterruptedException { while (!cancelledToken.isCancelled() && context.queue().hasNext()) { submitNext(context); } } - private void submitNext(ProducerContext context) throws InterruptedException { + private void submitNext(final ProducerContext context) throws InterruptedException { context.activeWorkers().acquire(); // just in case something diff --git a/src/main/java/com/it_jaros/jns/scan/engine/ScanHostTask.java b/src/main/java/com/it_jaros/jns/scan/engine/ScanHostTask.java index 02834ff..f99a248 100644 --- a/src/main/java/com/it_jaros/jns/scan/engine/ScanHostTask.java +++ b/src/main/java/com/it_jaros/jns/scan/engine/ScanHostTask.java @@ -100,11 +100,14 @@ public class ScanHostTask implements Callable { private void runConsumerLoop(ProducerState state) { while (state.running().get() || state.inPipeline().get() > 0) { PollState poll = getPortResult(state); - if (poll instanceof PollState.Success(PortResult value)) { - accumulator.add(value); - } else if (poll instanceof PollState.Failure(Throwable error)) { - accumulator.recordFailure(error, -1); + switch (poll) { + case PollState.Success(PortResult value) -> accumulator.add(value); + case PollState.Failure(Throwable error) -> accumulator.recordFailure(error, -1); + case PollState.Unavailable ignore -> { + // we do nothing + } } + } } -- cgit v1.3.1