You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/08/29 08:50:47 UTC
[dubbo] branch 3.0-multi-instances updated: Compact old style
getName
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0-multi-instances by this push:
new 20ca843 Compact old style getName
20ca843 is described below
commit 20ca843d5e649a86109859389a3c7dd0fb0f7c64
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Aug 29 16:50:30 2021 +0800
Compact old style getName
---
.../common/status/reporter/FrameworkStatusReportService.java | 9 +++++----
.../main/java/org/apache/dubbo/rpc/model/ApplicationModel.java | 7 ++++++-
.../java/org/apache/dubbo/metadata/WritableMetadataService.java | 2 +-
.../dubbo/registry/client/SelfHostMetaServiceDiscovery.java | 4 ++--
.../dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java | 4 ++--
.../registry/client/metadata/MetadataServiceNameMapping.java | 2 +-
.../client/metadata/ServiceInstanceMetadataCustomizer.java | 2 +-
.../registry/client/metadata/ServiceInstanceMetadataUtils.java | 5 +++--
.../client/metadata/store/InMemoryWritableMetadataService.java | 2 +-
.../dubbo/registry/client/migration/MigrationRuleListener.java | 2 +-
.../org/apache/dubbo/registry/integration/RegistryDirectory.java | 2 +-
.../org/apache/dubbo/registry/integration/RegistryProtocol.java | 2 +-
12 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReportService.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReportService.java
index 0e97d94..2dacee5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReportService.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReportService.java
@@ -16,13 +16,14 @@
*/
package org.apache.dubbo.common.status.reporter;
-import com.google.gson.Gson;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ScopeModelAware;
+import com.google.gson.Gson;
+
import java.util.HashMap;
import java.util.Set;
@@ -76,7 +77,7 @@ public class FrameworkStatusReportService implements ScopeModelAware {
public String createRegistrationReport(String status) {
return "{\"application\":\"" +
- applicationModel.getName() +
+ applicationModel.getApplicationName() +
"\",\"status\":\"" +
status +
"\"}";
@@ -85,7 +86,7 @@ public class FrameworkStatusReportService implements ScopeModelAware {
public String createConsumptionReport(String interfaceName, String version, String group, String status) {
HashMap<String, String> migrationStatus = new HashMap<>();
migrationStatus.put("type", "consumption");
- migrationStatus.put("application", applicationModel.getName());
+ migrationStatus.put("application", applicationModel.getApplicationName());
migrationStatus.put("service", interfaceName);
migrationStatus.put("version", version);
migrationStatus.put("group", group);
@@ -96,7 +97,7 @@ public class FrameworkStatusReportService implements ScopeModelAware {
public String createMigrationStepReport(String interfaceName, String version, String group, String originStep, String newStep, String success) {
HashMap<String, String> migrationStatus = new HashMap<>();
migrationStatus.put("type", "migrationStepStatus");
- migrationStatus.put("application", applicationModel.getName());
+ migrationStatus.put("application", applicationModel.getApplicationName());
migrationStatus.put("service", interfaceName);
migrationStatus.put("version", version);
migrationStatus.put("group", group);
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
index 22e54f3..e9dad56 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
@@ -162,7 +162,12 @@ public class ApplicationModel extends ScopeModel {
return getConfigManager().getApplicationOrElseThrow();
}
- public String getName() {
+ @Deprecated
+ public static String getName() {
+ return defaultModel().getApplicationConfig().getName();
+ }
+
+ public String getApplicationName() {
return getApplicationConfig().getName();
}
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
index 5aa199e..3e248c2 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
@@ -42,7 +42,7 @@ public interface WritableMetadataService extends MetadataService {
*/
@Override
default String serviceName() {
- return ApplicationModel.defaultModel().getName();
+ return ApplicationModel.defaultModel().getApplicationName();
}
/**
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/SelfHostMetaServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/SelfHostMetaServiceDiscovery.java
index 0ebdd45..c732240 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/SelfHostMetaServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/SelfHostMetaServiceDiscovery.java
@@ -33,9 +33,9 @@ import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedLi
import org.apache.dubbo.registry.client.metadata.MetadataUtils;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ScopeModelAware;
import com.alibaba.fastjson.JSONObject;
-import org.apache.dubbo.rpc.model.ScopeModelAware;
import java.util.HashSet;
import java.util.Iterator;
@@ -232,7 +232,7 @@ public abstract class SelfHostMetaServiceDiscovery implements ServiceDiscovery,
// refer from MetadataUtils, this proxy is different from the one used to refer exportedURL
MetadataService metadataService = MetadataUtils.getMetadataServiceProxy(serviceInstance);
- String consumerId = ApplicationModel.defaultModel().getName() + NetUtils.getLocalHost();
+ String consumerId = ApplicationModel.defaultModel().getApplicationName() + NetUtils.getLocalHost();
String metadata = metadataService.getAndListenInstanceMetadata(
consumerId, metadataString -> {
if(logger.isDebugEnabled()) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
index 4272888..777990c 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
@@ -427,7 +427,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
void addNotifyListener(ServiceDiscoveryRegistryDirectory<?> listener) {
if (listeners.size() == 0) {
- this.initWith(applicationModel.getName() + CONFIGURATORS_SUFFIX);
+ this.initWith(applicationModel.getApplicationName() + CONFIGURATORS_SUFFIX);
}
this.listeners.add(listener);
}
@@ -435,7 +435,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
void removeNotifyListener(ServiceDiscoveryRegistryDirectory<?> listener) {
this.listeners.remove(listener);
if (listeners.size() == 0) {
- this.stopListen(applicationModel.getName() + CONFIGURATORS_SUFFIX);
+ this.stopListen(applicationModel.getApplicationName() + CONFIGURATORS_SUFFIX);
}
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
index adfa7a5..e86be90 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
@@ -61,7 +61,7 @@ public class MetadataServiceNameMapping extends AbstractServiceNameMapping imple
String registryCluster = getRegistryCluster(url);
MetadataReport metadataReport = metadataReportInstance.getMetadataReport(registryCluster);
- String appName = applicationModel.getName();
+ String appName = applicationModel.getApplicationName();
if (metadataReport.registerServiceAppMapping(serviceInterface, appName, url)) {
// MetadataReport support directly register service-app mapping
return;
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 5a03a3a..cc0f612 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
@@ -64,7 +64,7 @@ public class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomi
Set<InfraAdapter> adapters = applicationModel.getExtensionLoader(InfraAdapter.class).getSupportedExtensionInstances();
if (CollectionUtils.isNotEmpty(adapters)) {
Map<String, String> inputParameters = new HashMap<>();
- inputParameters.put(APPLICATION_KEY, applicationModel.getName());
+ inputParameters.put(APPLICATION_KEY, applicationModel.getApplicationName());
for (InfraAdapter adapter : adapters) {
Map<String, String> extraParameters = adapter.getExtraAttributes(inputParameters);
if (CollectionUtils.isNotEmptyMap(extraParameters)) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
index b2e19b7..8cafaac 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.registry.client.metadata;
-import com.google.gson.Gson;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
@@ -34,6 +33,8 @@ import org.apache.dubbo.registry.client.metadata.store.InMemoryWritableMetadataS
import org.apache.dubbo.registry.client.metadata.store.RemoteMetadataServiceImpl;
import org.apache.dubbo.registry.support.AbstractRegistryFactory;
+import com.google.gson.Gson;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -257,7 +258,7 @@ public class ServiceInstanceMetadataUtils {
public static void refreshMetadataAndInstance(ServiceInstance serviceInstance) {
RemoteMetadataServiceImpl remoteMetadataService = MetadataUtils.getRemoteMetadataService(serviceInstance.getApplicationModel());
- remoteMetadataService.publishMetadata(serviceInstance.getApplicationModel().getName());
+ remoteMetadataService.publishMetadata(serviceInstance.getApplicationModel().getApplicationName());
AbstractRegistryFactory.getServiceDiscoveries().forEach(serviceDiscovery -> {
ServiceInstance instance = serviceDiscovery.getLocalInstance();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java
index 74dbee6..d118b77 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java
@@ -174,7 +174,7 @@ public class InMemoryWritableMetadataService implements WritableMetadataService,
try {
String[] clusters = getRegistryCluster(url).split(",");
for (String cluster : clusters) {
- MetadataInfo metadataInfo = metadataInfos.computeIfAbsent(cluster, k -> new MetadataInfo(applicationModel.getName()));
+ MetadataInfo metadataInfo = metadataInfos.computeIfAbsent(cluster, k -> new MetadataInfo(applicationModel.getApplicationName()));
metadataInfo.addService(new ServiceInfo(url));
}
metadataSemaphore.release();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
index eefa8bb..2578557 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
@@ -76,7 +76,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur
}
private void init() {
- this.ruleKey = applicationModel.getName() + ".migration";
+ this.ruleKey = applicationModel.getApplicationName() + ".migration";
this.configuration = applicationModel.getEnvironment().getDynamicConfiguration().orElse(null);
if (this.configuration != null) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index 77f472b..7797d10 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -639,7 +639,7 @@ public class RegistryDirectory<T> extends DynamicDirectory<T> {
ConsumerConfigurationListener(ApplicationModel applicationModel) {
super(applicationModel);
- this.initWith(applicationModel.getName() + CONFIGURATORS_SUFFIX);
+ this.initWith(applicationModel.getApplicationName() + CONFIGURATORS_SUFFIX);
}
void addNotifyListener(RegistryDirectory listener) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index 2bf5cb2..a98a716 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -766,7 +766,7 @@ public class RegistryProtocol implements Protocol, ScopeModelAware {
public ProviderConfigurationListener(ApplicationModel applicationModel) {
super(applicationModel);
if (applicationModel.getEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) {
- this.initWith(applicationModel.getName() + CONFIGURATORS_SUFFIX);
+ this.initWith(applicationModel.getApplicationName() + CONFIGURATORS_SUFFIX);
}
}