Migrate to Java: NonBlockingLoops

marianobarrios · May 9, 2024 · e44082a · e44082a
1 parent 63242a8
commit e44082a
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 219 deletions.
diff --git a/src/test/scala/tlschannel/MultiNonBlockingTest.java b/src/test/scala/tlschannel/MultiNonBlockingTest.java
@@ -2,12 +2,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.List;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import scala.Option;
-import scala.collection.immutable.Seq;
+import scala.jdk.CollectionConverters;
 import tlschannel.helpers.NonBlockingLoops;
 import tlschannel.helpers.SocketGroups.SocketPair;
 import tlschannel.helpers.SocketPairFactory;
@@ -25,19 +26,21 @@ public class MultiNonBlockingTest {
     @Test
     public void testTaskLoop() {
         System.out.println("testTasksInExecutorWithRenegotiation():");
-        Seq<SocketPair> pairs = factory.nioNioN(
-                Option.apply(null), totalConnections, Option.apply(null), true, false, Option.apply(null));
+        List<SocketPair> pairs = CollectionConverters.SeqHasAsJava(factory.nioNioN(
+                        Option.apply(null), totalConnections, Option.apply(null), true, false, Option.apply(null)))
+                .asJava();
         NonBlockingLoops.Report report = NonBlockingLoops.loop(pairs, dataSize, false);
-        assertEquals(0, report.asyncTasksRun());
+        assertEquals(0, report.asyncTasksRun);
         report.print();
     }
 
     // running tasks in executor - no renegotiation
     @Test
     public void testTasksInExecutor() {
         System.out.println("testTasksInExecutorWithRenegotiation():");
-        Seq<SocketPair> pairs = factory.nioNioN(
-                Option.apply(null), totalConnections, Option.apply(null), false, false, Option.apply(null));
+        List<SocketPair> pairs = CollectionConverters.SeqHasAsJava(factory.nioNioN(
+                        Option.apply(null), totalConnections, Option.apply(null), false, false, Option.apply(null)))
+                .asJava();
         NonBlockingLoops.Report report = NonBlockingLoops.loop(pairs, dataSize, false);
         report.print();
     }
@@ -46,19 +49,21 @@ public void testTasksInExecutor() {
     @Test
     public void testTasksInLoopWithRenegotiation() {
         System.out.println("testTasksInExecutorWithRenegotiation():");
-        Seq<SocketPair> pairs = factory.nioNioN(
-                Option.apply(null), totalConnections, Option.apply(null), true, false, Option.apply(null));
+        List<SocketPair> pairs = CollectionConverters.SeqHasAsJava(factory.nioNioN(
+                        Option.apply(null), totalConnections, Option.apply(null), true, false, Option.apply(null)))
+                .asJava();
         NonBlockingLoops.Report report = NonBlockingLoops.loop(pairs, dataSize, true);
-        assertEquals(0, report.asyncTasksRun());
+        assertEquals(0, report.asyncTasksRun);
         report.print();
     }
 
     // running tasks in executor - with renegotiation
     @Test
     public void testTasksInExecutorWithRenegotiation() {
         System.out.println("testTasksInExecutorWithRenegotiation():");
-        Seq<SocketPair> pairs = factory.nioNioN(
-                Option.apply(null), totalConnections, Option.apply(null), false, false, Option.apply(null));
+        List<SocketPair> pairs = CollectionConverters.SeqHasAsJava(factory.nioNioN(
+                        Option.apply(null), totalConnections, Option.apply(null), false, false, Option.apply(null)))
+                .asJava();
         NonBlockingLoops.Report report = NonBlockingLoops.loop(pairs, dataSize, true);
         report.print();
     }

diff --git a/src/test/scala/tlschannel/NonBlockingTest.java b/src/test/scala/tlschannel/NonBlockingTest.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import scala.Option;
 import scala.Some;
-import scala.jdk.javaapi.CollectionConverters;
 import tlschannel.helpers.NonBlockingLoops;
 import tlschannel.helpers.SocketGroups.SocketPair;
 import tlschannel.helpers.SocketPairFactory;
@@ -46,11 +45,8 @@ public Collection<DynamicTest> testSelectorLoop() {
                                 false,
                                 Option.apply(null));
 
-                        NonBlockingLoops.Report report = NonBlockingLoops.loop(
-                                CollectionConverters.asScala(Collections.singletonList(socketPair))
-                                        .toSeq(),
-                                dataSize,
-                                true);
+                        NonBlockingLoops.Report report =
+                                NonBlockingLoops.loop(Collections.singletonList(socketPair), dataSize, true);
                         System.out.printf("%5d -eng-> %5d -net-> %5d -eng-> %5d\n", size1, size2, size1, size2);
                         report.print();
                     }));

diff --git a/src/test/scala/tlschannel/NullMultiNonBlockingTest.java b/src/test/scala/tlschannel/NullMultiNonBlockingTest.java
@@ -1,12 +1,13 @@
 package tlschannel;
 
+import java.util.List;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import scala.Option;
-import scala.collection.immutable.Seq;
+import scala.jdk.CollectionConverters;
 import tlschannel.helpers.NonBlockingLoops;
 import tlschannel.helpers.SocketGroups.SocketPair;
 import tlschannel.helpers.SocketPairFactory;
@@ -25,10 +26,11 @@ public class NullMultiNonBlockingTest {
 
     @Test
     public void testRunTasksInNonBlockingLoop() {
-        Seq<SocketPair> pairs =
-                factory.nioNioN(null, totalConnections, Option.apply(null), true, false, Option.apply(null));
+        List<SocketPair> pairs = CollectionConverters.SeqHasAsJava(
+                        factory.nioNioN(null, totalConnections, Option.apply(null), true, false, Option.apply(null)))
+                .asJava();
         NonBlockingLoops.Report report = NonBlockingLoops.loop(pairs, dataSize, false);
-        Assertions.assertEquals(0, report.asyncTasksRun());
+        Assertions.assertEquals(0, report.asyncTasksRun);
     }
 
     @AfterAll