From e43ae6f19127e610e560f83169a82d171718ec42 Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Fri, 31 Jan 2020 16:35:30 -0800 Subject: [PATCH 1/2] Add getters for grpclb balancer address related attributes. --- .../grpclb/InternalGrpclbConstantsAccessor.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java b/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java index 298add4b738..6bd2c1fc9cf 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java +++ b/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java @@ -20,6 +20,7 @@ import io.grpc.EquivalentAddressGroup; import io.grpc.Internal; import java.util.List; +import javax.annotation.Nullable; /** * Internal {@link GrpclbConstants} accessor. This is intended for usage internal to the gRPC @@ -40,10 +41,26 @@ public static Attributes setLbAddrAuthorityAttr( return attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDR_AUTHORITY, authority).build(); } + /** + * Populates gRPC LB address authority from attributes. + */ + @Nullable + public static String getLbAddrAuthorityAttr(@EquivalentAddressGroup.Attr Attributes attrs) { + return attrs.get(GrpclbConstants.ATTR_LB_ADDR_AUTHORITY); + } + /** * Sets attribute for gRPC LB addresses. */ public static Attributes setLbAddrAttr(Attributes attrs, List lbAddrs) { return attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDRS, lbAddrs).build(); } + + /** + * Populates gRPC LB addresses from attributes. + */ + @Nullable + public static List getLbAddrAttr(Attributes attrs) { + return attrs.get(GrpclbConstants.ATTR_LB_ADDRS); + } } From 8085be5c7b3d5a545124ca5538556a1594a2c1c0 Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Fri, 31 Jan 2020 16:50:57 -0800 Subject: [PATCH 2/2] Directly expose constants instead of getters/setters. --- .../InternalGrpclbConstantsAccessor.java | 35 +++---------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java b/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java index 6bd2c1fc9cf..3360a701b03 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java +++ b/grpclb/src/main/java/io/grpc/grpclb/InternalGrpclbConstantsAccessor.java @@ -20,7 +20,6 @@ import io.grpc.EquivalentAddressGroup; import io.grpc.Internal; import java.util.List; -import javax.annotation.Nullable; /** * Internal {@link GrpclbConstants} accessor. This is intended for usage internal to the gRPC @@ -33,34 +32,10 @@ public class InternalGrpclbConstantsAccessor { private InternalGrpclbConstantsAccessor() { } - /** - * Sets attribute for gRPC LB address authority. - */ - public static Attributes setLbAddrAuthorityAttr( - @EquivalentAddressGroup.Attr Attributes attrs, String authority) { - return attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDR_AUTHORITY, authority).build(); - } - - /** - * Populates gRPC LB address authority from attributes. - */ - @Nullable - public static String getLbAddrAuthorityAttr(@EquivalentAddressGroup.Attr Attributes attrs) { - return attrs.get(GrpclbConstants.ATTR_LB_ADDR_AUTHORITY); - } + public static Attributes.Key> ATTR_LB_ADDRS = + GrpclbConstants.ATTR_LB_ADDRS; - /** - * Sets attribute for gRPC LB addresses. - */ - public static Attributes setLbAddrAttr(Attributes attrs, List lbAddrs) { - return attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDRS, lbAddrs).build(); - } - - /** - * Populates gRPC LB addresses from attributes. - */ - @Nullable - public static List getLbAddrAttr(Attributes attrs) { - return attrs.get(GrpclbConstants.ATTR_LB_ADDRS); - } + @EquivalentAddressGroup.Attr + public static Attributes.Key ATTR_LB_ADDR_AUTHORITY = + GrpclbConstants.ATTR_LB_ADDR_AUTHORITY; }