diff --git a/api/src/main/java/io/grpc/ForwardingChannelBuilder.java b/api/src/main/java/io/grpc/ForwardingChannelBuilder.java index e6817345828..1202582421a 100644 --- a/api/src/main/java/io/grpc/ForwardingChannelBuilder.java +++ b/api/src/main/java/io/grpc/ForwardingChannelBuilder.java @@ -128,12 +128,6 @@ public T defaultLoadBalancingPolicy(String policy) { return thisT(); } - @Override - public T enableFullStreamDecompression() { - delegate().enableFullStreamDecompression(); - return thisT(); - } - @Override public T decompressorRegistry(DecompressorRegistry registry) { delegate().decompressorRegistry(registry); diff --git a/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java b/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java index f71f3eea141..9706e9eafd3 100644 --- a/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java +++ b/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java @@ -131,12 +131,6 @@ public T defaultLoadBalancingPolicy(String policy) { return thisT(); } - @Override - public T enableFullStreamDecompression() { - delegate().enableFullStreamDecompression(); - return thisT(); - } - @Override public T decompressorRegistry(DecompressorRegistry registry) { delegate().decompressorRegistry(registry); diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java index 2fb9252fbbe..c25f090712c 100644 --- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java +++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java @@ -258,22 +258,6 @@ public T defaultLoadBalancingPolicy(String policy) { throw new UnsupportedOperationException(); } - /** - * Enables full-stream decompression of inbound streams. This will cause the channel's outbound - * headers to advertise support for GZIP compressed streams, and gRPC servers which support the - * feature may respond with a GZIP compressed stream. - * - *

EXPERIMENTAL: This method is here to enable an experimental feature, and may be changed or - * removed once the feature is stable. - * - * @throws UnsupportedOperationException if unsupported - * @since 1.7.0 - */ - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/3399") - public T enableFullStreamDecompression() { - throw new UnsupportedOperationException(); - } - /** * Set the decompression registry for use in the channel. This is an advanced API call and * shouldn't be used unless you are using custom message encoding. The default supported diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java b/core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java index fde00573766..514a545c3e6 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java @@ -409,12 +409,6 @@ public ManagedChannelImplBuilder defaultLoadBalancingPolicy(String policy) { return this; } - @Override - public ManagedChannelImplBuilder enableFullStreamDecompression() { - this.fullStreamDecompression = true; - return this; - } - @Override public ManagedChannelImplBuilder decompressorRegistry(DecompressorRegistry registry) { if (registry != null) { diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java index 67b80bf74e3..faa03b20319 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java @@ -257,12 +257,6 @@ public void fullStreamDecompression_default() { assertFalse(builder.fullStreamDecompression); } - @Test - public void fullStreamDecompression_enabled() { - assertEquals(builder, builder.enableFullStreamDecompression()); - assertTrue(builder.fullStreamDecompression); - } - @Test public void decompressorRegistry_default() { assertNotNull(builder.decompressorRegistry); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java index 768a32be62c..e059e81ed54 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java @@ -88,7 +88,6 @@ public static void main(String[] args) throws Exception { private String defaultServiceAccount; private String serviceAccountKeyFile; private String oauthScope; - private boolean fullStreamDecompression; private int localHandshakerPort = -1; private Map serviceConfig = null; private int soakIterations = 10; @@ -159,8 +158,6 @@ void parseArgs(String[] args) throws Exception { serviceAccountKeyFile = value; } else if ("oauth_scope".equals(key)) { oauthScope = value; - } else if ("full_stream_decompression".equals(key)) { - fullStreamDecompression = Boolean.parseBoolean(value); } else if ("local_handshaker_port".equals(key)) { localHandshakerPort = Integer.parseInt(value); } else if ("service_config_json".equals(key)) { @@ -226,8 +223,6 @@ void parseArgs(String[] args) throws Exception { + "\n --service_account_key_file Path to service account json key file." + c.serviceAccountKeyFile + "\n --oauth_scope Scope for OAuth tokens. Default " + c.oauthScope - + "\n --full_stream_decompression Enable full-stream decompression. Default " - + c.fullStreamDecompression + "\n --service_config_json=SERVICE_CONFIG_JSON" + "\n Disables service config lookups and sets the provided " + "\n string as the default service config." @@ -638,9 +633,6 @@ protected ManagedChannelBuilder createChannelBuilder() { if (serverHostOverride != null) { nettyBuilder.overrideAuthority(serverHostOverride); } - if (fullStreamDecompression) { - nettyBuilder.enableFullStreamDecompression(); - } // Disable the default census stats interceptor, use testing interceptor instead. InternalNettyChannelBuilder.setStatsEnabled(nettyBuilder, false); if (serviceConfig != null) { @@ -664,9 +656,6 @@ protected ManagedChannelBuilder createChannelBuilder() { okBuilder.overrideAuthority( GrpcUtil.authorityFromHostAndPort(serverHostOverride, serverPort)); } - if (fullStreamDecompression) { - okBuilder.enableFullStreamDecompression(); - } // Disable the default census stats interceptor, use testing interceptor instead. InternalOkHttpChannelBuilder.setStatsEnabled(okBuilder, false); if (serviceConfig != null) {