From 49f72401e044f5a8d276f8cba1695f437291781d Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Tue, 18 Feb 2020 16:30:56 -0800 Subject: [PATCH] Eliminate ATTR_LB_ADDRS in GrpcAttributes. --- .../src/main/java/io/grpc/internal/GrpcAttributes.java | 10 ---------- .../src/main/java/io/grpc/grpclb/GrpclbConstants.java | 6 ++++-- .../grpclb/SecretGrpclbNameResolverProviderTest.java | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/GrpcAttributes.java b/core/src/main/java/io/grpc/internal/GrpcAttributes.java index b7210a16778..186dd8acb6b 100644 --- a/core/src/main/java/io/grpc/internal/GrpcAttributes.java +++ b/core/src/main/java/io/grpc/internal/GrpcAttributes.java @@ -38,16 +38,6 @@ public final class GrpcAttributes { public static final Attributes.Key> NAME_RESOLVER_SERVICE_CONFIG = Attributes.Key.create("service-config"); - /** - * Attribute key for gRPC LB server addresses. - * - *

Deprecated: this will be used for grpclb specific logic, which will be moved out of core. - */ - @Deprecated - @NameResolver.ResolutionResultAttr - public static final Attributes.Key> ATTR_LB_ADDRS = - Attributes.Key.create("io.grpc.grpclb.lbAddrs"); - /** * The naming authority of a gRPC LB server address. It is an address-group-level attribute, * present when the address group is a LoadBalancer. diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java index 75267757273..8d2ca418e5c 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java @@ -42,9 +42,11 @@ public final class GrpclbConstants { static final Attributes.Key TOKEN_ATTRIBUTE_KEY = Attributes.Key.create("lb-token"); - @SuppressWarnings("deprecation") + /** + * Attribute key for gRPC LB server addresses. + */ static final Attributes.Key> ATTR_LB_ADDRS = - io.grpc.internal.GrpcAttributes.ATTR_LB_ADDRS; + Attributes.Key.create("io.grpc.grpclb.lbAddrs"); @SuppressWarnings("deprecation") @EquivalentAddressGroup.Attr diff --git a/grpclb/src/test/java/io/grpc/grpclb/SecretGrpclbNameResolverProviderTest.java b/grpclb/src/test/java/io/grpc/grpclb/SecretGrpclbNameResolverProviderTest.java index 0326dd75097..8ec96be2c86 100644 --- a/grpclb/src/test/java/io/grpc/grpclb/SecretGrpclbNameResolverProviderTest.java +++ b/grpclb/src/test/java/io/grpc/grpclb/SecretGrpclbNameResolverProviderTest.java @@ -35,4 +35,4 @@ public void priority_shouldBeHigherThanDefaultDnsNameResolver() { assertThat(defaultDnsNameResolver.priority()) .isLessThan(grpclbDnsNameResolver.priority()); } -} \ No newline at end of file +}