From 111033e818f01efbad8429c0a4cefe7a95491a77 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 24 Feb 2023 13:44:32 -0800 Subject: [PATCH] servlet: Don't assume ManagedChannelBuilder will be NettyChannelBuilder (#9914) --- .../jettyTest/java/io/grpc/servlet/JettyInteropTest.java | 7 +++---- .../tomcatTest/java/io/grpc/servlet/TomcatInteropTest.java | 7 +++---- .../java/io/grpc/servlet/UndertowInteropTest.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/servlet/src/jettyTest/java/io/grpc/servlet/JettyInteropTest.java b/servlet/src/jettyTest/java/io/grpc/servlet/JettyInteropTest.java index ebdf029fe2..9b54eb5a0d 100644 --- a/servlet/src/jettyTest/java/io/grpc/servlet/JettyInteropTest.java +++ b/servlet/src/jettyTest/java/io/grpc/servlet/JettyInteropTest.java @@ -83,10 +83,9 @@ public class JettyInteropTest extends AbstractInteropTest { @Override protected ManagedChannelBuilder createChannelBuilder() { - NettyChannelBuilder builder = - (NettyChannelBuilder) ManagedChannelBuilder.forAddress(HOST, port) - .usePlaintext() - .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); + NettyChannelBuilder builder = NettyChannelBuilder.forAddress(HOST, port) + .usePlaintext() + .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); InternalNettyChannelBuilder.setStatsEnabled(builder, false); builder.intercept(createCensusStatsClientInterceptor()); return builder; diff --git a/servlet/src/tomcatTest/java/io/grpc/servlet/TomcatInteropTest.java b/servlet/src/tomcatTest/java/io/grpc/servlet/TomcatInteropTest.java index f28a741928..1422b5388f 100644 --- a/servlet/src/tomcatTest/java/io/grpc/servlet/TomcatInteropTest.java +++ b/servlet/src/tomcatTest/java/io/grpc/servlet/TomcatInteropTest.java @@ -94,10 +94,9 @@ public class TomcatInteropTest extends AbstractInteropTest { @Override protected ManagedChannelBuilder createChannelBuilder() { - NettyChannelBuilder builder = - (NettyChannelBuilder) ManagedChannelBuilder.forAddress(HOST, port) - .usePlaintext() - .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); + NettyChannelBuilder builder = NettyChannelBuilder.forAddress(HOST, port) + .usePlaintext() + .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE); InternalNettyChannelBuilder.setStatsEnabled(builder, false); builder.intercept(createCensusStatsClientInterceptor()); return builder; diff --git a/servlet/src/undertowTest/java/io/grpc/servlet/UndertowInteropTest.java b/servlet/src/undertowTest/java/io/grpc/servlet/UndertowInteropTest.java index 600400b14b..b8be018664 100644 --- a/servlet/src/undertowTest/java/io/grpc/servlet/UndertowInteropTest.java +++ b/servlet/src/undertowTest/java/io/grpc/servlet/UndertowInteropTest.java @@ -111,7 +111,7 @@ public class UndertowInteropTest extends AbstractInteropTest { @Override protected ManagedChannelBuilder createChannelBuilder() { - NettyChannelBuilder builder = (NettyChannelBuilder) ManagedChannelBuilder + NettyChannelBuilder builder = NettyChannelBuilder .forAddress(HOST, port) .usePlaintext() .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE);