core: refactor lookUpServiceConfig(boolean) to disableServiceConfigLookUp()

Refactor as discussed in #5189. Will backport to v1.20.0 to reduce a cycle of deprecation process.
This commit is contained in:
ZHANG Dapeng 2019-04-04 14:01:19 -07:00 committed by GitHub
parent faf6ff9f98
commit 1c276a823b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions

View File

@ -251,8 +251,8 @@ public abstract class ForwardingChannelBuilder<T extends ForwardingChannelBuilde
} }
@Override @Override
public T lookUpServiceConfig(boolean enable) { public T disableServiceConfigLookUp() {
delegate().lookUpServiceConfig(enable); delegate().disableServiceConfigLookUp();
return thisT(); return thisT();
} }

View File

@ -542,7 +542,7 @@ public abstract class ManagedChannelBuilder<T extends ManagedChannelBuilder<T>>
/** /**
* Provides a service config to the channel. The channel will use the default service config when * Provides a service config to the channel. The channel will use the default service config when
* the name resolver provides no service config or if the channel disables lookup service config * the name resolver provides no service config or if the channel disables lookup service config
* from name resolver (see {@link #lookUpServiceConfig(boolean)}). The argument * from name resolver (see {@link #disableServiceConfigLookUp()}). The argument
* {@code serviceConfig} is a nested map representing a Json object in the most natural way: * {@code serviceConfig} is a nested map representing a Json object in the most natural way:
* *
* <table border="1"> * <table border="1">
@ -583,13 +583,13 @@ public abstract class ManagedChannelBuilder<T extends ManagedChannelBuilder<T>>
} }
/** /**
* Enables or disables service config look-up from the naming system. Enabled by default. * Disables service config look-up from the naming system, which is enabled by default.
* *
* @return this * @return this
* @since 1.20.0 * @since 1.20.0
*/ */
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/5189") @ExperimentalApi("https://github.com/grpc/grpc-java/issues/5189")
public T lookUpServiceConfig(boolean enable) { public T disableServiceConfigLookUp() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

View File

@ -452,8 +452,8 @@ public abstract class AbstractManagedChannelImplBuilder
} }
@Override @Override
public T lookUpServiceConfig(boolean enable) { public T disableServiceConfigLookUp() {
this.lookUpServiceConfig = enable; this.lookUpServiceConfig = false;
return thisT(); return thisT();
} }

View File

@ -493,7 +493,7 @@ public class AbstractManagedChannelImplBuilderTest {
Builder builder = new Builder("target"); Builder builder = new Builder("target");
assertThat(builder.lookUpServiceConfig).isTrue(); assertThat(builder.lookUpServiceConfig).isTrue();
builder.lookUpServiceConfig(false); builder.disableServiceConfigLookUp();
assertThat(builder.lookUpServiceConfig).isFalse(); assertThat(builder.lookUpServiceConfig).isFalse();
} }

View File

@ -3515,7 +3515,7 @@ public class ManagedChannelImplTest {
new FakeNameResolverFactory.Builder(expectedUri) new FakeNameResolverFactory.Builder(expectedUri)
.setServers(ImmutableList.of(addressGroup)).build(); .setServers(ImmutableList.of(addressGroup)).build();
channelBuilder.nameResolverFactory(nameResolverFactory); channelBuilder.nameResolverFactory(nameResolverFactory);
channelBuilder.lookUpServiceConfig(false); channelBuilder.disableServiceConfigLookUp();
Map<String, Object> serviceConfig = Map<String, Object> serviceConfig =
parseConfig("{\"methodConfig\":[{" parseConfig("{\"methodConfig\":[{"
@ -3549,7 +3549,7 @@ public class ManagedChannelImplTest {
new FakeNameResolverFactory.Builder(expectedUri) new FakeNameResolverFactory.Builder(expectedUri)
.setServers(ImmutableList.of(addressGroup)).build(); .setServers(ImmutableList.of(addressGroup)).build();
channelBuilder.nameResolverFactory(nameResolverFactory); channelBuilder.nameResolverFactory(nameResolverFactory);
channelBuilder.lookUpServiceConfig(false); channelBuilder.disableServiceConfigLookUp();
Map<String, Object> defaultServiceConfig = Map<String, Object> defaultServiceConfig =
parseConfig("{\"methodConfig\":[{" parseConfig("{\"methodConfig\":[{"
+ "\"name\":[{\"service\":\"SimpleService1\"}]," + "\"name\":[{\"service\":\"SimpleService1\"}],"
@ -3734,7 +3734,7 @@ public class ManagedChannelImplTest {
new FakeNameResolverFactory.Builder(expectedUri) new FakeNameResolverFactory.Builder(expectedUri)
.setServers(ImmutableList.of(addressGroup)).build(); .setServers(ImmutableList.of(addressGroup)).build();
channelBuilder.nameResolverFactory(nameResolverFactory); channelBuilder.nameResolverFactory(nameResolverFactory);
channelBuilder.lookUpServiceConfig(false); channelBuilder.disableServiceConfigLookUp();
Map<String, Object> defaultServiceConfig = Map<String, Object> defaultServiceConfig =
parseConfig("{\"methodConfig\":[{" parseConfig("{\"methodConfig\":[{"
+ "\"name\":[{\"service\":\"SimpleService1\"}]," + "\"name\":[{\"service\":\"SimpleService1\"}],"
@ -3760,7 +3760,6 @@ public class ManagedChannelImplTest {
new FakeNameResolverFactory.Builder(expectedUri) new FakeNameResolverFactory.Builder(expectedUri)
.setServers(ImmutableList.of(addressGroup)).build(); .setServers(ImmutableList.of(addressGroup)).build();
channelBuilder.nameResolverFactory(nameResolverFactory); channelBuilder.nameResolverFactory(nameResolverFactory);
channelBuilder.lookUpServiceConfig(true);
Map<String, Object> defaultServiceConfig = Map<String, Object> defaultServiceConfig =
parseConfig("{\"methodConfig\":[{" parseConfig("{\"methodConfig\":[{"
+ "\"name\":[{\"service\":\"SimpleService1\"}]," + "\"name\":[{\"service\":\"SimpleService1\"}],"