refactor

Author: codetojoy

egg_8_sc_custom_invoke_some/src/main/java/net/codetojoy/CustomJoiner.java

@@ -16,10 +16,10 @@
 public class CustomJoiner<T> implements Joiner<T,List<T>> {
     private static final String LOG_PREFIX = "TRACER CustomJoiner ";
 
-    private AtomicInteger successCounter = new AtomicInteger(0);
-    private AtomicBoolean hasReachedThreshold = new AtomicBoolean(false);
-    private int numTasksForSuccess = 0;
-    private List<T> results = new CopyOnWriteArrayList<>();
+    private final AtomicInteger successCounter = new AtomicInteger(0);
+    private final AtomicBoolean hasReachedThreshold = new AtomicBoolean(false);
+    private final int numTasksForSuccess;
+    private final List<T> results = new CopyOnWriteArrayList<>();
 
     // sanity check:
     private AtomicInteger failCounter = new AtomicInteger(0);
@@ -57,49 +57,14 @@ public boolean onComplete(StructuredTaskScope.Subtask<? extends T> subtask) {
 
     @Override
     public List<T> result() {
+        String stats = " num ok: " + successCounter.get() + " num failed: " + failCounter.get();
         if (! hasReachedThreshold.get()) {
+            System.out.println(LOG_PREFIX + " failed. stats: " + stats);
             throw new IllegalStateException("success threshold not met");
         } 
-        System.out.println(LOG_PREFIX + " success! num ok: " + numTasksForSuccess +
-                            " num failed: " + failCounter.get());
 
-        return results;
-    }
-
-    /*
-     * 
-    @Override
-    protected void handleComplete(StructuredTaskScope.Subtask<? extends T> subtask) {
-        try { 
-            var state = subtask.state();
-            if (state == StructuredTaskScope.Subtask.State.SUCCESS) {
-                int numSuccess = successCounter.incrementAndGet();
-                if (numSuccess <= numTasksForSuccess) {
-                    results.add(subtask.get());
-                } 
+        System.out.println(LOG_PREFIX + " success. stats: " + stats);
 
-                if (numSuccess == numTasksForSuccess) {
-                    hasReachedThreshold.getAndSet(true);
-                    System.out.println(LOG_PREFIX + " success threshold reached...");
-                    shutdown();
-                }
-            } else if (state == StructuredTaskScope.Subtask.State.FAILED) {
-                failCounter.incrementAndGet();
-            }
-        } catch (Exception ex) {
-            System.err.println(LOG_PREFIX + " ERROR caught ex: " + ex.getMessage());
-        }
-    }    
-
-    // TODO: deep copy?
-    public List<T> results() {
-        if (! hasReachedThreshold.get()) {
-            throw new IllegalStateException("success threshold not met");
-        } 
-        System.out.println(LOG_PREFIX + " success! num ok: " + numTasksForSuccess +
-                            " num failed: " + failCounter.get());
-
-        return new ArrayList<T>(results);
+        return results;
     }
-     */
 }

egg_8_sc_custom_invoke_some/src/main/java/net/codetojoy/Worker.java

@@ -5,6 +5,7 @@
 import java.time.Duration;
 
 class Worker { 
+    public static final int pathogenThreshold = 3;
     public static final long THROW_EXCEPTION = -1L;
     public static final String LOG_PREFIX = "TRACER Worker: ";
 
@@ -24,9 +25,10 @@ void logInfo(int index, String name) {
     }
 
     boolean isPathogenic() {
-        long now = System.currentTimeMillis();
-        long remainder = now % 10;
-        return remainder <= 3;
+        int min = 1;
+        int max = 10;
+        int randomNum = min + (int)(Math.random() * ((max - min) + 1));
+        return randomNum < pathogenThreshold;
     }
 
     // see https://stackoverflow.com/questions/15160782