diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 5ef6dd863c2..c2af61e638d 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -43,11 +43,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; -import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -74,14 +72,6 @@ public class DnsNameResolver extends NameResolver { // From https://github.com/grpc/proposal/blob/master/A2-service-configs-in-dns.md static final String SERVICE_CONFIG_PREFIX = "grpc_config="; - private static final Set SERVICE_CONFIG_CHOICE_KEYS = - Collections.unmodifiableSet( - new HashSet<>( - Arrays.asList( - SERVICE_CONFIG_CHOICE_CLIENT_LANGUAGE_KEY, - SERVICE_CONFIG_CHOICE_PERCENTAGE_KEY, - SERVICE_CONFIG_CHOICE_CLIENT_HOSTNAME_KEY, - SERVICE_CONFIG_CHOICE_SERVICE_CONFIG_KEY))); // From https://github.com/grpc/proposal/blob/master/A2-service-configs-in-dns.md private static final String SERVICE_CONFIG_NAME_PREFIX = "_grpc_config."; @@ -488,10 +478,6 @@ private static long getNetworkAddressCacheTtlNanos(boolean isAndroid) { @VisibleForTesting static Map maybeChooseServiceConfig( Map choice, Random random, String hostname) { - for (Map.Entry entry : choice.entrySet()) { - Verify.verify(SERVICE_CONFIG_CHOICE_KEYS.contains(entry.getKey()), "Bad key: %s", entry); - } - List clientLanguages = getClientLanguagesFromChoice(choice); if (clientLanguages != null && !clientLanguages.isEmpty()) { boolean javaPresent = false; diff --git a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java index 33b127a46bc..e606de0e536 100644 --- a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java @@ -888,14 +888,13 @@ public HttpConnectProxiedSocketAddress proxyFor(SocketAddress targetAddress) { } @Test - public void maybeChooseServiceConfig_failsOnMisspelling() { + public void maybeChooseServiceConfig_nullOnMispelling() { Map bad = new LinkedHashMap<>(); bad.put("parcentage", 1.0); - thrown.expectMessage("Bad key"); - + thrown.expectMessage("key '{parcentage=1.0}' missing in 'serviceConfig'"); DnsNameResolver.maybeChooseServiceConfig(bad, new Random(), "host"); } - + @Test public void maybeChooseServiceConfig_clientLanguageMatchesJava() { Map choice = new LinkedHashMap<>();