compiles with jdk 21

codetojoy · codetojoy · commit 8b2f5a2ffdce · 2023-07-10T04:06:16.000-03:00
diff --git a/build-all.sh b/build-all.sh
@@ -40,8 +40,6 @@ cd $MY_HOME/egg__10_sc_nested_scopes_thread_dump
 cd $MY_HOME/egg__10b_sc_nested_experiment
 ./clean.sh && ./compile.sh 
 
-exit 0
-
 cd $MY_HOME/egg__11_sc_utility
 ./clean.sh && ./compile.sh 
 
diff --git a/egg_StackOverflow_74464598/compile.sh b/egg_StackOverflow_74464598/compile.sh
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
 
 mkdir -p $TARGET_DIR
 
-javac --release 19 --enable-preview \
+javac --release 21 --enable-preview \
 -cp $CLASSPATH \
---add-modules jdk.incubator.concurrent \
 -d $TARGET_DIR `find $SRC_DIR -name "*.java"`
 
 echo "compile ok"
diff --git a/egg_StackOverflow_74464598/src/main/java/net/codetojoy/Runner.java b/egg_StackOverflow_74464598/src/main/java/net/codetojoy/Runner.java
@@ -2,16 +2,14 @@
 // note: I no longer own this domain
 package net.codetojoy;
 
-import jdk.incubator.concurrent.*;
-
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
+import java.util.concurrent.*;
 
 public class Runner {
     String runInThread(boolean doShutdown) throws Exception {
         try (var scope = new StructuredTaskScope<String>()) {
             var future = scope.fork(() -> new TaskRunner(doShutdown).run());   
             scope.join();
-            return future.resultNow();
+            return future.get();
         }
     }
 
diff --git a/egg_StackOverflow_74464598/src/main/java/net/codetojoy/TaskRunner.java b/egg_StackOverflow_74464598/src/main/java/net/codetojoy/TaskRunner.java
@@ -3,9 +3,7 @@
 package net.codetojoy;
 
 import java.util.concurrent.Future;
-import jdk.incubator.concurrent.StructuredTaskScope;
-
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
+import java.util.concurrent.StructuredTaskScope;
 
 public class TaskRunner {
     private long taskDelayInMillis = 20_000L;
@@ -56,7 +54,7 @@ public String run() throws Exception {
             scope.join();          
             scope.throwIfFailed();
 
-            result = numOrders.resultNow() + " " + price.resultNow();
+            result = numOrders.get() + " " + price.get();
 
             System.out.println("TRACER TaskRunner post result");
         } catch (Exception ex) {
diff --git a/egg__11_sc_utility/compile.sh b/egg__11_sc_utility/compile.sh
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
 
 mkdir -p $TARGET_DIR
 
-javac --release 19 --enable-preview \
+javac --release 21 --enable-preview \
 -cp $CLASSPATH \
---add-modules jdk.incubator.concurrent \
 -d $TARGET_DIR `find $SRC_DIR -name "*.java"`
 
 echo "compile ok"
diff --git a/egg__11_sc_utility/src/main/java/net/codetojoy/CustomScope.java b/egg__11_sc_utility/src/main/java/net/codetojoy/CustomScope.java
@@ -7,14 +7,6 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
-
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
-
-// NOTE: this is NOT production-ready, just an experiment
-// 
-// ref: https://github.com/openjdk/jdk19/blob/master/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java
-
 class CustomScope<T> extends StructuredTaskScope<T> {
     private final Queue<T> results = new ConcurrentLinkedQueue<>();
 
@@ -23,9 +15,9 @@ class CustomScope<T> extends StructuredTaskScope<T> {
     }
 
     @Override
-    protected void handleComplete(Future<T> future) {
-        if (future.state() == Future.State.SUCCESS) {
-            T result = future.resultNow();
+    protected void handleComplete(StructuredTaskScope.Subtask<? extends T> subtask) {
+        if (subtask.state() == StructuredTaskScope.Subtask.State.SUCCESS) {
+            T result = subtask.get();
             results.add(result);
         }
     }
diff --git a/egg__11_sc_utility/src/main/java/net/codetojoy/Runner.java b/egg__11_sc_utility/src/main/java/net/codetojoy/Runner.java
@@ -2,15 +2,13 @@
 // note: I no longer own this domain
 package net.codetojoy;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope;
 
 import java.time.Instant;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Stream;
 
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
-
 public class Runner {
     private static final int TIMEOUT_IN_SECONDS = 10;
 
@@ -36,7 +34,7 @@ void run() throws Exception {
             var deadline = Instant.now().plusSeconds(TIMEOUT_IN_SECONDS); 
             scope.joinUntil(deadline); 
 
-            var infos = foo.resultNow();
+            var infos = foo.get();
             infos.forEach((info) -> {
                 System.out.println("TRACER received: " + info.toString());
             });
diff --git a/egg__11b_sc_utility/compile.sh b/egg__11b_sc_utility/compile.sh
@@ -10,9 +10,8 @@ TARGET_DIR=$ROOT_DIR/my_build/main
 
 mkdir -p $TARGET_DIR
 
-javac --release 19 --enable-preview \
+javac --release 21 --enable-preview \
 -cp $CLASSPATH \
---add-modules jdk.incubator.concurrent \
 -d $TARGET_DIR `find $SRC_DIR -name "*.java"`
 
 echo "compile ok"
diff --git a/egg__11b_sc_utility/src/main/java/net/codetojoy/InvokeAllScope.java b/egg__11b_sc_utility/src/main/java/net/codetojoy/InvokeAllScope.java
@@ -7,34 +7,29 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
-
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
-
 // NOTE: this is NOT production-ready, just an experiment
 // 
-// ref: https://github.com/openjdk/jdk19/blob/master/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java
 
 public class InvokeAllScope<T> extends StructuredTaskScope<T> {
     private final Queue<T> results = new ConcurrentLinkedQueue<>();
     private final AtomicInteger successCounter = new AtomicInteger(0);
     private final AtomicInteger failureCounter = new AtomicInteger(0);
-    private final AtomicInteger cancelCounter = new AtomicInteger(0);
+    private final AtomicInteger unavailableCounter = new AtomicInteger(0);
 
     public InvokeAllScope() {
         super(null, Thread.ofVirtual().factory());
     }
 
     @Override
-    protected void handleComplete(Future<T> future) {
-        if (future.state() == Future.State.SUCCESS) {
-            T result = future.resultNow();
+    protected void handleComplete(StructuredTaskScope.Subtask<? extends T> subtask) {
+        if (subtask.state() == StructuredTaskScope.Subtask.State.SUCCESS) {
+            T result = subtask.get();
             results.add(result);
             successCounter.getAndIncrement();
-        } else if (future.state() == Future.State.FAILED) {
+        } else if (subtask.state() == StructuredTaskScope.Subtask.State.FAILED) {
             failureCounter.getAndIncrement();
-        } else if (future.state() == Future.State.CANCELLED) {
-            cancelCounter.getAndIncrement();
+        } else if (subtask.state() == StructuredTaskScope.Subtask.State.UNAVAILABLE) {
+            unavailableCounter.getAndIncrement();
         }
     }
 
@@ -43,7 +38,7 @@ private void emitCounters() {
         if (doEmit) {
             System.out.println("TRACER scope # success: " + successCounter.get());
             System.out.println("TRACER scope # failure: " + failureCounter.get());
-            System.out.println("TRACER scope # cancel : " + cancelCounter.get());
+            System.out.println("TRACER scope # unavailable : " + unavailableCounter.get());
         }
     }
 
diff --git a/egg__11b_sc_utility/src/main/java/net/codetojoy/Runner.java b/egg__11b_sc_utility/src/main/java/net/codetojoy/Runner.java
@@ -2,15 +2,13 @@
 // note: I no longer own this domain
 package net.codetojoy;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope;
 
 import java.time.Instant;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Stream;
 
-// javadoc here: https://download.java.net/java/early_access/jdk19/docs/api/jdk.incubator.concurrent/jdk/incubator/concurrent/package-summary.html
-
 public class Runner {
     private static final int TIMEOUT_IN_SECONDS = 10;
 
@@ -36,7 +34,7 @@ void run() throws Exception {
             var deadline = Instant.now().plusSeconds(TIMEOUT_IN_SECONDS); 
             scope.joinUntil(deadline); 
 
-            var infos = foo.resultNow();
+            var infos = foo.get();
             infos.forEach((info) -> {
                 System.out.println("TRACER received: " + info.toString());
             });
