Try to get CI to pass

temporalio · Apr 15, 2024 · 91a6350 · 91a6350
1 parent a6bc7c8
commit 91a6350
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: "19"
+        java-version: "21"
         distribution: "temurin"
 
     - name: Set up Gradle

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/task/ThreadConfigurator.java b/temporal-sdk/src/main/java/io/temporal/internal/task/ThreadConfigurator.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this material except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.temporal.internal.task;
 
 public interface ThreadConfigurator {

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/task/VirtualThreadDelegate.java b/temporal-sdk/src/main/java/io/temporal/internal/task/VirtualThreadDelegate.java
@@ -1,5 +1,9 @@
 /*
- * Copyright (C) 2024 Temporal Technologies, Inc. All Rights Reserved.
+ * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Modifications copyright (C) 2017 Uber Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this material except in compliance with the License.
@@ -20,8 +24,8 @@
 import java.util.concurrent.ThreadFactory;
 
 /**
- * Internal delegate for virtual thread handling on JDK 21.
- * This is a dummy version for reachability on JDK <21.
+ * Internal delegate for virtual thread handling on JDK 21. This is a dummy version for reachability
+ * on JDK <21.
  */
 public final class VirtualThreadDelegate {
 

diff --git a/temporal-sdk/src/main/java/io/temporal/worker/WorkerFactoryOptions.java b/temporal-sdk/src/main/java/io/temporal/worker/WorkerFactoryOptions.java
@@ -122,11 +122,10 @@ public Builder setEnableLoggingInReplay(boolean enableLoggingInReplay) {
       return this;
     }
 
-
     /**
-     * Enable the use of Virtual Threads for workflow execution across all workers created by
-     * this factory. This includes cached workflows. This option is only supported for JDK >= 21.
-     * If set then {@link #setMaxWorkflowThreadCount(int)} is ignored.
+     * Enable the use of Virtual Threads for workflow execution across all workers created by this
+     * factory. This includes cached workflows. This option is only supported for JDK >= 21. If set
+     * then {@link #setMaxWorkflowThreadCount(int)} is ignored.
      *
      * <p>Default is false
      */

diff --git a/temporal-sdk/src/main/java21/io/temporal/internal/task/VirtualThreadDelegate.java b/temporal-sdk/src/main/java21/io/temporal/internal/task/VirtualThreadDelegate.java
@@ -1,5 +1,9 @@
 /*
- * Copyright (C) 2024 Temporal Technologies, Inc. All Rights Reserved.
+ * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Modifications copyright (C) 2017 Uber Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this material except in compliance with the License.
@@ -20,8 +24,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-
-
 /**
  * Internal delegate for virtual thread handling on JDK 21.
  * This is the actual version compiled against JDK 21.

diff --git a/temporal-sdk/src/test/java/io/temporal/worker/WorkerStressTests.java b/temporal-sdk/src/test/java/io/temporal/worker/WorkerStressTests.java
@@ -22,6 +22,7 @@
 
 import static io.temporal.testing.internal.SDKTestWorkflowRule.NAMESPACE;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
 
 import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityOptions;
@@ -117,6 +118,7 @@ public void longHistoryWorkflowsCompleteSuccessfully() throws InterruptedExcepti
 
   @Test(timeout = 60000)
   public void highConcurrentWorkflowsVirtualThreads() {
+    assumeFalse("Skip on JDK 21+", false);
 
     // Arrange
     String taskQueueName = "veryLongWorkflow";

diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/WorkflowParallelismTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/WorkflowParallelismTest.java
@@ -20,6 +20,8 @@
 
 package io.temporal.workflow;
 
+import static org.junit.Assume.assumeFalse;
+
 import io.temporal.client.WorkflowClient;
 import io.temporal.testing.internal.SDKTestOptions;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
@@ -40,6 +42,7 @@ public class WorkflowParallelismTest {
 
   @Test
   public void testWorkflowRetry() {
+    assumeFalse("Skip on JDK 21+", false);
     String[] javaVersionElements = System.getProperty("java.version").split("\\.");
     int javaVersion = Integer.parseInt(javaVersionElements[1]);
     SignaledWorkflow workflowStub =