This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new ed0c094 code clean. (#8111)
ed0c094 is described below
commit ed0c09413bb1f61b8a8da88940f94a02c5e6d00e
Author: 赵延 <[email protected]>
AuthorDate: Wed Jun 30 11:06:15 2021 +0800
code clean. (#8111)
---
.../main/java/org/apache/dubbo/rpc/model/ApplicationModel.java | 10 +++++++---
.../org/apache/dubbo/metadata/WritableMetadataService.java | 2 +-
.../apache/dubbo/registry/integration/RegistryDirectory.java | 2 +-
.../apache/dubbo/registry/integration/RegistryProtocol.java | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
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 9934048..9e0521b 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
@@ -34,14 +34,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
* singleton or static (by itself totally static or uses some static fields).
So the instances
* returned from them are of process scope. If you want to support multiple
dubbo servers in one
* single process, you may need to refactor those three classes.
- *
+ * <p>
* Represent a application which is using Dubbo and store basic metadata info
for using
* during the processing of RPC invoking.
* <p>
* ApplicationModel includes many ProviderModel which is about published
services
* and many Consumer Model which is about subscribed services.
* <p>
- *
*/
public class ApplicationModel {
@@ -122,14 +121,19 @@ public class ApplicationModel {
}
@Deprecated
+ //It will be remove at next version
private static String application;
+ /**
+ *
+ * @deprecated Use {@link #getName()} instead. It will be remove at next
version.
+ */
@Deprecated
public static String getApplication() {
return application == null ? getName() : application;
}
- // Currently used by UT.
+ // Currently used by UT, it will be remove at next version.
@Deprecated
public static void setApplication(String application) {
ApplicationModel.application = application;
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 222da5f..9748024 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
@@ -41,7 +41,7 @@ public interface WritableMetadataService extends
MetadataService {
*/
@Override
default String serviceName() {
- return ApplicationModel.getApplication();
+ return ApplicationModel.getName();
}
/**
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 96745ea..e0996ba 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
@@ -633,7 +633,7 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
List<RegistryDirectory> listeners = new ArrayList<>();
ConsumerConfigurationListener() {
- this.initWith(ApplicationModel.getApplication() +
CONFIGURATORS_SUFFIX);
+ this.initWith(ApplicationModel.getName() + 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 3785cdc..2184768 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
@@ -561,7 +561,7 @@ public class RegistryProtocol implements Protocol {
bounds.clear();
ExtensionLoader.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension()
- .removeListener(ApplicationModel.getApplication() +
CONFIGURATORS_SUFFIX, providerConfigurationListener);
+ .removeListener(ApplicationModel.getName() +
CONFIGURATORS_SUFFIX, providerConfigurationListener);
}
@Override
@@ -730,7 +730,7 @@ public class RegistryProtocol implements Protocol {
private class ProviderConfigurationListener extends
AbstractConfiguratorListener {
public ProviderConfigurationListener() {
- this.initWith(ApplicationModel.getApplication() +
CONFIGURATORS_SUFFIX);
+ this.initWith(ApplicationModel.getName() + CONFIGURATORS_SUFFIX);
}
/**
