diff options
author | Kristóf Marussy <kristof@marussy.com> | 2023-04-15 19:30:22 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2023-04-15 19:30:22 +0200 |
commit | 7c06c952c366deae06c7b138df26debea8a4ebc2 (patch) | |
tree | c1055f06a170cc8a6a194eb1acdc93887b0787cb /subprojects/language-web/src/test/java/tools | |
parent | chore(deps): bump dependencies (diff) | |
download | refinery-7c06c952c366deae06c7b138df26debea8a4ebc2.tar.gz refinery-7c06c952c366deae06c7b138df26debea8a4ebc2.tar.zst refinery-7c06c952c366deae06c7b138df26debea8a4ebc2.zip |
refactor: remove virtual thread support
Java 19 is out of support, but Gradle current does not run on Java 20:
https://github.com/gradle/gradle/issues/23488
To avoid the complexity of running the build tool on a different JDK than the
application, we temporarily remove code that depends on experimental Java 19 or
Java 20 features.
Revert once the build can run on Java 20.
Diffstat (limited to 'subprojects/language-web/src/test/java/tools')
2 files changed, 9 insertions, 4 deletions
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java index 53a757eb..40f5281d 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java | |||
@@ -17,9 +17,13 @@ import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletConta | |||
17 | import org.eclipse.jetty.http.HttpHeader; | 17 | import org.eclipse.jetty.http.HttpHeader; |
18 | import org.eclipse.jetty.http.HttpStatus; | 18 | import org.eclipse.jetty.http.HttpStatus; |
19 | import org.eclipse.jetty.server.Server; | 19 | import org.eclipse.jetty.server.Server; |
20 | import org.eclipse.jetty.util.thread.QueuedThreadPool; | ||
20 | import org.eclipse.xtext.testing.GlobalRegistries; | 21 | import org.eclipse.xtext.testing.GlobalRegistries; |
21 | import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento; | 22 | import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento; |
22 | import org.junit.jupiter.api.*; | 23 | import org.junit.jupiter.api.AfterEach; |
24 | import org.junit.jupiter.api.BeforeEach; | ||
25 | import org.junit.jupiter.api.Test; | ||
26 | import org.junit.jupiter.api.TestInfo; | ||
23 | import org.junit.jupiter.params.ParameterizedTest; | 27 | import org.junit.jupiter.params.ParameterizedTest; |
24 | import org.junit.jupiter.params.provider.ValueSource; | 28 | import org.junit.jupiter.params.provider.ValueSource; |
25 | import tools.refinery.language.web.tests.WebSocketIntegrationTestClient; | 29 | import tools.refinery.language.web.tests.WebSocketIntegrationTestClient; |
@@ -193,7 +197,8 @@ class ProblemWebSocketServletIntegrationTest { | |||
193 | private void startServer(String allowedOrigins) { | 197 | private void startServer(String allowedOrigins) { |
194 | var testName = getClass().getSimpleName() + "-" + testInfo.getDisplayName(); | 198 | var testName = getClass().getSimpleName() + "-" + testInfo.getDisplayName(); |
195 | var listenAddress = new InetSocketAddress(HOSTNAME, serverPort); | 199 | var listenAddress = new InetSocketAddress(HOSTNAME, serverPort); |
196 | server = VirtualThreadUtils.newServerWithVirtualThreadsThreadPool(testName, listenAddress); | 200 | server = new Server(listenAddress); |
201 | ((QueuedThreadPool) server.getThreadPool()).setName(testName); | ||
197 | var handler = new ServletContextHandler(); | 202 | var handler = new ServletContextHandler(); |
198 | var holder = new ServletHolder(ProblemWebSocketServlet.class); | 203 | var holder = new ServletHolder(ProblemWebSocketServlet.class); |
199 | if (allowedOrigins != null) { | 204 | if (allowedOrigins != null) { |
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java index 630549d4..52acee6d 100644 --- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java +++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java | |||
@@ -6,14 +6,14 @@ | |||
6 | package tools.refinery.language.web.tests; | 6 | package tools.refinery.language.web.tests; |
7 | 7 | ||
8 | import com.google.inject.Singleton; | 8 | import com.google.inject.Singleton; |
9 | import tools.refinery.language.web.xtext.VirtualThreadExecutorServiceProvider; | 9 | import org.eclipse.xtext.ide.ExecutorServiceProvider; |
10 | 10 | ||
11 | import java.util.ArrayList; | 11 | import java.util.ArrayList; |
12 | import java.util.List; | 12 | import java.util.List; |
13 | import java.util.concurrent.ExecutorService; | 13 | import java.util.concurrent.ExecutorService; |
14 | 14 | ||
15 | @Singleton | 15 | @Singleton |
16 | public class AwaitTerminationExecutorServiceProvider extends VirtualThreadExecutorServiceProvider { | 16 | public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProvider { |
17 | private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>(); | 17 | private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>(); |
18 | 18 | ||
19 | @Override | 19 | @Override |