From 401f792721d5bc6a8c29ceccd12c1a8ca914ad23 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 20 Feb 2024 08:05:08 -0800 Subject: [PATCH 1/3] Change GAE interop tests to use java11 runtime The Java 8 runtime is end of support. Leaving this a gae-jdk8 for now. The gae-jdk8 was because AppEngine changed dramatically from Java 7 to Java 8. Nowadays the versions are more in line with OpenJDK and not very different from each other. Fixes #10925 --- .../gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml b/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml index d8532dfc69e..2fcbe5d8221 100644 --- a/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml +++ b/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml @@ -13,8 +13,7 @@ --> - true java-gae-interop-test - java8 + java11 From 9439870c5e3009e36ac0555f379eebc42f8e893f Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 20 Feb 2024 08:24:54 -0800 Subject: [PATCH 2/3] Remove Java 8 assertion --- .../grpc/testing/integration/NettyClientInteropServlet.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java b/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java index 48978fac0b3..a4752d44c52 100644 --- a/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java +++ b/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java @@ -131,10 +131,6 @@ private void doGetHelper(HttpServletResponse resp) throws IOException { public static final class Tester extends AbstractInteropTest { @Override protected ManagedChannelBuilder createChannelBuilder() { - assertEquals( - "jdk8 required", - "1.8", - System.getProperty("java.specification.version")); ManagedChannelBuilder builder = Grpc.newChannelBuilder(INTEROP_TEST_ADDRESS, TlsChannelCredentials.create()) .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); From 7f0d2693decd323f225c8eb2a8d10f31cb7f5004 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 20 Feb 2024 08:40:09 -0800 Subject: [PATCH 3/3] Remove unused imports --- .../grpc/testing/integration/NettyClientInteropServlet.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java b/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java index a4752d44c52..5a388d27ce9 100644 --- a/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java +++ b/gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java @@ -16,9 +16,6 @@ package io.grpc.testing.integration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import io.grpc.Grpc; import io.grpc.ManagedChannelBuilder; import io.grpc.TlsChannelCredentials; @@ -134,7 +131,6 @@ protected ManagedChannelBuilder createChannelBuilder() { ManagedChannelBuilder builder = Grpc.newChannelBuilder(INTEROP_TEST_ADDRESS, TlsChannelCredentials.create()) .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); - assertTrue(builder instanceof NettyChannelBuilder); ((NettyChannelBuilder) builder) .flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW); return builder;