Move RFC 3986 feature flag to 'api'

Author: jdcormie

api/src/main/java/io/grpc/FeatureFlags.java

@@ -16,9 +16,25 @@
 
 package io.grpc;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 
 class FeatureFlags {
+  private static boolean enableRfc3986Uris = getFlag("GRPC_ENABLE_RFC3986_URIS", false);
+
+  /** Whether to parse targets as RFC 3986 URIs (true), or use {@link java.net.URI} (false). */
+  @VisibleForTesting
+  static boolean setRfc3986UrisEnabled(boolean value) {
+    boolean prevValue = enableRfc3986Uris;
+    enableRfc3986Uris = value;
+    return prevValue;
+  }
+
+  /** Whether to parse targets as RFC 3986 URIs (true), or use {@link java.net.URI} (false). */
+  static boolean getRfc3986UrisEnabled() {
+    return enableRfc3986Uris;
+  }
+
   static boolean getFlag(String envVarName, boolean enableByDefault) {
     String envVar = System.getenv(envVarName);
     if (envVar == null) {

api/src/main/java/io/grpc/InternalFeatureFlags.java

@@ -16,8 +16,23 @@
 
 package io.grpc;
 
+import com.google.common.annotations.VisibleForTesting;
+
+/** Global variables that govern major changes to the behavior of more than one grpc module. */
 @Internal
 public class InternalFeatureFlags {
+
+  /** Whether to parse targets as RFC 3986 URIs (true), or use {@link java.net.URI} (false). */
+  @VisibleForTesting
+  public static boolean setRfc3986UrisEnabled(boolean value) {
+    return FeatureFlags.setRfc3986UrisEnabled(value);
+  }
+
+  /** Whether to parse targets as RFC 3986 URIs (true), or use {@link java.net.URI} (false). */
+  public static boolean getRfc3986UrisEnabled() {
+    return FeatureFlags.getRfc3986UrisEnabled();
+  }
+
   public static boolean getFlag(String envVarName, boolean enableByDefault) {
     return FeatureFlags.getFlag(envVarName, enableByDefault);
   }

core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java

@@ -38,6 +38,7 @@
 import io.grpc.EquivalentAddressGroup;
 import io.grpc.InternalChannelz;
 import io.grpc.InternalConfiguratorRegistry;
+import io.grpc.InternalFeatureFlags;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.MethodDescriptor;
@@ -106,16 +107,6 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
    */
   static final long IDLE_MODE_MIN_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(1);
 
-  private static boolean enableRfc3986Uris = GrpcUtil.getFlag("GRPC_ENABLE_RFC3986_URIS", false);
-
-  /** Whether to parse targets as RFC 3986 URIs (true), or use {@link java.net.URI} (false). */
-  @VisibleForTesting
-  static boolean setRfc3986UrisEnabled(boolean value) {
-    boolean prevValue = ManagedChannelImplBuilder.enableRfc3986Uris;
-    ManagedChannelImplBuilder.enableRfc3986Uris = value;
-    return prevValue;
-  }
-
   private static final ObjectPool<? extends Executor> DEFAULT_EXECUTOR_POOL =
       SharedResourcePool.forResource(GrpcUtil.SHARED_CHANNEL_EXECUTOR);
 
@@ -731,7 +722,7 @@ public ManagedChannel build() {
     ClientTransportFactory clientTransportFactory =
         clientTransportFactoryBuilder.buildClientTransportFactory();
     ResolvedNameResolver resolvedResolver =
-        enableRfc3986Uris
+        InternalFeatureFlags.getRfc3986UrisEnabled()
             ? getNameResolverProviderRfc3986(target, nameResolverRegistry)
             : getNameResolverProvider(target, nameResolverRegistry);
     resolvedResolver.checkAddressTypes(clientTransportFactory.getSupportedSocketAddressTypes());

core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java

@@ -41,6 +41,7 @@
 import io.grpc.FlagResetRule;
 import io.grpc.InternalConfigurator;
 import io.grpc.InternalConfiguratorRegistry;
+import io.grpc.InternalFeatureFlags;
 import io.grpc.InternalManagedChannelBuilder.InternalInterceptorFactory;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -129,7 +130,7 @@ public static Iterable<Object[]> data() {
   @Before
   public void setUp() throws Exception {
     flagResetRule.setFlagForTest(
-        ManagedChannelImplBuilder::setRfc3986UrisEnabled, enableRfc3986UrisParam);
+        InternalFeatureFlags::setRfc3986UrisEnabled, enableRfc3986UrisParam);
 
     builder = new ManagedChannelImplBuilder(
         DUMMY_TARGET,