From 3b2cba09c116957a7978c6b6291ef0f3b344d6cb Mon Sep 17 00:00:00 2001 From: sanjaypujare Date: Thu, 25 May 2023 13:46:24 -0700 Subject: [PATCH] api: remove experimentalApi setting from proxyDetector and related classes (#10216) --- api/src/main/java/io/grpc/HttpConnectProxiedSocketAddress.java | 1 - api/src/main/java/io/grpc/ManagedChannelBuilder.java | 1 - api/src/main/java/io/grpc/ProxiedSocketAddress.java | 1 - api/src/main/java/io/grpc/ProxyDetector.java | 1 - 4 files changed, 4 deletions(-) diff --git a/api/src/main/java/io/grpc/HttpConnectProxiedSocketAddress.java b/api/src/main/java/io/grpc/HttpConnectProxiedSocketAddress.java index 2d620523ff..d59c53db1d 100644 --- a/api/src/main/java/io/grpc/HttpConnectProxiedSocketAddress.java +++ b/api/src/main/java/io/grpc/HttpConnectProxiedSocketAddress.java @@ -28,7 +28,6 @@ import javax.annotation.Nullable; /** * An {@link ProxiedSocketAddress} for making a connection to an endpoint via an HTTP CONNECT proxy. */ -@ExperimentalApi("https://github.com/grpc/grpc-java/issues/5279") public final class HttpConnectProxiedSocketAddress extends ProxiedSocketAddress { private static final long serialVersionUID = 0L; diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java index 0113ca9098..982577c622 100644 --- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java +++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java @@ -517,7 +517,6 @@ public abstract class ManagedChannelBuilder> * @return this * @since 1.19.0 */ - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/5113") public T proxyDetector(ProxyDetector proxyDetector) { throw new UnsupportedOperationException(); } diff --git a/api/src/main/java/io/grpc/ProxiedSocketAddress.java b/api/src/main/java/io/grpc/ProxiedSocketAddress.java index 67d7837437..56b543b5cb 100644 --- a/api/src/main/java/io/grpc/ProxiedSocketAddress.java +++ b/api/src/main/java/io/grpc/ProxiedSocketAddress.java @@ -22,7 +22,6 @@ import java.net.SocketAddress; * An address that contains the information about making a connection via a proxy. It is created by * a {@link ProxyDetector}. */ -@ExperimentalApi("https://github.com/grpc/grpc-java/issues/5279") public abstract class ProxiedSocketAddress extends SocketAddress { private static final long serialVersionUID = 0L; } diff --git a/api/src/main/java/io/grpc/ProxyDetector.java b/api/src/main/java/io/grpc/ProxyDetector.java index 7c04329c07..1d3686f40e 100644 --- a/api/src/main/java/io/grpc/ProxyDetector.java +++ b/api/src/main/java/io/grpc/ProxyDetector.java @@ -46,7 +46,6 @@ import javax.annotation.Nullable; * Netty transport and the OkHttp transport currently only support {@link * HttpConnectProxiedSocketAddress} which is returned by the default {@code ProxyDetector}. */ -@ExperimentalApi("https://github.com/grpc/grpc-java/issues/5279") public interface ProxyDetector { /** * Given a target address, returns a proxied address if a proxy should be used. If no proxy should