Polish apache#3946 : Refactor Dubbo metadata service

mercyblitz · May 21, 2019 · bc41e2d · bc41e2d
1 parent 839f7a3
commit bc41e2d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 169 deletions.
diff --git a/dubbo-metadata/pom.xml b/dubbo-metadata/pom.xml
@@ -32,26 +32,12 @@
     <description>The metadata module of Dubbo project</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-config-api</artifactId>
-            <version>${revision}</version>
-            <optional>true</optional>
-        </dependency>
 
-        <!-- Test dependencies -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-rpc-dubbo</artifactId>
+            <artifactId>dubbo-rpc-api</artifactId>
             <version>${revision}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-remoting-netty4</artifactId>
-            <version>${revision}</version>
-            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>

diff --git a/...adata/export/MetadataServiceExporter.java → ...bbo/metadata/MetadataServiceExporter.java b/...adata/export/MetadataServiceExporter.java → ...bbo/metadata/MetadataServiceExporter.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.metadata.export;
+package org.apache.dubbo.metadata;
 
 import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.extension.ExtensionLoader;
 import org.apache.dubbo.common.extension.SPI;
-import org.apache.dubbo.metadata.MetadataService;
 
 import java.util.List;
 
-import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader;
-
 /**
  * The exporter of {@link MetadataService}
  *
@@ -33,7 +29,7 @@
  * @see #unexport()
  * @since 2.7.2
  */
-@SPI("default")
+@SPI
 public interface MetadataServiceExporter {
 
     /**
@@ -47,17 +43,4 @@ public interface MetadataServiceExporter {
      * Unexports the {@link MetadataService}
      */
     void unexport();
-
-
-    /**
-     * Get {@link ExtensionLoader#getDefaultExtension() the defautl extension} of {@link MetadataServiceExporter}
-     *
-     * @return non-null
-     * @see MetadataServiceExporter
-     * @see ConfigurableMetadataServiceExporter
-     * @see ExtensionLoader
-     */
-    static MetadataServiceExporter getDefaultExtension() {
-        return getExtensionLoader(MetadataServiceExporter.class).getDefaultExtension();
-    }
 }
diff --git a/...esources/META-INF/dubbo/internal/org.apache.dubbo.metadata.export.MetadataServiceExporter b/...esources/META-INF/dubbo/internal/org.apache.dubbo.metadata.export.MetadataServiceExporter
diff --git a/dubbo-metadata/src/test/java/org/apache/dubbo/metadata/export/MockRegistry.java b/dubbo-metadata/src/test/java/org/apache/dubbo/metadata/export/MockRegistry.java
diff --git a/dubbo-metadata/src/test/java/org/apache/dubbo/metadata/export/MockRegistryFactory.java b/dubbo-metadata/src/test/java/org/apache/dubbo/metadata/export/MockRegistryFactory.java
diff --git a/...data/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/...data/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory