From e392af1efdd9ecd5dbea953c74c59d5ae66a53ee Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 2 Mar 2018 11:31:14 -0800 Subject: [PATCH] Partially revert "core: Tracking NameResolverProvider being experimental" This partially reverts commit c07ad68cbd4fd836900c166693cdaa2c7613edc0. The PARAMS_DEFAULT_PORT in NameResorverProvider is the preferred name. The hope is still to kill NameResolver.Factory. --- core/src/main/java/io/grpc/NameResolverProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/io/grpc/NameResolverProvider.java b/core/src/main/java/io/grpc/NameResolverProvider.java index 333632fe6c..89eb30b4ed 100644 --- a/core/src/main/java/io/grpc/NameResolverProvider.java +++ b/core/src/main/java/io/grpc/NameResolverProvider.java @@ -32,6 +32,12 @@ import java.util.List; */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/4159") public abstract class NameResolverProvider extends NameResolver.Factory { + /** + * The port number used in case the target or the underlying naming system doesn't provide a + * port number. + */ + public static final Attributes.Key PARAMS_DEFAULT_PORT = + NameResolver.Factory.PARAMS_DEFAULT_PORT; @VisibleForTesting static final Iterable> HARDCODED_CLASSES = new HardcodedClasses();