Skip to content

Commit 9329ca2

Browse files
committed
use .is to check Any
1 parent 69601b6 commit 9329ca2

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

xds/src/main/java/io/grpc/xds/XdsClusterResource.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
8080
"type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext";
8181
private static final String TYPE_URL_UPSTREAM_TLS_CONTEXT_V2 =
8282
"type.googleapis.com/envoy.api.v2.auth.UpstreamTlsContext";
83-
private static final String TYPE_URL_HTTP11_PROXY_UPSTREAM_TRANSPORT =
84-
"type.googleapis.com/envoy.extensions.transport_sockets.http_11_proxy.v3"
85-
+ ".Http11ProxyUpstreamTransport";
8683
private final LoadBalancerRegistry loadBalancerRegistry
8784
= LoadBalancerRegistry.getDefaultRegistry();
8885

@@ -261,14 +258,14 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
261258
TransportSocket transportSocket = cluster.getTransportSocket();
262259

263260
if (hasTransportSocket && !TRANSPORT_SOCKET_NAME_TLS.equals(transportSocket.getName())
264-
&& !(isEnabledXdsHttpConnect && TYPE_URL_HTTP11_PROXY_UPSTREAM_TRANSPORT
265-
.equals(transportSocket.getTypedConfig().getTypeUrl()))) {
261+
&& !(isEnabledXdsHttpConnect && transportSocket.getTypedConfig().is(
262+
Http11ProxyUpstreamTransport.class))) {
266263
return StructOrError.fromError(
267264
"transport-socket with name " + transportSocket.getName() + " not supported.");
268265
}
269266

270-
if (hasTransportSocket && isEnabledXdsHttpConnect && TYPE_URL_HTTP11_PROXY_UPSTREAM_TRANSPORT
271-
.equals(transportSocket.getTypedConfig().getTypeUrl())) {
267+
if (hasTransportSocket && isEnabledXdsHttpConnect && transportSocket.getTypedConfig().is(
268+
Http11ProxyUpstreamTransport.class)) {
272269
isHttp11ProxyAvailable = true;
273270
try {
274271
Http11ProxyUpstreamTransport wrappedTransportSocket = transportSocket

0 commit comments

Comments
 (0)