From 6b9e090d70d32c768ed96fd5d1c7853da03dbb06 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Tue, 13 Mar 2018 10:21:40 -0700
Subject: [PATCH] core: rm unnecessary InternalNameResolverProvider

---
 .../io/grpc/InternalNameResolverProvider.java | 25 -----------------
 .../io/grpc/NameResolverProviderTest.java     | 23 ++++++++++++++++
 .../internal/DnsNameResolverProviderTest.java | 27 -------------------
 3 files changed, 23 insertions(+), 52 deletions(-)
 delete mode 100644 core/src/main/java/io/grpc/InternalNameResolverProvider.java

diff --git a/core/src/main/java/io/grpc/InternalNameResolverProvider.java b/core/src/main/java/io/grpc/InternalNameResolverProvider.java
deleted file mode 100644
index dc3a76b325..0000000000
--- a/core/src/main/java/io/grpc/InternalNameResolverProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2018, gRPC Authors All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.grpc;
-
-import com.google.common.annotations.VisibleForTesting;
-
-public class InternalNameResolverProvider {
-  @VisibleForTesting
-  public static final Iterable<Class<?>> HARDCODED_CLASSES =
-      NameResolverProvider.HARDCODED_CLASSES;
-}
diff --git a/core/src/test/java/io/grpc/NameResolverProviderTest.java b/core/src/test/java/io/grpc/NameResolverProviderTest.java
index 8ecfe70fbf..81ca08bf08 100644
--- a/core/src/test/java/io/grpc/NameResolverProviderTest.java
+++ b/core/src/test/java/io/grpc/NameResolverProviderTest.java
@@ -94,6 +94,29 @@ public class NameResolverProviderTest {
         ImmutableSet.of("io.grpc.internal.DnsNameResolverProvider"));
   }
 
+  @Test
+  public void provided() {
+    for (NameResolverProvider current
+        : InternalServiceProviders.getCandidatesViaServiceLoader(
+        NameResolverProvider.class, getClass().getClassLoader())) {
+      if (current instanceof DnsNameResolverProvider) {
+        return;
+      }
+    }
+    fail("DnsNameResolverProvider not registered");
+  }
+
+  @Test
+  public void providedHardCoded() {
+    for (NameResolverProvider current : InternalServiceProviders.getCandidatesViaHardCoded(
+        NameResolverProvider.class, NameResolverProvider.HARDCODED_CLASSES)) {
+      if (current instanceof DnsNameResolverProvider) {
+        return;
+      }
+    }
+    fail("DnsNameResolverProvider not registered");
+  }
+
   public static final class HardcodedClassesCallable implements Callable<Iterator<Class<?>>> {
     @Override
     public Iterator<Class<?>> call() throws Exception {
diff --git a/core/src/test/java/io/grpc/internal/DnsNameResolverProviderTest.java b/core/src/test/java/io/grpc/internal/DnsNameResolverProviderTest.java
index d752f1b93b..d94e741751 100644
--- a/core/src/test/java/io/grpc/internal/DnsNameResolverProviderTest.java
+++ b/core/src/test/java/io/grpc/internal/DnsNameResolverProviderTest.java
@@ -19,12 +19,8 @@ package io.grpc.internal;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import io.grpc.Attributes;
-import io.grpc.InternalNameResolverProvider;
-import io.grpc.InternalServiceProviders;
-import io.grpc.NameResolverProvider;
 import java.net.URI;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,29 +31,6 @@ import org.junit.runners.JUnit4;
 public class DnsNameResolverProviderTest {
   private DnsNameResolverProvider provider = new DnsNameResolverProvider();
 
-  @Test
-  public void provided() {
-    for (NameResolverProvider current
-        : InternalServiceProviders.getCandidatesViaServiceLoader(
-            NameResolverProvider.class, getClass().getClassLoader())) {
-      if (current instanceof DnsNameResolverProvider) {
-        return;
-      }
-    }
-    fail("DnsNameResolverProvider not registered");
-  }
-
-  @Test
-  public void providedHardCoded() {
-    for (NameResolverProvider current : InternalServiceProviders.getCandidatesViaHardCoded(
-        NameResolverProvider.class, InternalNameResolverProvider.HARDCODED_CLASSES)) {
-      if (current instanceof DnsNameResolverProvider) {
-        return;
-      }
-    }
-    fail("DnsNameResolverProvider not registered");
-  }
-
   @Test
   public void isAvailable() {
     assertTrue(provider.isAvailable());