From deb0e12f5ad4efedf6dc9d11b3d0eb94747b7280 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 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/GrpcAttributes.java b/core/src/main/java/io/grpc/internal/GrpcAttributes.java index b7210a167781..186dd8acb6b7 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 752677572737..8d2ca418e5c1 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