This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch fix-3.0-spring-boot-metadata-service
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 2ba7faa52d8c053e72e4238e30925cb6b679d303
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Apr 7 15:52:44 2022 +0800
set not register metadata service
---
.../main/java/org/apache/dubbo/common/constants/CommonConstants.java | 2 --
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/metadata/ConfigurableMetadataServiceExporter.java | 5 ++++-
.../registry/client/metadata/ServiceInstanceMetadataCustomizer.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 457f3a89c8..ffbd77ced9 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -378,8 +378,6 @@ public interface CommonConstants {
int DEFAULT_FAILBACK_TIMES = 3;
- String REGISTER_KEY = "register";
-
String INTERFACES = "interfaces";
String SSL_ENABLED_KEY = "ssl-enabled";
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 44f1cc7f80..7123818e24 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -67,7 +67,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.LOCALHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
-import static org.apache.dubbo.common.constants.CommonConstants.REGISTER_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SERVICE_NAME_MAPPING_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
@@ -81,6 +80,7 @@ import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_BIND;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.SCOPE_NONE;
+import static org.apache.dubbo.registry.Constants.REGISTER_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_IP_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_PORT_KEY;
import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index 5991ea15ba..944b2a8dcc 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -162,7 +162,10 @@ public class ConfigurableMetadataServiceExporter {
ServiceConfig<MetadataService> serviceConfig = new ServiceConfig<>();
serviceConfig.setScopeModel(applicationModel.getInternalModule());
serviceConfig.setApplication(applicationConfig);
- serviceConfig.setRegistry(new RegistryConfig("N/A"));
+ RegistryConfig registryConfig = new RegistryConfig("N/A");
+ registryConfig.setId("internal-metadata-registry");
+ serviceConfig.setRegistry(registryConfig);
+ serviceConfig.setRegister(false);
serviceConfig.setProtocol(generateMetadataProtocol());
serviceConfig.setInterface(MetadataService.class);
serviceConfig.setDelay(0);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
index fe585f5d1f..b4eeb944da 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
@@ -68,7 +68,7 @@ public class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomi
}
}
- serviceInstance.getMetadata().putAll(extraParameters);;
+ serviceInstance.getMetadata().putAll(extraParameters);
if (CollectionUtils.isNotEmptyMap(metadataInfo.getInstanceParams())) {
serviceInstance.getMetadata().putAll(metadataInfo.getInstanceParams());
}