Fix bug with metadata-type not work since 2.7.5 describe in issue #5667

dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java

@@ -170,8 +170,17 @@ public interface CommonConstants {
 
     String METADATA_REVISION = "metadata.revision";
 
+    /**
+     * since 2.7.5  in dubbo.xsd "metadata" has been modified to "metadata-type"
+     */
+    @Deprecated
     String METADATA_KEY = "metadata";
 
+    /**
+     * since 2.7.5  in dubbo.xsd "metadata" has been modified to "metadata-type"
+     */
+    String METADATA_TYPE_KEY = "metadata.type";
+
     String DEFAULT_METADATA_STORAGE_TYPE = "local";
 
     String REMOTE_METADATA_STORAGE_TYPE = "remote";

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java

@@ -376,11 +376,6 @@ public void checkAndUpdateSubConfigs() {
         }
         // get consumer's global configuration
         checkDefault();
-        // init some null configuration.
-        List<ConfigInitializer> configInitializers = ExtensionLoader.getExtensionLoader(ConfigInitializer.class)
-                .getActivateExtension(URL.valueOf("configInitializer://"), (String[]) null);
-        configInitializers.forEach(e -> e.initReferConfig(this));
-
         this.refresh();
         if (getGeneric() == null && getConsumer() != null) {
             setGeneric(getConsumer().getGeneric());
@@ -494,4 +489,4 @@ private void postProcessConfig() {
     Invoker<?> getInvoker() {
         return invoker;
     }
-}
+}

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java

@@ -711,4 +711,4 @@ public DubboBootstrap getBootstrap() {
     public void setBootstrap(DubboBootstrap bootstrap) {
         this.bootstrap = bootstrap;
     }
-}
+}

dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java

@@ -260,7 +260,7 @@ public boolean publishConfig(String key, String group, String content) {
         boolean published = false;
         String resolvedGroup = resolveGroup(group);
         try {
-            String value = configService.getConfig(key, resolvedGroup, -1L);
+            String value = configService.getConfig(key, resolvedGroup, DEFAULT_TIMEOUT);
             if (StringUtils.isNotEmpty(value)) {
                 content = value + "," + content;
             }

dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java

@@ -36,6 +36,9 @@
 import java.util.SortedSet;
 import java.util.concurrent.CountDownLatch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 /**
  * Unit test for nacos config center support
@@ -140,6 +143,16 @@ public static void setUp() {
         }
     }
 
+    @Test
+    public void testPublishConfig() {
+        String key = "user-service";
+        String group = "org.apache.dubbo.service.UserService";
+        String content = "test";
+
+        assertTrue(config.publishConfig(key, group, content));
+        assertEquals("test", config.getProperties(key, group));
+    }
+
     @AfterAll
     public static void tearDown() {
 

dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java

@@ -19,10 +19,15 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.extension.ExtensionLoader;
 import org.apache.dubbo.common.extension.SPI;
+import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.metadata.store.InMemoryWritableMetadataService;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
+import java.util.Map;
+
 import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_METADATA_STORAGE_TYPE;
+import static org.apache.dubbo.common.constants.CommonConstants.METADATA_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.METADATA_TYPE_KEY;
 import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader;
 
 /**
@@ -96,6 +101,29 @@ static WritableMetadataService getDefaultExtension() {
         return getExtensionLoader(WritableMetadataService.class).getDefaultExtension();
     }
 
+    /**
+     * Get
+     *
+     * @param paramMap
+     * @return
+     */
+    static WritableMetadataService getExtensionForCompatible(Map<String, String> paramMap){
+        String metadataType = paramMap.get(METADATA_TYPE_KEY);
+        if(StringUtils.isEmpty(metadataType)){
+            /**
+             * Since 2.7.5  in dubbo.xsd "metadata" has been modified to "metadata-type".
+             * But a bug occurs which leads  "metadata-type" not work, some developers maybe
+             * use self-defined such as flowing to make metadata reporter work:
+             * <dubbo:parameter key="metadata" value="remote"/>
+             * @see https://github.com/apache/dubbo/issues/5667
+             *
+             * The following code aims to be compatible with this case.
+             */
+            metadataType = paramMap.get(METADATA_KEY);
+        }
+        return getExtension(StringUtils.isEmpty(metadataType) ? DEFAULT_METADATA_STORAGE_TYPE : metadataType);
+    }
+
     static WritableMetadataService getExtension(String name) {
         return getExtensionLoader(WritableMetadataService.class).getOrDefaultExtension(name);
     }