You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ky...@apache.org on 2021/08/19 12:32:06 UTC
[dubbo] branch 3.0-multi-instances created (now d8fee83)
This is an automated email from the ASF dual-hosted git repository.
kylixs pushed a change to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
at d8fee83 Fix access static getter method of ApplicationModel
This branch includes the following new commits:
new 8183aaf Add ExtensionDirector and Models
new d8fee83 Fix access static getter method of ApplicationModel
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[dubbo] 01/02: Add ExtensionDirector and Models
Posted by ky...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 8183aafb9173d003f3662d2c6abf9acf8dd5348c
Author: gongdewei <ky...@qq.com>
AuthorDate: Thu Aug 19 20:27:05 2021 +0800
Add ExtensionDirector and Models
---
.../dubbo/common/extension/ExtensionDirector.java | 125 ++++++++++++++++++
.../dubbo/common/extension/ExtensionLoader.java | 136 ++++++++++++--------
.../common/extension/ExtensionPostProcessor.java | 32 +++++
.../dubbo/common/extension/ExtensionScope.java | 39 ++++++
.../org/apache/dubbo/common/extension/SPI.java | 4 +
.../apache/dubbo/rpc/model/ApplicationModel.java | 120 +++++++++---------
.../org/apache/dubbo/rpc/model/FrameworkModel.java | 50 ++++++++
.../org/apache/dubbo/rpc/model/ModelAware.java | 33 +++++
.../dubbo/rpc/model/ModelAwarePostProcessor.java | 57 +++++++++
.../org/apache/dubbo/rpc/model/ModuleModel.java | 44 +++++++
.../common/extension/ExtensionDirectorTest.java | 140 +++++++++++++++++++++
.../common/extension/ExtensionLoaderTest.java | 11 +-
.../extension/director/ApplicationService.java | 25 ++++
.../extension/director/FrameworkService.java | 25 ++++
.../common/extension/director/ModuleService.java | 25 ++++
.../extension/director/impl/BaseTestService.java | 55 ++++++++
.../director/impl/TestApplicationService.java | 22 ++++
.../director/impl/TestFrameworkService.java | 23 ++++
.../extension/director/impl/TestModuleService.java | 22 ++++
...bo.common.extension.director.ApplicationService | 1 +
...ubbo.common.extension.director.FrameworkService | 1 +
...e.dubbo.common.extension.director.ModuleService | 1 +
22 files changed, 878 insertions(+), 113 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionDirector.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionDirector.java
new file mode 100644
index 0000000..ae686fd
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionDirector.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * ExtensionDirector is a scoped extension loader manager.
+ *
+ * <p></p>
+ * <p>ExtensionDirector supports multiple levels, and the child can inherit the parent's extension instances. </p>
+ * <p>The way to find and create an extension instance is similar to Java classloader.</p>
+ */
+public class ExtensionDirector {
+
+ private final ConcurrentMap<Class<?>, ExtensionLoader<?>> extensionLoadersMap = new ConcurrentHashMap<>(64);
+ private ExtensionDirector parent;
+ private final ExtensionScope scope;
+ private List<ExtensionPostProcessor> extensionPostProcessors = new ArrayList<>();
+
+ public ExtensionDirector(ExtensionDirector parent, ExtensionScope scope) {
+ this.parent = parent;
+ this.scope = scope;
+ }
+
+ public void addExtensionPostProcessor(ExtensionPostProcessor processor) {
+ if (!this.extensionPostProcessors.contains(processor)) {
+ this.extensionPostProcessors.add(processor);
+ }
+ }
+
+ public List<ExtensionPostProcessor> getExtensionPostProcessors() {
+ return extensionPostProcessors;
+ }
+
+ public <T> T getExtension(Class<T> type, String name) {
+ ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
+ return extensionLoader != null ? extensionLoader.getExtension(name) : null;
+ }
+
+ public <T> T getAdaptiveExtension(Class<T> type) {
+ ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
+ return extensionLoader != null ? extensionLoader.getAdaptiveExtension() : null;
+ }
+
+ public <T> T getDefaultExtension(Class<T> type) {
+ ExtensionLoader<T> extensionLoader = getExtensionLoader(type);
+ return extensionLoader != null ? extensionLoader.getDefaultExtension() : null;
+ }
+
+ public <T> ExtensionLoader<T> getExtensionLoader(Class<T> type) {
+ if (type == null) {
+ throw new IllegalArgumentException("Extension type == null");
+ }
+ if (!type.isInterface()) {
+ throw new IllegalArgumentException("Extension type (" + type + ") is not an interface!");
+ }
+ if (!withExtensionAnnotation(type)) {
+ throw new IllegalArgumentException("Extension type (" + type +
+ ") is not an extension, because it is NOT annotated with @" + SPI.class.getSimpleName() + "!");
+ }
+
+ // 1. find in local cache
+ ExtensionLoader<T> loader = (ExtensionLoader<T>) extensionLoadersMap.get(type);
+
+ // 2. find in parent
+ if (loader == null) {
+ if (this.parent != null) {
+ loader = this.parent.getExtensionLoader(type);
+ }
+ }
+
+ // 3. create it
+ if (loader == null) {
+ loader = createExtensionLoader(type);
+ }
+
+ return loader;
+ }
+
+ private <T> ExtensionLoader<T> createExtensionLoader(Class<T> type) {
+ ExtensionLoader<T> loader = null;
+ if (isScopeMatched(type)) {
+ // if scope is matched, just create it
+ extensionLoadersMap.putIfAbsent(type, new ExtensionLoader<T>(type, this));
+ loader = (ExtensionLoader<T>) extensionLoadersMap.get(type);
+ } else {
+ // if scope is not matched, redirect to parent director
+ if (this.parent != null) {
+ loader = this.parent.createExtensionLoader(type);
+ }
+ }
+ return loader;
+ }
+
+ private boolean isScopeMatched(Class<?> type) {
+ final SPI defaultAnnotation = type.getAnnotation(SPI.class);
+ return defaultAnnotation.scope().equals(scope);
+ }
+
+ private static boolean withExtensionAnnotation(Class<?> type) {
+ return type.isAnnotationPresent(SPI.class);
+ }
+
+ protected ExtensionDirector getParent() {
+ return parent;
+ }
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index d2beedc..4d30c22 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -17,6 +17,8 @@
package org.apache.dubbo.common.extension;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.config.Environment;
+import org.apache.dubbo.common.context.FrameworkExt;
import org.apache.dubbo.common.context.Lifecycle;
import org.apache.dubbo.common.extension.support.ActivateComparator;
import org.apache.dubbo.common.extension.support.WrapperComparator;
@@ -32,6 +34,8 @@ import org.apache.dubbo.common.utils.Holder;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.model.ModuleModel;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -90,9 +94,7 @@ public class ExtensionLoader<T> {
private static final Pattern NAME_SEPARATOR = Pattern.compile("\\s*[,]+\\s*");
- private static final ConcurrentMap<Class<?>, ExtensionLoader<?>> EXTENSION_LOADERS = new ConcurrentHashMap<>(64);
-
- private static final ConcurrentMap<Class<?>, Object> EXTENSION_INSTANCES = new ConcurrentHashMap<>(64);
+ private final ConcurrentMap<Class<?>, Object> extensionInstances = new ConcurrentHashMap<>(64);
private final Class<?> type;
@@ -121,6 +123,9 @@ public class ExtensionLoader<T> {
* Record all unacceptable exceptions when using SPI
*/
private Set<String> unacceptableExceptions = new ConcurrentHashSet<>();
+ private ExtensionDirector extensionDirector;
+ private List<ExtensionPostProcessor> extensionPostProcessors;
+ private Environment environment;
public static void setLoadingStrategies(LoadingStrategy... strategies) {
if (ArrayUtils.isNotEmpty(strategies)) {
@@ -152,52 +157,43 @@ public class ExtensionLoader<T> {
return asList(strategies);
}
- private ExtensionLoader(Class<?> type) {
+ ExtensionLoader(Class<?> type, ExtensionDirector extensionDirector) {
+ this.extensionDirector = extensionDirector;
+ this.extensionPostProcessors = extensionDirector.getExtensionPostProcessors();
this.type = type;
- objectFactory = (type == ExtensionFactory.class ? null : ExtensionLoader.getExtensionLoader(ExtensionFactory.class).getAdaptiveExtension());
- }
-
- private static <T> boolean withExtensionAnnotation(Class<T> type) {
- return type.isAnnotationPresent(SPI.class);
+ this.objectFactory = (type == ExtensionFactory.class ? null : extensionDirector.getExtensionLoader(ExtensionFactory.class)
+ .getAdaptiveExtension());
}
- @SuppressWarnings("unchecked")
+ /**
+ * @deprecated get extension loader from extension director of some module.
+ *
+ * @see ApplicationModel#getExtensionDirector()
+ * @see FrameworkModel#getExtensionDirector()
+ * @see ModuleModel#getExtensionDirector()
+ * @see ExtensionDirector#getExtensionLoader(java.lang.Class)
+ */
+ @Deprecated
public static <T> ExtensionLoader<T> getExtensionLoader(Class<T> type) {
- if (type == null) {
- throw new IllegalArgumentException("Extension type == null");
- }
- if (!type.isInterface()) {
- throw new IllegalArgumentException("Extension type (" + type + ") is not an interface!");
- }
- if (!withExtensionAnnotation(type)) {
- throw new IllegalArgumentException("Extension type (" + type +
- ") is not an extension, because it is NOT annotated with @" + SPI.class.getSimpleName() + "!");
- }
-
- ExtensionLoader<T> loader = (ExtensionLoader<T>) EXTENSION_LOADERS.get(type);
- if (loader == null) {
- EXTENSION_LOADERS.putIfAbsent(type, new ExtensionLoader<T>(type));
- loader = (ExtensionLoader<T>) EXTENSION_LOADERS.get(type);
- }
- return loader;
+ return ApplicationModel.defaultModel().getExtensionDirector().getExtensionLoader(type);
}
// For testing purposes only
public static void resetExtensionLoader(Class type) {
- ExtensionLoader loader = EXTENSION_LOADERS.get(type);
- if (loader != null) {
- // Remove all instances associated with this loader as well
- Map<String, Class<?>> classes = loader.getExtensionClasses();
- for (Map.Entry<String, Class<?>> entry : classes.entrySet()) {
- EXTENSION_INSTANCES.remove(entry.getValue());
- }
- classes.clear();
- EXTENSION_LOADERS.remove(type);
- }
+// ExtensionLoader loader = EXTENSION_LOADERS.get(type);
+// if (loader != null) {
+// // Remove all instances associated with this loader as well
+// Map<String, Class<?>> classes = loader.getExtensionClasses();
+// for (Map.Entry<String, Class<?>> entry : classes.entrySet()) {
+// EXTENSION_INSTANCES.remove(entry.getValue());
+// }
+// classes.clear();
+// EXTENSION_LOADERS.remove(type);
+// }
}
- public static void destroyAll() {
- EXTENSION_INSTANCES.forEach((_type, instance) -> {
+ public void destroy() {
+ extensionInstances.forEach((_type, instance) -> {
if (instance instanceof Lifecycle) {
Lifecycle lifecycle = (Lifecycle) instance;
try {
@@ -207,13 +203,9 @@ public class ExtensionLoader<T> {
}
}
});
+ extensionInstances.clear();
- // TODO Improve extension loader, clear static refer extension instance.
- // Some extension instances may be referenced by static fields, if clear EXTENSION_INSTANCES may cause inconsistent.
- // e.g. org.apache.dubbo.registry.client.metadata.MetadataUtils.localMetadataService
- // EXTENSION_INSTANCES.clear();
-
- EXTENSION_LOADERS.clear();
+ // TODO destroy extension loader, release resources.
}
private static ClassLoader findClassLoader() {
@@ -695,11 +687,12 @@ public class ExtensionLoader<T> {
throw findException(name);
}
try {
- T instance = (T) EXTENSION_INSTANCES.get(clazz);
+ T instance = (T) extensionInstances.get(clazz);
if (instance == null) {
- EXTENSION_INSTANCES.putIfAbsent(clazz, clazz.getDeclaredConstructor().newInstance());
- instance = (T) EXTENSION_INSTANCES.get(clazz);
+ extensionInstances.putIfAbsent(clazz, clazz.getDeclaredConstructor().newInstance());
+ instance = (T) extensionInstances.get(clazz);
}
+ instance = postProcessBeforeInitialization(instance, name);
injectExtension(instance);
@@ -723,6 +716,7 @@ public class ExtensionLoader<T> {
}
}
+ instance = postProcessAfterInitialization(instance, name);
initExtension(instance);
return instance;
} catch (Throwable t) {
@@ -731,6 +725,24 @@ public class ExtensionLoader<T> {
}
}
+ private T postProcessBeforeInitialization(T instance, String name) throws Exception {
+ if (extensionPostProcessors != null) {
+ for (ExtensionPostProcessor processor : extensionPostProcessors) {
+ instance = (T) processor.postProcessBeforeInitialization(instance, name);
+ }
+ }
+ return instance;
+ }
+
+ private T postProcessAfterInitialization(T instance, String name) throws Exception {
+ if (extensionPostProcessors != null) {
+ for (ExtensionPostProcessor processor : extensionPostProcessors) {
+ instance = (T) processor.postProcessAfterInitialization(instance, name);
+ }
+ }
+ return instance;
+ }
+
private boolean containsExtension(String name) {
return getExtensionClasses().containsKey(name);
}
@@ -839,8 +851,11 @@ public class ExtensionLoader<T> {
Map<String, Class<?>> extensionClasses = new HashMap<>();
for (LoadingStrategy strategy : strategies) {
- loadDirectory(extensionClasses, strategy.directory(), type.getName(), strategy.preferExtensionClassLoader(), strategy.overridden(), strategy.excludedPackages());
- loadDirectory(extensionClasses, strategy.directory(), type.getName().replace("org.apache", "com.alibaba"), strategy.preferExtensionClassLoader(), strategy.overridden(), strategy.excludedPackages());
+ loadDirectory(extensionClasses, strategy.directory(), type.getName(), strategy.preferExtensionClassLoader(),
+ strategy.overridden(), strategy.excludedPackages());
+ String oldType = this.type.getName().replace("org.apache", "com.alibaba");
+ loadDirectory(extensionClasses, strategy.directory(), oldType, strategy.preferExtensionClassLoader(),
+ strategy.overridden(), strategy.excludedPackages());
}
return extensionClasses;
@@ -933,7 +948,8 @@ public class ExtensionLoader<T> {
loadClass(extensionClasses, resourceURL, Class.forName(clazz, true, classLoader), name, overridden);
}
} catch (Throwable t) {
- IllegalStateException e = new IllegalStateException("Failed to load extension class (interface: " + type + ", class line: " + line + ") in " + resourceURL + ", cause: " + t.getMessage(), t);
+ IllegalStateException e = new IllegalStateException("Failed to load extension class (interface: " + type +
+ ", class line: " + line + ") in " + resourceURL + ", cause: " + t.getMessage(), t);
exceptions.put(line, e);
}
}
@@ -1086,7 +1102,11 @@ public class ExtensionLoader<T> {
@SuppressWarnings("unchecked")
private T createAdaptiveExtension() {
try {
- return injectExtension((T) getAdaptiveExtensionClass().newInstance());
+ T instance = (T) getAdaptiveExtensionClass().newInstance();
+ instance = postProcessBeforeInitialization(instance, null);
+ instance = injectExtension(instance);
+ instance = postProcessAfterInitialization(instance, null);
+ return instance;
} catch (Exception e) {
throw new IllegalStateException("Can't create adaptive extension " + type + ", cause: " + e.getMessage(), e);
}
@@ -1103,17 +1123,25 @@ public class ExtensionLoader<T> {
private Class<?> createAdaptiveExtensionClass() {
ClassLoader classLoader = findClassLoader();
try {
- if (ApplicationModel.getEnvironment().getConfiguration().getBoolean(NATIVE, false)) {
+ if (getEnvironment().getConfiguration().getBoolean(NATIVE, false)) {
return classLoader.loadClass(type.getName() + "$Adaptive");
}
} catch (Throwable ignore) {
}
String code = new AdaptiveClassCodeGenerator(type, cachedDefaultName).generate();
- org.apache.dubbo.common.compiler.Compiler compiler = ExtensionLoader.getExtensionLoader(org.apache.dubbo.common.compiler.Compiler.class).getAdaptiveExtension();
+ org.apache.dubbo.common.compiler.Compiler compiler = extensionDirector.getExtensionLoader(
+ org.apache.dubbo.common.compiler.Compiler.class).getAdaptiveExtension();
return compiler.compile(code, classLoader);
}
+ private Environment getEnvironment() {
+ if (environment == null) {
+ environment = (Environment) extensionDirector.getExtensionLoader(FrameworkExt.class).getExtension(Environment.NAME);
+ }
+ return environment;
+ }
+
@Override
public String toString() {
return this.getClass().getName() + "[" + type.getName() + "]";
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionPostProcessor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionPostProcessor.java
new file mode 100644
index 0000000..fcc4822
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionPostProcessor.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension;
+
+/**
+ * A Post-processor called before or after extension initialization.
+ */
+public interface ExtensionPostProcessor {
+
+ default Object postProcessBeforeInitialization(Object instance, String name) throws Exception {
+ return instance;
+ }
+
+ default Object postProcessAfterInitialization(Object instance, String name) throws Exception {
+ return instance;
+ }
+
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionScope.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionScope.java
new file mode 100644
index 0000000..4391e52
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionScope.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension;
+
+/**
+ * Extension SPI Scope
+ */
+public enum ExtensionScope {
+
+ /**
+ * The extension instance is used within framework, shared with all applications and modules.
+ */
+ FRAMEWORK,
+
+ /**
+ * The extension instance is used within one application, shared with all modules of the application,
+ * and different applications create different extension instances.
+ */
+ APPLICATION,
+
+ /**
+ * The extension instance is used within one module, and different modules create different extension instances.
+ */
+ MODULE
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
index 70aa5b7..76e9fd5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
@@ -61,4 +61,8 @@ public @interface SPI {
*/
String value() default "";
+ /**
+ * scope of SPI
+ */
+ ExtensionScope scope() default ExtensionScope.FRAMEWORK;
}
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 9e0521b..0d47697 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
@@ -18,7 +18,9 @@ package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.config.Environment;
import org.apache.dubbo.common.context.FrameworkExt;
+import org.apache.dubbo.common.extension.ExtensionDirector;
import org.apache.dubbo.common.extension.ExtensionLoader;
+import org.apache.dubbo.common.extension.ExtensionScope;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
@@ -46,14 +48,43 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class ApplicationModel {
protected static final Logger LOGGER = LoggerFactory.getLogger(ApplicationModel.class);
public static final String NAME = "application";
+ private static volatile ApplicationModel defaultInstance;
- private static AtomicBoolean INIT_FLAG = new AtomicBoolean(false);
- private static Environment environment;
- private static ConfigManager configManager;
- private static ServiceRepository serviceRepository;
+ private AtomicBoolean initFlag = new AtomicBoolean(false);
+ private Environment environment;
+ private ConfigManager configManager;
+ private ServiceRepository serviceRepository;
- public static void init() {
- if (INIT_FLAG.compareAndSet(false, true)) {
+ private FrameworkModel frameworkModel;
+ private ExtensionDirector extensionDirector;
+
+ public ApplicationModel(FrameworkModel frameworkModel) {
+ this.frameworkModel = frameworkModel;
+ extensionDirector = new ExtensionDirector(frameworkModel.getExtensionDirector(), ExtensionScope.APPLICATION);
+ extensionDirector.addExtensionPostProcessor(new ModelAwarePostProcessor(this));
+ }
+
+ public static ApplicationModel defaultModel() {
+ if (defaultInstance == null) {
+ synchronized (ApplicationModel.class) {
+ if (defaultInstance == null) {
+ defaultInstance = new ApplicationModel(FrameworkModel.defaultModel());
+ }
+ }
+ }
+ return defaultInstance;
+ }
+
+ public FrameworkModel getFrameworkModel() {
+ return frameworkModel;
+ }
+
+ public ExtensionDirector getExtensionDirector() {
+ return extensionDirector;
+ }
+
+ public void init() {
+ if (initFlag.compareAndSet(false, true)) {
ExtensionLoader<ApplicationInitListener> extensionLoader = ExtensionLoader.getExtensionLoader(ApplicationInitListener.class);
Set<String> listenerNames = extensionLoader.getSupportedExtensions();
for (String listenerName : listenerNames) {
@@ -62,99 +93,76 @@ public class ApplicationModel {
}
}
- public static Collection<ConsumerModel> allConsumerModels() {
+ public void destroy() {
+ // TODO destroy application resources
+ }
+
+ public Collection<ConsumerModel> allConsumerModels() {
return getServiceRepository().getReferredServices();
}
- public static Collection<ProviderModel> allProviderModels() {
+ public Collection<ProviderModel> allProviderModels() {
return getServiceRepository().getExportedServices();
}
- public static ProviderModel getProviderModel(String serviceKey) {
+ public ProviderModel getProviderModel(String serviceKey) {
return getServiceRepository().lookupExportedService(serviceKey);
}
- public static ConsumerModel getConsumerModel(String serviceKey) {
+ public ConsumerModel getConsumerModel(String serviceKey) {
return getServiceRepository().lookupReferredService(serviceKey);
}
- private static ExtensionLoader<FrameworkExt> LOADER = ExtensionLoader.getExtensionLoader(FrameworkExt.class);
-
- public static void initFrameworkExts() {
- Set<FrameworkExt> exts = ExtensionLoader.getExtensionLoader(FrameworkExt.class).getSupportedExtensionInstances();
+ public void initFrameworkExts() {
+ Set<FrameworkExt> exts = extensionDirector.getExtensionLoader(FrameworkExt.class).getSupportedExtensionInstances();
for (FrameworkExt ext : exts) {
ext.initialize();
}
}
- public static Environment getEnvironment() {
+ public Environment getEnvironment() {
if (environment == null) {
- environment = (Environment) LOADER.getExtension(Environment.NAME);
+ environment = (Environment) extensionDirector.getExtensionLoader(FrameworkExt.class)
+ .getExtension(Environment.NAME);
}
return environment;
}
- public static ConfigManager getConfigManager() {
+ public ConfigManager getConfigManager() {
if (configManager == null) {
- configManager = (ConfigManager) LOADER.getExtension(ConfigManager.NAME);
+ configManager = (ConfigManager) extensionDirector.getExtensionLoader(FrameworkExt.class)
+ .getExtension(ConfigManager.NAME);
}
return configManager;
}
- public static ServiceRepository getServiceRepository() {
+ public ServiceRepository getServiceRepository() {
if (serviceRepository == null) {
- serviceRepository = (ServiceRepository) LOADER.getExtension(ServiceRepository.NAME);
+ serviceRepository = (ServiceRepository) extensionDirector.getExtensionLoader(FrameworkExt.class)
+ .getExtension(ServiceRepository.NAME);
}
return serviceRepository;
}
- public static ExecutorRepository getExecutorRepository() {
- return ExtensionLoader.getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
+ public ExecutorRepository getExecutorRepository() {
+ return extensionDirector.getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
}
- public static ApplicationConfig getApplicationConfig() {
+ public ApplicationConfig getApplicationConfig() {
return getConfigManager().getApplicationOrElseThrow();
}
- public static String getName() {
+ public String getName() {
return getApplicationConfig().getName();
}
- @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, it will be remove at next version.
- @Deprecated
- public static void setApplication(String application) {
- ApplicationModel.application = application;
- }
-
// only for unit test
+ @Deprecated
public static void reset() {
- if (serviceRepository!=null){
- serviceRepository.destroy();
- serviceRepository = null;
- }
- if (configManager != null) {
- configManager.destroy();
- configManager = null;
- }
- if (environment != null) {
- environment.destroy();
- environment = null;
+ if (defaultInstance != null) {
+ defaultInstance.destroy();
+ defaultInstance = null;
}
- ExtensionLoader.resetExtensionLoader(FrameworkExt.class);
- LOADER = ExtensionLoader.getExtensionLoader(FrameworkExt.class);
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
new file mode 100644
index 0000000..859f5e8
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.rpc.model;
+
+import org.apache.dubbo.common.extension.ExtensionDirector;
+import org.apache.dubbo.common.extension.ExtensionScope;
+
+/**
+ * Model of dubbo framework, it can be shared with multiple applications.
+ */
+public class FrameworkModel {
+
+ private volatile static FrameworkModel defaultInstance;
+
+ private final ExtensionDirector extensionDirector;
+
+ public FrameworkModel() {
+ extensionDirector = new ExtensionDirector(null, ExtensionScope.FRAMEWORK);
+ extensionDirector.addExtensionPostProcessor(new ModelAwarePostProcessor(this));
+ }
+
+ public ExtensionDirector getExtensionDirector() {
+ return extensionDirector;
+ }
+
+ public static FrameworkModel defaultModel() {
+ if (defaultInstance == null) {
+ synchronized (FrameworkModel.class) {
+ if (defaultInstance == null) {
+ defaultInstance = new FrameworkModel();
+ }
+ }
+ }
+ return defaultInstance;
+ }
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAware.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAware.java
new file mode 100644
index 0000000..dafa769
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAware.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.rpc.model;
+
+/**
+ * Interface to inject FrameworkModel/ApplicationModel/ModuleModel for SPI extension.
+ */
+public interface ModelAware {
+
+ default void setFrameworkModel(FrameworkModel frameworkModel) {
+ }
+
+ default void setApplicationModel(ApplicationModel applicationModel) {
+ }
+
+ default void setModuleModel(ModuleModel moduleModel) {
+ }
+
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAwarePostProcessor.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAwarePostProcessor.java
new file mode 100644
index 0000000..2e93318
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModelAwarePostProcessor.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.rpc.model;
+
+import org.apache.dubbo.common.extension.ExtensionPostProcessor;
+
+public class ModelAwarePostProcessor implements ExtensionPostProcessor {
+ private Object model;
+ private FrameworkModel frameworkModel;
+ private ApplicationModel applicationModel;
+ private ModuleModel moduleModel;
+
+ public ModelAwarePostProcessor(Object model) {
+ this.model = model;
+ if (model instanceof FrameworkModel) {
+ frameworkModel = (FrameworkModel) model;
+ } else if (model instanceof ApplicationModel) {
+ applicationModel = (ApplicationModel) model;
+ frameworkModel = applicationModel.getFrameworkModel();
+ } else if (model instanceof ModuleModel) {
+ moduleModel = (ModuleModel) model;
+ applicationModel = moduleModel.getApplicationModel();
+ frameworkModel = applicationModel.getFrameworkModel();
+ }
+ }
+
+ @Override
+ public Object postProcessAfterInitialization(Object instance, String name) throws Exception {
+ if (instance instanceof ModelAware) {
+ ModelAware modelAware = (ModelAware) instance;
+ if (this.applicationModel != null) {
+ modelAware.setApplicationModel(this.applicationModel);
+ }
+ if (this.moduleModel != null) {
+ modelAware.setModuleModel(this.moduleModel);
+ }
+ if (this.frameworkModel != null) {
+ modelAware.setFrameworkModel(this.frameworkModel);
+ }
+ }
+ return instance;
+ }
+}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java
new file mode 100644
index 0000000..1334b80
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.rpc.model;
+
+import org.apache.dubbo.common.extension.ExtensionDirector;
+import org.apache.dubbo.common.extension.ExtensionScope;
+
+/**
+ * Model of a service module
+ */
+public class ModuleModel {
+
+ private final ApplicationModel applicationModel;
+ private final ExtensionDirector extensionDirector;
+
+ public ModuleModel(ApplicationModel applicationModel) {
+ this.applicationModel = applicationModel;
+ extensionDirector = new ExtensionDirector(applicationModel.getExtensionDirector(), ExtensionScope.MODULE);
+ extensionDirector.addExtensionPostProcessor(new ModelAwarePostProcessor(this));
+ }
+
+ public ApplicationModel getApplicationModel() {
+ return applicationModel;
+ }
+
+ public ExtensionDirector getExtensionDirector() {
+ return extensionDirector;
+ }
+
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
new file mode 100644
index 0000000..1c09a53
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionDirectorTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension;
+
+import org.apache.dubbo.common.extension.ExtensionDirector;
+import org.apache.dubbo.common.extension.ExtensionScope;
+import org.apache.dubbo.common.extension.director.ApplicationService;
+import org.apache.dubbo.common.extension.director.FrameworkService;
+import org.apache.dubbo.common.extension.director.ModuleService;
+import org.apache.dubbo.common.extension.director.impl.TestApplicationService;
+import org.apache.dubbo.common.extension.director.impl.TestFrameworkService;
+import org.apache.dubbo.common.extension.director.impl.TestModuleService;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.model.ModuleModel;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ExtensionDirectorTest {
+
+ String testFwSrvName = "testFwSrv";
+ String testAppSrvName = "testAppSrv";
+ String testMdSrvName = "testMdSrv";
+
+ @Test
+ public void testInheritanceAndScope() {
+
+ // expecting:
+ // 1. SPI extension only be created in ExtensionDirector which matched scope
+ // 2. Child ExtensionDirector can get extension instance from parent
+ // 3. Parent ExtensionDirector can't get extension instance from child
+
+ ExtensionDirector fwExtensionDirector = new ExtensionDirector(null, ExtensionScope.FRAMEWORK);
+ ExtensionDirector appExtensionDirector = new ExtensionDirector(fwExtensionDirector, ExtensionScope.APPLICATION);
+ ExtensionDirector moduleExtensionDirector = new ExtensionDirector(appExtensionDirector, ExtensionScope.MODULE);
+
+ // test module extension loader
+ FrameworkService testFwSrvFromModule = moduleExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ ApplicationService testAppSrvFromModule = moduleExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ ModuleService testMdSrvFromModule = moduleExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertNotNull(testFwSrvFromModule);
+ Assertions.assertNotNull(testAppSrvFromModule);
+ Assertions.assertNotNull(testMdSrvFromModule);
+
+ // test app extension loader
+ FrameworkService testFwSrvFromApp = appExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ ApplicationService testAppSrvFromApp = appExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ ModuleService testMdSrvFromApp = appExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertSame(testFwSrvFromApp, testFwSrvFromModule);
+ Assertions.assertSame(testAppSrvFromApp, testAppSrvFromModule);
+ Assertions.assertNull(testMdSrvFromApp);
+
+ // test framework extension loader
+ FrameworkService testFwSrvFromFw = fwExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ ApplicationService testAppSrvFromFw = fwExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ ModuleService testMdSrvFromFw = fwExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertSame(testFwSrvFromFw, testFwSrvFromApp);
+ Assertions.assertNull(testAppSrvFromFw);
+ Assertions.assertNull(testMdSrvFromFw);
+ }
+
+ @Test
+ public void testPostProcessor() {
+
+ }
+
+ @Test
+ public void testModelAware() {
+ // Expecting:
+ // 1. Module scope SPI can be injected ModuleModel, ApplicationModel, FrameworkModel
+ // 2. Application scope SPI can be injected ApplicationModel, FrameworkModel, but not ModuleModel
+ // 3. Framework scope SPI can be injected FrameworkModel, but not ModuleModel, ApplicationModel
+
+ FrameworkModel frameworkModel = new FrameworkModel();
+ ApplicationModel applicationModel = new ApplicationModel(frameworkModel);
+ ModuleModel moduleModel = new ModuleModel(applicationModel);
+
+ ExtensionDirector moduleExtensionDirector = moduleModel.getExtensionDirector();
+ ExtensionDirector appExtensionDirector = applicationModel.getExtensionDirector();
+ ExtensionDirector fwExtensionDirector = frameworkModel.getExtensionDirector();
+
+ // check extension director inheritance
+ Assertions.assertSame(appExtensionDirector, moduleExtensionDirector.getParent());
+ Assertions.assertSame(fwExtensionDirector, appExtensionDirector.getParent());
+ Assertions.assertSame(null, fwExtensionDirector.getParent());
+
+ // check module extension aware
+ TestFrameworkService testFwSrvFromModule = (TestFrameworkService) moduleExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ TestApplicationService testAppSrvFromModule = (TestApplicationService) moduleExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ TestModuleService testMdSrvFromModule = (TestModuleService) moduleExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertSame(frameworkModel, testFwSrvFromModule.getFrameworkModel());
+ Assertions.assertSame(null, testFwSrvFromModule.getApplicationModel());
+ Assertions.assertSame(null, testFwSrvFromModule.getModuleModel());
+
+ Assertions.assertSame(frameworkModel, testAppSrvFromModule.getFrameworkModel());
+ Assertions.assertSame(applicationModel, testAppSrvFromModule.getApplicationModel());
+ Assertions.assertSame(null, testAppSrvFromModule.getModuleModel());
+
+ Assertions.assertSame(frameworkModel, testMdSrvFromModule.getFrameworkModel());
+ Assertions.assertSame(applicationModel, testMdSrvFromModule.getApplicationModel());
+ Assertions.assertSame(moduleModel, testMdSrvFromModule.getModuleModel());
+
+ // check app extension aware
+ TestFrameworkService testFwSrvFromApp = (TestFrameworkService) appExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ TestApplicationService testAppSrvFromApp = (TestApplicationService) appExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ TestModuleService testMdSrvFromApp = (TestModuleService) appExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertSame(testFwSrvFromApp, testFwSrvFromModule);
+ Assertions.assertSame(testAppSrvFromApp, testAppSrvFromModule);
+ Assertions.assertNull(testMdSrvFromApp);
+
+ // check framework extension aware
+ FrameworkService testFwSrvFromFw = fwExtensionDirector.getExtension(FrameworkService.class, testFwSrvName);
+ ApplicationService testAppSrvFromFw = fwExtensionDirector.getExtension(ApplicationService.class, testAppSrvName);
+ ModuleService testMdSrvFromFw = fwExtensionDirector.getExtension(ModuleService.class, testMdSrvName);
+
+ Assertions.assertSame(testFwSrvFromFw, testFwSrvFromApp);
+ Assertions.assertNull(testAppSrvFromFw);
+ Assertions.assertNull(testMdSrvFromFw);
+
+ }
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
index 57736b8..b9b80b2 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
@@ -61,6 +61,7 @@ import org.apache.dubbo.common.extension.injection.impl.InjectExtImpl;
import org.apache.dubbo.common.lang.Prioritized;
import org.apache.dubbo.common.url.component.ServiceConfigURL;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -70,7 +71,6 @@ import java.util.List;
import java.util.Set;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
-import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader;
import static org.apache.dubbo.common.extension.ExtensionLoader.getLoadingStrategies;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.anyOf;
@@ -84,6 +84,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
public class ExtensionLoaderTest {
+
+ private <T> ExtensionLoader<T> getExtensionLoader(Class<T> type) {
+ return ApplicationModel.defaultModel().getExtensionDirector().getExtensionLoader(type);
+ }
+
@Test
public void test_getExtensionLoader_Null() throws Exception {
try {
@@ -559,7 +564,7 @@ public class ExtensionLoaderTest {
List<LoadingStrategy> loadingStrategies = ExtensionLoader.getLoadingStrategies();
ExtensionLoader.setLoadingStrategies(new DubboExternalLoadingStrategyTest(false),
new DubboInternalLoadingStrategyTest(false));
- ExtensionLoader<DuplicatedWithoutOverriddenExt> extensionLoader = ExtensionLoader.getExtensionLoader(DuplicatedWithoutOverriddenExt.class);
+ ExtensionLoader<DuplicatedWithoutOverriddenExt> extensionLoader = getExtensionLoader(DuplicatedWithoutOverriddenExt.class);
try {
extensionLoader.getExtension("duplicated");
fail();
@@ -577,7 +582,7 @@ public class ExtensionLoaderTest {
List<LoadingStrategy> loadingStrategies = ExtensionLoader.getLoadingStrategies();
ExtensionLoader.setLoadingStrategies(new DubboExternalLoadingStrategyTest(true),
new DubboInternalLoadingStrategyTest(true));
- ExtensionLoader<DuplicatedOverriddenExt> extensionLoader = ExtensionLoader.getExtensionLoader(DuplicatedOverriddenExt.class);
+ ExtensionLoader<DuplicatedOverriddenExt> extensionLoader = getExtensionLoader(DuplicatedOverriddenExt.class);
DuplicatedOverriddenExt duplicatedOverriddenExt = extensionLoader.getExtension("duplicated");
assertEquals("DuplicatedOverriddenExt1", duplicatedOverriddenExt.echo());
//recover the loading strategies
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ApplicationService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ApplicationService.java
new file mode 100644
index 0000000..c0dff97
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ApplicationService.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director;
+
+import org.apache.dubbo.common.extension.ExtensionScope;
+import org.apache.dubbo.common.extension.SPI;
+
+@SPI(scope = ExtensionScope.APPLICATION)
+public interface ApplicationService {
+
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/FrameworkService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/FrameworkService.java
new file mode 100644
index 0000000..9703689
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/FrameworkService.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director;
+
+import org.apache.dubbo.common.extension.ExtensionScope;
+import org.apache.dubbo.common.extension.SPI;
+
+@SPI(scope = ExtensionScope.FRAMEWORK)
+public interface FrameworkService {
+
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ModuleService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ModuleService.java
new file mode 100644
index 0000000..a9b940f
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/ModuleService.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director;
+
+import org.apache.dubbo.common.extension.ExtensionScope;
+import org.apache.dubbo.common.extension.SPI;
+
+@SPI(scope = ExtensionScope.MODULE)
+public interface ModuleService {
+
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/BaseTestService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/BaseTestService.java
new file mode 100644
index 0000000..c3399b8
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/BaseTestService.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director.impl;
+
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.model.ModelAware;
+import org.apache.dubbo.rpc.model.ModuleModel;
+
+public class BaseTestService implements ModelAware {
+ private FrameworkModel frameworkModel;
+ private ApplicationModel applicationModel;
+ private ModuleModel moduleModel;
+
+ @Override
+ public void setFrameworkModel(FrameworkModel frameworkModel) {
+ this.frameworkModel = frameworkModel;
+ }
+
+ @Override
+ public void setApplicationModel(ApplicationModel applicationModel) {
+ this.applicationModel = applicationModel;
+ }
+
+ @Override
+ public void setModuleModel(ModuleModel moduleModel) {
+ this.moduleModel = moduleModel;
+ }
+
+ public FrameworkModel getFrameworkModel() {
+ return frameworkModel;
+ }
+
+ public ApplicationModel getApplicationModel() {
+ return applicationModel;
+ }
+
+ public ModuleModel getModuleModel() {
+ return moduleModel;
+ }
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestApplicationService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestApplicationService.java
new file mode 100644
index 0000000..9a0e1ef
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestApplicationService.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director.impl;
+
+import org.apache.dubbo.common.extension.director.ApplicationService;
+
+public class TestApplicationService extends BaseTestService implements ApplicationService {
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestFrameworkService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestFrameworkService.java
new file mode 100644
index 0000000..416ba0d
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestFrameworkService.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director.impl;
+
+import org.apache.dubbo.common.extension.director.FrameworkService;
+
+public class TestFrameworkService extends BaseTestService implements FrameworkService {
+
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestModuleService.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestModuleService.java
new file mode 100644
index 0000000..afdbecb
--- /dev/null
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/director/impl/TestModuleService.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.extension.director.impl;
+
+import org.apache.dubbo.common.extension.director.ModuleService;
+
+public class TestModuleService extends BaseTestService implements ModuleService {
+}
diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ApplicationService b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ApplicationService
new file mode 100644
index 0000000..10d253b
--- /dev/null
+++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ApplicationService
@@ -0,0 +1 @@
+testAppSrv=org.apache.dubbo.common.extension.director.impl.TestApplicationService
diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.FrameworkService b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.FrameworkService
new file mode 100644
index 0000000..f695488
--- /dev/null
+++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.FrameworkService
@@ -0,0 +1 @@
+testFwSrv=org.apache.dubbo.common.extension.director.impl.TestFrameworkService
diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ModuleService b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ModuleService
new file mode 100644
index 0000000..9d3ef32
--- /dev/null
+++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.director.ModuleService
@@ -0,0 +1 @@
+testMdSrv=org.apache.dubbo.common.extension.director.impl.TestModuleService
[dubbo] 02/02: Fix access static getter method of ApplicationModel
Posted by ky...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit d8fee834258adf6ce58d517e28f6dc89b33f51da
Author: gongdewei <ky...@qq.com>
AuthorDate: Thu Aug 19 20:28:49 2021 +0800
Fix access static getter method of ApplicationModel
---
.../DefaultGovernanceRuleRepositoryImpl.java | 2 +-
.../loadbalance/ShortestResponseLoadBalance.java | 2 +-
.../cluster/router/mesh/route/MeshRuleManager.java | 2 +-
.../router/mesh/route/MeshRuleManagerTest.java | 18 +++++------
.../dubbo/common/config/ConfigurationUtils.java | 8 ++---
.../status/reporter/FrameworkStatusReporter.java | 6 ++--
.../manager/DefaultExecutorRepository.java | 6 ++--
.../org/apache/dubbo/config/AbstractConfig.java | 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 34 ++++++++++----------
.../java/org/apache/dubbo/config/MethodConfig.java | 2 +-
.../apache/dubbo/config/ReferenceConfigBase.java | 2 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 10 +++---
.../apache/dubbo/config/context/ConfigManager.java | 2 +-
.../dubbo/common/config/EnvironmentTest.java | 2 +-
.../dubbo/config/context/ConfigManagerTest.java | 28 ++++++++---------
.../org/apache/dubbo/config/DubboShutdownHook.java | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 33 +++++++++++++-------
.../ConfigurableMetadataServiceExporter.java | 4 +--
.../ServiceInstanceHostPortCustomizer.java | 2 +-
.../dubbo/config/utils/ReferenceConfigCache.java | 4 +--
.../apache/dubbo/config/AbstractConfigTest.java | 36 +++++++++++-----------
.../dubbo/config/ConfigCenterConfigTest.java | 12 ++++----
.../apache/dubbo/config/ConsumerConfigTest.java | 8 ++---
.../apache/dubbo/config/ReferenceConfigTest.java | 10 +++---
.../apache/dubbo/config/RegistryConfigTest.java | 2 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 4 +--
.../dubbo/config/bootstrap/DubboBootstrapTest.java | 2 +-
.../org/apache/dubbo/config/cache/CacheTest.java | 2 +-
.../dubbo/config/url/InvokerSideConfigUrlTest.java | 4 +--
.../metadata/MetadataServiceExporterTest.java | 6 ++--
.../spring/context/DubboConfigBeanInitializer.java | 2 +-
.../DubboInfraBeanRegisterPostProcessor.java | 4 +--
.../org/apache/dubbo/config/spring/ConfigTest.java | 18 +++++------
.../dubbo/config/spring/JavaConfigBeanTest.java | 2 +-
.../DubboComponentScanRegistrarTest.java | 4 +--
.../context/annotation/EnableDubboConfigTest.java | 2 +-
.../spring/issues/issue7003/Issue7003Test.java | 2 +-
.../consumer/PropertyConfigurerTest.java | 4 +--
.../consumer2/PropertySourcesConfigurerTest.java | 4 +--
.../consumer3/PropertySourcesInJavaConfigTest.java | 8 ++---
.../spring/schema/DubboNamespaceHandlerTest.java | 4 +--
.../dubbo/metadata/WritableMetadataService.java | 2 +-
.../metadata/report/MetadataReportInstance.java | 4 +--
.../dubbo/metadata/ServiceNameMappingTest.java | 4 +--
.../report/support/AbstractMetadataReportTest.java | 2 +-
.../apache/dubbo/qos/command/impl/BaseOffline.java | 2 +-
.../apache/dubbo/qos/command/impl/BaseOnline.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnet.java | 2 +-
.../org/apache/dubbo/qos/command/impl/Live.java | 2 +-
.../java/org/apache/dubbo/qos/command/impl/Ls.java | 4 +--
.../org/apache/dubbo/qos/command/impl/Ready.java | 2 +-
.../org/apache/dubbo/qos/command/impl/Startup.java | 2 +-
.../qos/probe/impl/ProviderReadinessProbe.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnetTest.java | 2 +-
.../org/apache/dubbo/qos/command/impl/LsTest.java | 2 +-
.../apache/dubbo/qos/command/impl/OfflineTest.java | 4 +--
.../apache/dubbo/qos/command/impl/OnlineTest.java | 2 +-
.../dubbo/qos/command/impl/SelectTelnetTest.java | 2 +-
.../client/SelfHostMetaServiceDiscovery.java | 2 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 8 ++---
.../metadata/MetadataServiceNameMapping.java | 12 ++++----
.../ServiceInstanceMetadataCustomizer.java | 2 +-
.../metadata/ServiceInstanceMetadataUtils.java | 2 +-
.../StandardMetadataServiceURLBuilder.java | 2 +-
.../store/InMemoryWritableMetadataService.java | 2 +-
.../client/migration/MigrationInvoker.java | 4 +--
.../client/migration/MigrationRuleListener.java | 6 ++--
.../registry/integration/RegistryDirectory.java | 2 +-
.../registry/integration/RegistryProtocol.java | 16 +++++-----
.../client/migration/MigrationInvokerTest.java | 2 +-
.../migration/MigrationRuleListenerTest.java | 6 ++--
.../support/ServiceOrientedRegistryTest.java | 2 +-
.../registry/dns/DNSServiceDiscoveryTest.java | 8 ++---
.../ZookeeperServiceDiscoveryChangeWatcher.java | 4 +--
.../dubbo/remoting/api/NettyEventLoopFactory.java | 2 +-
.../org/apache/dubbo/remoting/api/SslContexts.java | 6 ++--
.../dubbo/remoting/transport/CodecSupport.java | 2 +-
.../transport/netty4/NettyEventLoopFactory.java | 2 +-
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 2 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +-
.../rpc/protocol/ProtocolSerializationWrapper.java | 2 +-
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 2 +-
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 2 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 4 +--
.../protocol/dubbo/DecodeableRpcInvocation.java | 2 +-
.../rpc/protocol/dubbo/filter/FutureFilter.java | 2 +-
.../rpc/protocol/dubbo/ArgumentCallbackTest.java | 8 ++---
.../rpc/protocol/dubbo/DubboProtocolTest.java | 6 ++--
.../dubbo/rpc/protocol/dubbo/MultiThreadTest.java | 4 +--
.../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 2 +-
.../dubbo/decode/DubboTelnetDecodeTest.java | 6 ++--
.../dubbo/rpc/protocol/dubbo/support/EnumBak.java | 6 ++--
.../dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java | 4 +--
.../dubbo/rpc/protocol/grpc/GrpcProtocol.java | 4 +--
.../dubbo/rpc/protocol/grpc/GrpcProtocolTest.java | 8 ++---
.../dubbo/rpc/protocol/rest/RestProtocol.java | 2 +-
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 2 +-
.../rpc/protocol/tri/AbstractServerStream.java | 2 +-
.../rpc/protocol/tri/TripleClientHandler.java | 2 +-
.../tri/TripleHttp2FrameServerHandler.java | 2 +-
.../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 6 ++--
.../endpoint/metadata/DubboShutdownMetadata.java | 2 +-
.../test/spring/SpringJavaConfigBeanTest.java | 2 +-
105 files changed, 273 insertions(+), 262 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
index dfebf27..dd86575 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
@@ -48,7 +48,7 @@ public class DefaultGovernanceRuleRepositoryImpl implements GovernanceRuleReposi
}
private DynamicConfiguration getDynamicConfiguration() {
- return ApplicationModel.getEnvironment().getDynamicConfiguration().orElse(null);
+ return ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration().orElse(null);
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
index 9c0967b..4b59291 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
@@ -45,7 +45,7 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance {
public static final String NAME = "shortestresponse";
- private static final int SLIDE_PERIOD = ApplicationModel.getEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000);
+ private static final int SLIDE_PERIOD = ApplicationModel.defaultModel().getEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000);
private ConcurrentMap<RpcStatus, SlideWindowData> methodMap = new ConcurrentHashMap<>();
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
index 87fdede..5e2edb4 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
@@ -40,7 +40,7 @@ public final class MeshRuleManager {
MeshAppRuleListener meshAppRuleListener = new MeshAppRuleListener(app);
String appRuleDataId = app + MESH_RULE_DATA_ID_SUFFIX;
- DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration()
+ DynamicConfiguration configuration = ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration()
.orElse(null);
Set<MeshEnvListener> envListeners = ExtensionLoader.getExtensionLoader(MeshEnvListener.class).getSupportedExtensionInstances();
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java
index 214a65b..f75e58a 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java
@@ -38,11 +38,11 @@ public class MeshRuleManagerTest {
@Test
public void subscribeAppRule() {
- Optional<DynamicConfiguration> before = ApplicationModel.getEnvironment().getDynamicConfiguration();
+ Optional<DynamicConfiguration> before = ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration();
try {
DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
- ApplicationModel.getEnvironment().setDynamicConfiguration(dynamicConfiguration);
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(dynamicConfiguration);
MeshRuleManager.subscribeAppRule("test");
@@ -53,7 +53,7 @@ public class MeshRuleManagerTest {
assertEquals("test.MESHAPPRULE", result);
} finally {
- ApplicationModel.getEnvironment().setDynamicConfiguration(before.orElse(null));
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(before.orElse(null));
}
@@ -61,11 +61,11 @@ public class MeshRuleManagerTest {
@Test
public void register() {
- Optional<DynamicConfiguration> before = ApplicationModel.getEnvironment().getDynamicConfiguration();
+ Optional<DynamicConfiguration> before = ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration();
try {
DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
- ApplicationModel.getEnvironment().setDynamicConfiguration(dynamicConfiguration);
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(dynamicConfiguration);
when(dynamicConfiguration.getConfig(anyString(), anyString(), anyLong())).thenReturn("apiVersion: service.dubbo.apache.org/v1alpha1\n" +
"kind: VirtualService\n" +
@@ -109,17 +109,17 @@ public class MeshRuleManagerTest {
assertEquals(1, result.getVirtualServiceRuleList().size());
assertEquals(0, result.getDestinationRuleList().size());
} finally {
- ApplicationModel.getEnvironment().setDynamicConfiguration(before.orElse(null));
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(before.orElse(null));
}
}
@Test
public void unregister() {
- Optional<DynamicConfiguration> before = ApplicationModel.getEnvironment().getDynamicConfiguration();
+ Optional<DynamicConfiguration> before = ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration();
try {
DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
- ApplicationModel.getEnvironment().setDynamicConfiguration(dynamicConfiguration);
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(dynamicConfiguration);
when(dynamicConfiguration.getConfig(anyString(), anyString(), anyLong())).thenReturn("apiVersion: service.dubbo.apache.org/v1alpha1\n" +
"kind: VirtualService\n" +
@@ -154,7 +154,7 @@ public class MeshRuleManagerTest {
MeshRuleManager.unregister(meshRuleRouter);
} finally {
- ApplicationModel.getEnvironment().setDynamicConfiguration(before.orElse(null));
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(before.orElse(null));
}
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java
index 913b218..94b9319 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java
@@ -49,7 +49,7 @@ public class ConfigurationUtils {
* @return
*/
public static Configuration getSystemConfiguration() {
- return ApplicationModel.getEnvironment().getSystemConfiguration();
+ return ApplicationModel.defaultModel().getEnvironment().getSystemConfiguration();
}
/**
@@ -58,7 +58,7 @@ public class ConfigurationUtils {
* @return
*/
public static Configuration getEnvConfiguration() {
- return ApplicationModel.getEnvironment().getEnvironmentConfiguration();
+ return ApplicationModel.defaultModel().getEnvironment().getEnvironmentConfiguration();
}
/**
@@ -69,11 +69,11 @@ public class ConfigurationUtils {
* @return
*/
public static Configuration getGlobalConfiguration() {
- return ApplicationModel.getEnvironment().getConfiguration();
+ return ApplicationModel.defaultModel().getEnvironment().getConfiguration();
}
public static Configuration getDynamicGlobalConfiguration() {
- return ApplicationModel.getEnvironment().getDynamicGlobalConfiguration();
+ return ApplicationModel.defaultModel().getEnvironment().getDynamicGlobalConfiguration();
}
// FIXME
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReporter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReporter.java
index d122f91..b267ac5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReporter.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/reporter/FrameworkStatusReporter.java
@@ -69,7 +69,7 @@ public interface FrameworkStatusReporter {
static String createRegistrationReport(String status) {
return "{\"application\":\"" +
- ApplicationModel.getName() +
+ ApplicationModel.defaultModel().getName() +
"\",\"status\":\"" +
status +
"\"}";
@@ -78,7 +78,7 @@ public interface FrameworkStatusReporter {
static 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.defaultModel().getName());
migrationStatus.put("service", interfaceName);
migrationStatus.put("version", version);
migrationStatus.put("group", group);
@@ -89,7 +89,7 @@ public interface FrameworkStatusReporter {
static 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.defaultModel().getName());
migrationStatus.put("service", interfaceName);
migrationStatus.put("version", version);
migrationStatus.put("group", group);
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
index ae437ee..2776855 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
@@ -27,6 +27,7 @@ import org.apache.dubbo.common.utils.ExecutorUtil;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.ProviderConfig;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import java.util.List;
import java.util.Map;
@@ -46,7 +47,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_REFER_TH
import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_SERVICE_COMPONENT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.THREADS_KEY;
-import static org.apache.dubbo.rpc.model.ApplicationModel.getConfigManager;
/**
* Consider implementing {@code Licycle} to enable executors shutdown when the process stops.
@@ -228,7 +228,7 @@ public class DefaultExecutorRepository implements ExecutorRepository {
}
private Integer getExportThreadNum() {
- List<Integer> threadNum = getConfigManager().getProviders()
+ List<Integer> threadNum = ApplicationModel.defaultModel().getConfigManager().getProviders()
.stream()
.map(ProviderConfig::getExportThreadNum)
.filter(k -> k != null && k > 0)
@@ -275,7 +275,7 @@ public class DefaultExecutorRepository implements ExecutorRepository {
}
private Integer getReferThreadNum() {
- List<Integer> threadNum = getConfigManager().getConsumers()
+ List<Integer> threadNum = ApplicationModel.defaultModel().getConfigManager().getConsumers()
.stream()
.map(ConsumerConfig::getReferThreadNum)
.filter(k -> k != null && k > 0)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index 1d685c9..af2150d 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -443,7 +443,7 @@ public abstract class AbstractConfig implements Serializable {
// check and init before do refresh
preProcessRefresh();
- Environment environment = ApplicationModel.getEnvironment();
+ Environment environment = ApplicationModel.defaultModel().getEnvironment();
List<Map<String, String>> configurationMaps = environment.getConfigurationMaps();
// Search props starts with PREFIX in order
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index cd9fdda..e13b5e0 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -225,7 +225,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
* @return
*/
protected String[] methods(Class<?> interfaceClass) {
- boolean isNative = ApplicationModel.getEnvironment().getConfiguration().getBoolean(NATIVE, false);
+ boolean isNative = ApplicationModel.defaultModel().getEnvironment().getConfiguration().getBoolean(NATIVE, false);
if (isNative) {
return Arrays.stream(interfaceClass.getMethods()).map(Method::getName).toArray(String[]::new);
} else {
@@ -278,7 +278,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
List<MethodConfig> methodConfigs = this.getMethods();
if (methodConfigs != null && methodConfigs.size() > 0) {
// whether ignore invalid method config
- Object ignoreInvalidMethodConfigVal = ApplicationModel.getEnvironment().getConfiguration()
+ Object ignoreInvalidMethodConfigVal = ApplicationModel.defaultModel().getEnvironment().getConfiguration()
.getProperty(ConfigKeys.DUBBO_CONFIG_IGNORE_INVALID_METHOD_CONFIG, "false");
boolean ignoreInvalidMethodConfig = Boolean.parseBoolean(ignoreInvalidMethodConfigVal.toString());
@@ -388,7 +388,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
computeValidRegistryIds();
if (StringUtils.isEmpty(registryIds)) {
if (CollectionUtils.isEmpty(registries)) {
- List<RegistryConfig> registryConfigs = ApplicationModel.getConfigManager().getDefaultRegistries();
+ List<RegistryConfig> registryConfigs = ApplicationModel.defaultModel().getConfigManager().getDefaultRegistries();
registryConfigs = new ArrayList<>(registryConfigs);
setRegistries(registryConfigs);
}
@@ -397,7 +397,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
List<RegistryConfig> tmpRegistries = new ArrayList<>();
Arrays.stream(ids).forEach(id -> {
if (tmpRegistries.stream().noneMatch(reg -> reg.getId().equals(id))) {
- Optional<RegistryConfig> globalRegistry = ApplicationModel.getConfigManager().getRegistry(id);
+ Optional<RegistryConfig> globalRegistry = ApplicationModel.defaultModel().getConfigManager().getRegistry(id);
if (globalRegistry.isPresent()) {
tmpRegistries.add(globalRegistry.get());
} else {
@@ -561,14 +561,14 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (application != null) {
return application;
}
- return ApplicationModel.getConfigManager().getApplicationOrElseThrow();
+ return ApplicationModel.defaultModel().getConfigManager().getApplicationOrElseThrow();
}
@Deprecated
public void setApplication(ApplicationConfig application) {
this.application = application;
if (application != null) {
- ApplicationModel.getConfigManager().setApplication(application);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(application);
}
}
@@ -576,14 +576,14 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (module != null) {
return module;
}
- return ApplicationModel.getConfigManager().getModule().orElse(null);
+ return ApplicationModel.defaultModel().getConfigManager().getModule().orElse(null);
}
@Deprecated
public void setModule(ModuleConfig module) {
this.module = module;
if (module != null) {
- ApplicationModel.getConfigManager().setModule(module);
+ ApplicationModel.defaultModel().getConfigManager().setModule(module);
}
}
@@ -637,7 +637,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
return monitor;
}
// FIXME: instead of return null, we should set default monitor when getMonitor() return null in ConfigManager
- return ApplicationModel.getConfigManager().getMonitor().orElse(null);
+ return ApplicationModel.defaultModel().getConfigManager().getMonitor().orElse(null);
}
@Deprecated
@@ -649,7 +649,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
public void setMonitor(MonitorConfig monitor) {
this.monitor = monitor;
if (monitor != null) {
- ApplicationModel.getConfigManager().setMonitor(monitor);
+ ApplicationModel.defaultModel().getConfigManager().setMonitor(monitor);
}
}
@@ -666,7 +666,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (configCenter != null) {
return configCenter;
}
- Collection<ConfigCenterConfig> configCenterConfigs = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenterConfigs = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
if (CollectionUtils.isNotEmpty(configCenterConfigs)) {
return configCenterConfigs.iterator().next();
}
@@ -677,7 +677,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
public void setConfigCenter(ConfigCenterConfig configCenter) {
this.configCenter = configCenter;
if (configCenter != null) {
- ApplicationModel.getConfigManager().addConfigCenter(configCenter);
+ ApplicationModel.defaultModel().getConfigManager().addConfigCenter(configCenter);
}
}
@@ -718,7 +718,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (metadataReportConfig != null) {
return metadataReportConfig;
}
- Collection<MetadataReportConfig> metadataReportConfigs = ApplicationModel.getConfigManager().getMetadataConfigs();
+ Collection<MetadataReportConfig> metadataReportConfigs = ApplicationModel.defaultModel().getConfigManager().getMetadataConfigs();
if (CollectionUtils.isNotEmpty(metadataReportConfigs)) {
return metadataReportConfigs.iterator().next();
}
@@ -729,7 +729,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
public void setMetadataReportConfig(MetadataReportConfig metadataReportConfig) {
this.metadataReportConfig = metadataReportConfig;
if (metadataReportConfig != null) {
- ApplicationModel.getConfigManager().addMetadataReport(metadataReportConfig);
+ ApplicationModel.defaultModel().getConfigManager().addMetadataReport(metadataReportConfig);
}
}
@@ -738,14 +738,14 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (metrics != null) {
return metrics;
}
- return ApplicationModel.getConfigManager().getMetrics().orElse(null);
+ return ApplicationModel.defaultModel().getConfigManager().getMetrics().orElse(null);
}
@Deprecated
public void setMetrics(MetricsConfig metrics) {
this.metrics = metrics;
if (metrics != null) {
- ApplicationModel.getConfigManager().setMetrics(metrics);
+ ApplicationModel.defaultModel().getConfigManager().setMetrics(metrics);
}
}
@@ -767,7 +767,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
}
public SslConfig getSslConfig() {
- return ApplicationModel.getConfigManager().getSsl().orElse(null);
+ return ApplicationModel.defaultModel().getConfigManager().getSsl().orElse(null);
}
protected void initServiceMetadata(AbstractInterfaceConfig interfaceConfig) {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java
index 2210d6d..7d6b44f 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java
@@ -231,7 +231,7 @@ public class MethodConfig extends AbstractMethodConfig {
private void refreshArgument(ArgumentConfig argument, InmemoryConfiguration subPropsConfiguration) {
if (argument.getIndex() != null && argument.getIndex() >= 0) {
String prefix = argument.getIndex() + ".";
- Environment environment = ApplicationModel.getEnvironment();
+ Environment environment = ApplicationModel.defaultModel().getEnvironment();
java.lang.reflect.Method[] methods = argument.getClass().getMethods();
for (java.lang.reflect.Method method : methods) {
if (MethodUtils.isSetter(method)) {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
index 88e9b2a..65840a6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
@@ -115,7 +115,7 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
protected void preProcessRefresh() {
super.preProcessRefresh();
if (consumer == null) {
- consumer = ApplicationModel.getConfigManager()
+ consumer = ApplicationModel.defaultModel().getConfigManager()
.getDefaultConsumer()
.orElseThrow(() -> new IllegalArgumentException("Default consumer is not initialized"));
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
index 4d2fbfc..ef403de 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
@@ -199,7 +199,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
super.preProcessRefresh();
convertProviderIdToProvider();
if (provider == null) {
- provider = ApplicationModel.getConfigManager()
+ provider = ApplicationModel.defaultModel().getConfigManager()
.getDefaultProvider()
.orElseThrow(() -> new IllegalArgumentException("Default provider is not initialized"));
}
@@ -247,7 +247,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
protected void convertProviderIdToProvider() {
if (provider == null && StringUtils.hasText(providerIds)) {
- provider = ApplicationModel.getConfigManager().getProvider(providerIds)
+ provider = ApplicationModel.defaultModel().getConfigManager().getProvider(providerIds)
.orElseThrow(() -> new IllegalStateException("Provider config not found: " + providerIds));
}
}
@@ -255,7 +255,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
protected void convertProtocolIdsToProtocols() {
if (StringUtils.isEmpty(protocolIds)) {
if (CollectionUtils.isEmpty(protocols)) {
- List<ProtocolConfig> protocolConfigs = ApplicationModel.getConfigManager().getDefaultProtocols();
+ List<ProtocolConfig> protocolConfigs = ApplicationModel.defaultModel().getConfigManager().getDefaultProtocols();
if (protocolConfigs.isEmpty()) {
throw new IllegalStateException("The default protocol has not been initialized.");
}
@@ -266,7 +266,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
Set<String> idsSet = new LinkedHashSet<>(Arrays.asList(idsArray));
List<ProtocolConfig> tmpProtocols = new ArrayList<>();
for (String id : idsSet) {
- Optional<ProtocolConfig> globalProtocol = ApplicationModel.getConfigManager().getProtocol(id);
+ Optional<ProtocolConfig> globalProtocol = ApplicationModel.defaultModel().getConfigManager().getProtocol(id);
if (globalProtocol.isPresent()) {
tmpProtocols.add(globalProtocol.get());
} else {
@@ -336,7 +336,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
}
public void setProvider(ProviderConfig provider) {
- ApplicationModel.getConfigManager().addProvider(provider);
+ ApplicationModel.defaultModel().getConfigManager().addProvider(provider);
this.provider = provider;
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 5d7584c..b9ea862 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -110,7 +110,7 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
@Override
public void initialize() throws IllegalStateException {
- CompositeConfiguration configuration = ApplicationModel.getEnvironment().getConfiguration();
+ CompositeConfiguration configuration = ApplicationModel.defaultModel().getEnvironment().getConfiguration();
String configModeStr = (String) configuration.getProperty(DUBBO_CONFIG_MODE);
try {
if (StringUtils.hasText(configModeStr)) {
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java
index 34f8884..efac2da 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java
@@ -31,7 +31,7 @@ public class EnvironmentTest {
@Test
public void testResolvePlaceholders1() {
- Environment environment = ApplicationModel.getEnvironment();
+ Environment environment = ApplicationModel.defaultModel().getEnvironment();
Map<String, String> externalMap = new LinkedHashMap<>();
externalMap.put("zookeeper.address", "127.0.0.1");
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/config/context/ConfigManagerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/config/context/ConfigManagerTest.java
index b15f9c5..e05c864 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/config/context/ConfigManagerTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/config/context/ConfigManagerTest.java
@@ -36,7 +36,6 @@ import java.util.Collection;
import static java.util.Arrays.asList;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
import static org.apache.dubbo.config.context.ConfigManager.DUBBO_CONFIG_MODE;
-import static org.apache.dubbo.rpc.model.ApplicationModel.getConfigManager;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -50,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.fail;
*/
public class ConfigManagerTest {
- private ConfigManager configManager = getConfigManager();
+ private ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
@BeforeEach
public void init() {
@@ -256,15 +255,16 @@ public class ConfigManagerTest {
try {
// test strict mode
ApplicationModel.reset();
- Assertions.assertEquals(ConfigMode.STRICT, getConfigManager().getConfigMode());
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
+ Assertions.assertEquals(ConfigMode.STRICT, configManager.getConfigMode());
System.setProperty(DUBBO_CONFIG_MODE, ConfigMode.STRICT.name());
ApplicationModel.reset();
- Assertions.assertEquals(ConfigMode.STRICT, getConfigManager().getConfigMode());
+ Assertions.assertEquals(ConfigMode.STRICT, configManager.getConfigMode());
- getConfigManager().addConfig(applicationConfig1);
+ configManager.addConfig(applicationConfig1);
try {
- getConfigManager().addConfig(applicationConfig2);
+ configManager.addConfig(applicationConfig2);
fail("strict mode cannot add two application configs");
} catch (Exception e) {
assertEquals(IllegalStateException.class, e.getClass());
@@ -274,21 +274,21 @@ public class ConfigManagerTest {
// test override mode
System.setProperty(DUBBO_CONFIG_MODE, ConfigMode.OVERRIDE.name());
ApplicationModel.reset();
- Assertions.assertEquals(ConfigMode.OVERRIDE, getConfigManager().getConfigMode());
+ Assertions.assertEquals(ConfigMode.OVERRIDE, configManager.getConfigMode());
- getConfigManager().addConfig(applicationConfig1);
- getConfigManager().addConfig(applicationConfig2);
- assertEquals(applicationConfig2, getConfigManager().getApplicationOrElseThrow());
+ configManager.addConfig(applicationConfig1);
+ configManager.addConfig(applicationConfig2);
+ assertEquals(applicationConfig2, configManager.getApplicationOrElseThrow());
// test ignore mode
System.setProperty(DUBBO_CONFIG_MODE, ConfigMode.IGNORE.name());
ApplicationModel.reset();
- Assertions.assertEquals(ConfigMode.IGNORE, getConfigManager().getConfigMode());
+ Assertions.assertEquals(ConfigMode.IGNORE, configManager.getConfigMode());
- getConfigManager().addConfig(applicationConfig1);
- getConfigManager().addConfig(applicationConfig2);
- assertEquals(applicationConfig1, getConfigManager().getApplicationOrElseThrow());
+ configManager.addConfig(applicationConfig1);
+ configManager.addConfig(applicationConfig2);
+ assertEquals(applicationConfig1, configManager.getApplicationOrElseThrow());
} finally {
System.clearProperty(DUBBO_CONFIG_MODE);
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
index 6380a24..68427dd 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
@@ -57,7 +57,7 @@ public class DubboShutdownHook extends Thread {
@Override
public void run() {
- String disableShutdownHookValue = (String) ApplicationModel.getEnvironment().getConfiguration()
+ String disableShutdownHookValue = (String) ApplicationModel.defaultModel().getEnvironment().getConfiguration()
.getProperty(ConfigKeys.DUBBO_LIFECYCLE_DISABLE_SHUTDOWN_HOOK, "false");
if (Boolean.parseBoolean(disableShutdownHookValue)) {
if (logger.isWarnEnabled()) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 9063c1c..3c2dfe2 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -248,7 +248,7 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
Map<String, String> referenceParameters = appendConfig();
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
ServiceDescriptor serviceDescriptor = repository.registerService(interfaceClass);
repository.registerConsumer(
serviceMetadata.getServiceKey(),
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 5064f52..575633a 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
@@ -345,7 +345,7 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
@SuppressWarnings({"unchecked", "rawtypes"})
private void doExportUrls() {
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
ServiceDescriptor serviceDescriptor = repository.registerService(getInterfaceClass());
repository.registerProvider(
getUniqueServiceName(),
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index 672d91d..30bd5f3 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -75,6 +75,7 @@ import org.apache.dubbo.registry.client.metadata.store.RemoteMetadataServiceImpl
import org.apache.dubbo.registry.support.AbstractRegistryFactory;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
import java.io.IOException;
import java.util.ArrayList;
@@ -161,7 +162,8 @@ public class DubboBootstrap {
private final ExecutorService executorService = newSingleThreadExecutor();
private final ExecutorRepository executorRepository = getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
- ;
+
+ private final ApplicationModel applicationModel;
private final ConfigManager configManager;
@@ -206,13 +208,21 @@ public class DubboBootstrap {
if (instance == null) {
synchronized (DubboBootstrap.class) {
if (instance == null) {
- instance = new DubboBootstrap();
+ instance = new DubboBootstrap(FrameworkModel.defaultModel());
}
}
}
return instance;
}
+ public static DubboBootstrap newInstance() {
+ return new DubboBootstrap(new FrameworkModel());
+ }
+
+ public static DubboBootstrap newInstance(FrameworkModel frameworkModel) {
+ return new DubboBootstrap(frameworkModel);
+ }
+
/**
* Try reset dubbo status for new instance.
*
@@ -239,8 +249,6 @@ public class DubboBootstrap {
}
MetadataReportInstance.reset();
AbstractRegistryFactory.reset();
- ExtensionLoader.destroyAll();
- //ExtensionLoader.resetExtensionLoader(GovernanceRuleRepository.class);
} else {
instance = null;
}
@@ -249,14 +257,19 @@ public class DubboBootstrap {
ShutdownHookCallbacks.INSTANCE.clear();
}
- private DubboBootstrap() {
- configManager = ApplicationModel.getConfigManager();
- environment = ApplicationModel.getEnvironment();
+ private DubboBootstrap(FrameworkModel frameworkModel) {
+ applicationModel = new ApplicationModel(frameworkModel);
+ configManager = applicationModel.getConfigManager();
+ environment = applicationModel.getEnvironment();
DubboShutdownHook.getDubboShutdownHook().register();
ShutdownHookCallbacks.INSTANCE.addCallback(DubboBootstrap.this::destroy);
}
+ public ApplicationModel getApplicationModel() {
+ return applicationModel;
+ }
+
public ConfigManager getConfigManager() {
return configManager;
}
@@ -557,7 +570,7 @@ public class DubboBootstrap {
return;
}
- ApplicationModel.initFrameworkExts();
+ getApplicationModel().initFrameworkExts();
startConfigCenter();
@@ -1045,8 +1058,7 @@ public class DubboBootstrap {
// If none config of the type, try load single config
if (configManager.getConfigs(cls).isEmpty()) {
// load single config
- Environment env = ApplicationModel.getEnvironment();
- List<Map<String, String>> configurationMaps = env.getConfigurationMaps();
+ List<Map<String, String>> configurationMaps = environment.getConfigurationMaps();
if (ConfigurationUtils.hasSubProperties(configurationMaps, AbstractConfig.getTypePrefix(cls))) {
T config = null;
try {
@@ -1081,7 +1093,6 @@ public class DubboBootstrap {
*/
private Set<String> getConfigIds(Class<? extends AbstractConfig> clazz) {
String prefix = CommonConstants.DUBBO + "." + AbstractConfig.getPluralTagName(clazz) + ".";
- Environment environment = ApplicationModel.getEnvironment();
return ConfigurationUtils.getSubIds(environment.getConfigurationMaps(), prefix);
}
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 f7d1db3..5a5ed15 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
@@ -138,7 +138,7 @@ public class ConfigurableMetadataServiceExporter implements MetadataServiceExpor
}
private ApplicationConfig getApplicationConfig() {
- return ApplicationModel.getConfigManager().getApplication().get();
+ return ApplicationModel.defaultModel().getConfigManager().getApplication().get();
}
private ProtocolConfig generateMetadataProtocol() {
@@ -149,7 +149,7 @@ public class ConfigurableMetadataServiceExporter implements MetadataServiceExpor
if (logger.isInfoEnabled()) {
logger.info("Metadata Service Port hasn't been set will use default protocol defined in protocols.");
}
- List<ProtocolConfig> defaultProtocols = ApplicationModel.getConfigManager().getDefaultProtocols();
+ List<ProtocolConfig> defaultProtocols = ApplicationModel.defaultModel().getConfigManager().getDefaultProtocols();
ProtocolConfig dubboProtocol = findDubboProtocol(defaultProtocols);
if (dubboProtocol != null) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstanceHostPortCustomizer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstanceHostPortCustomizer.java
index 8693828..10dba8c 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstanceHostPortCustomizer.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstanceHostPortCustomizer.java
@@ -46,7 +46,7 @@ public class ServiceInstanceHostPortCustomizer implements ServiceInstanceCustomi
int port = -1;
Set<URL> urls = writableMetadataService.getExportedServiceURLs();
if (CollectionUtils.isNotEmpty(urls)) {
- String preferredProtocol = ApplicationModel.getApplicationConfig().getProtocol();
+ String preferredProtocol = ApplicationModel.defaultModel().getApplicationConfig().getProtocol();
if (preferredProtocol != null) {
for (URL exportedURL : urls) {
if (preferredProtocol.equals(exportedURL.getProtocol())) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
index 1f6a773..56f82e4 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
@@ -173,7 +173,7 @@ public class ReferenceConfigCache {
return;
}
- ApplicationModel.getConfigManager().removeConfig(rc);
+ ApplicationModel.defaultModel().getConfigManager().removeConfig(rc);
rc.destroy();
Map<String, Object> proxiesOftype = proxies.get(type);
@@ -215,7 +215,7 @@ public class ReferenceConfigCache {
referredReferences.forEach((_k, referenceConfig) -> {
referenceConfig.destroy();
- ApplicationModel.getConfigManager().removeConfig(referenceConfig);
+ ApplicationModel.defaultModel().getConfigManager().removeConfig(referenceConfig);
});
proxies.forEach((_type, proxiesOfType) -> {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
index 9718452..c4a4860 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -331,8 +331,8 @@ public class AbstractConfigTest {
external.put("dubbo.override.key", "external");
// @Parameter(key="key2", useKeyAsProperty=true)
external.put("dubbo.override.key2", "external");
- ApplicationModel.getEnvironment().initialize();
- ApplicationModel.getEnvironment().setExternalConfigMap(external);
+ ApplicationModel.defaultModel().getEnvironment().initialize();
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(external);
SysProps.setProperty("dubbo.override.address", "system://127.0.0.1:2181");
SysProps.setProperty("dubbo.override.protocol", "system");
@@ -350,7 +350,7 @@ public class AbstractConfigTest {
Assertions.assertEquals("system", overrideConfig.getKey2());
} finally {
SysProps.clear();
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@@ -375,14 +375,14 @@ public class AbstractConfigTest {
Assertions.assertEquals("system", overrideConfig.getKey());
} finally {
SysProps.clear();
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@Test
public void testRefreshProperties() throws Exception {
try {
- ApplicationModel.getEnvironment().setExternalConfigMap(new HashMap<>());
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(new HashMap<>());
OverrideConfig overrideConfig = new OverrideConfig();
overrideConfig.setAddress("override-config://127.0.0.1:2181");
overrideConfig.setProtocol("override-config");
@@ -399,7 +399,7 @@ public class AbstractConfigTest {
Assertions.assertEquals("override-config://", overrideConfig.getEscape());
//Assertions.assertEquals("properties", overrideConfig.getUseKeyAsProperty());
} finally {
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
ConfigUtils.setProperties(null);
}
}
@@ -423,8 +423,8 @@ public class AbstractConfigTest {
external.put("dubbo.override.key", "external");
// @Parameter(key="key2", useKeyAsProperty=true)
external.put("dubbo.override.key2", "external");
- ApplicationModel.getEnvironment().initialize();
- ApplicationModel.getEnvironment().setExternalConfigMap(external);
+ ApplicationModel.defaultModel().getEnvironment().initialize();
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(external);
overrideConfig.refresh();
@@ -435,7 +435,7 @@ public class AbstractConfigTest {
Assertions.assertEquals("external", overrideConfig.getKey());
Assertions.assertEquals("external", overrideConfig.getKey2());
} finally {
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@@ -455,8 +455,8 @@ public class AbstractConfigTest {
external.put("dubbo.overrides.override-id.key2", "external");
external.put("dubbo.override.address", "external://127.0.0.1:2181");
external.put("dubbo.override.exclude", "external");
- ApplicationModel.getEnvironment().initialize();
- ApplicationModel.getEnvironment().setExternalConfigMap(external);
+ ApplicationModel.defaultModel().getEnvironment().initialize();
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(external);
// refresh config
overrideConfig.refresh();
@@ -467,7 +467,7 @@ public class AbstractConfigTest {
Assertions.assertEquals("external", overrideConfig.getKey());
Assertions.assertEquals("external", overrideConfig.getKey2());
} finally {
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@@ -483,8 +483,8 @@ public class AbstractConfigTest {
Map<String, String> external = new HashMap<>();
external.put("dubbo.override.parameters", "[{key3:value3},{key4:value4},{key2:value5}]");
- ApplicationModel.getEnvironment().initialize();
- ApplicationModel.getEnvironment().setExternalConfigMap(external);
+ ApplicationModel.defaultModel().getEnvironment().initialize();
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(external);
// refresh config
overrideConfig.refresh();
@@ -501,7 +501,7 @@ public class AbstractConfigTest {
Assertions.assertEquals("value4", overrideConfig.getParameters().get("key4"));
} finally {
SysProps.clear();
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@@ -514,7 +514,7 @@ public class AbstractConfigTest {
assertEquals("value00", overrideConfig.getParameters().get("key00"));
} finally {
SysProps.clear();
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
@@ -537,14 +537,14 @@ public class AbstractConfigTest {
e.printStackTrace();
}
- ApplicationModel.getEnvironment().setExternalConfigMap(external);
+ ApplicationModel.defaultModel().getEnvironment().setExternalConfigMap(external);
overrideConfig.refresh();
Assertions.assertEquals("value-from-config", overrideConfig.getNotConflictKey());
Assertions.assertEquals("value-from-env", overrideConfig.getNotConflictKey2());
} finally {
- ApplicationModel.getEnvironment().destroy();
+ ApplicationModel.defaultModel().getEnvironment().destroy();
}
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
index 014d764..61d7a97 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
@@ -95,7 +95,7 @@ public class ConfigCenterConfigTest {
// ignore
}
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(zkAddr, configCenter.getAddress());
@@ -123,7 +123,7 @@ public class ConfigCenterConfigTest {
.configCenter(configCenter)
.start();
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(zkAddr, configCenter.getAddress());
@@ -150,7 +150,7 @@ public class ConfigCenterConfigTest {
.configCenter(configCenter)
.initialize();
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(1234, configCenter.getTimeout());
@@ -179,7 +179,7 @@ public class ConfigCenterConfigTest {
.configCenter(configCenter)
.initialize();
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(3000L, configCenter.getTimeout());
@@ -207,7 +207,7 @@ public class ConfigCenterConfigTest {
.configCenter(configCenter)
.start();
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(1234, configCenter.getTimeout());
@@ -237,7 +237,7 @@ public class ConfigCenterConfigTest {
.configCenter(configCenter)
.start();
- Collection<ConfigCenterConfig> configCenters = ApplicationModel.getConfigManager().getConfigCenters();
+ Collection<ConfigCenterConfig> configCenters = ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
Assertions.assertEquals(1, configCenters.size());
Assertions.assertEquals(configCenter, configCenters.iterator().next());
Assertions.assertEquals(3000L, configCenter.getTimeout());
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java
index a4ea9af..6ee61e9 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java
@@ -118,7 +118,7 @@ public class ConsumerConfigTest {
.consumer(consumerConfig)
.initialize();
- Collection<ConsumerConfig> consumers = ApplicationModel.getConfigManager().getConsumers();
+ Collection<ConsumerConfig> consumers = ApplicationModel.defaultModel().getConfigManager().getConsumers();
Assertions.assertEquals(1, consumers.size());
Assertions.assertEquals(consumerConfig, consumers.iterator().next());
Assertions.assertEquals(false, consumerConfig.isCheck());
@@ -148,7 +148,7 @@ public class ConsumerConfigTest {
.consumer(consumerConfig)
.initialize();
- Collection<ConsumerConfig> consumers = ApplicationModel.getConfigManager().getConsumers();
+ Collection<ConsumerConfig> consumers = ApplicationModel.defaultModel().getConfigManager().getConsumers();
Assertions.assertEquals(1, consumers.size());
Assertions.assertEquals(consumerConfig, consumers.iterator().next());
Assertions.assertEquals(false, consumerConfig.isCheck());
@@ -181,7 +181,7 @@ public class ConsumerConfigTest {
.consumer(consumerConfig)
.initialize();
- Collection<ConsumerConfig> consumers = ApplicationModel.getConfigManager().getConsumers();
+ Collection<ConsumerConfig> consumers = ApplicationModel.defaultModel().getConfigManager().getConsumers();
Assertions.assertEquals(1, consumers.size());
Assertions.assertEquals(consumerConfig, consumers.iterator().next());
Assertions.assertEquals(true, consumerConfig.isCheck());
@@ -211,7 +211,7 @@ public class ConsumerConfigTest {
.consumer(consumerConfig)
.initialize();
- Collection<ConsumerConfig> consumers = ApplicationModel.getConfigManager().getConsumers();
+ Collection<ConsumerConfig> consumers = ApplicationModel.defaultModel().getConfigManager().getConsumers();
Assertions.assertEquals(1, consumers.size());
Assertions.assertEquals(consumerConfig, consumers.iterator().next());
Assertions.assertEquals(false, consumerConfig.isCheck());
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index b6c45dc..ca88452 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -58,7 +58,7 @@ public class ReferenceConfigTest {
// preload
ReferenceConfig preloadReferenceConfig = new ReferenceConfig();
- ApplicationModel.getConfigManager();
+ ApplicationModel.defaultModel().getConfigManager();
DubboBootstrap.getInstance();
}
@@ -74,7 +74,7 @@ public class ReferenceConfigTest {
ApplicationConfig application = new ApplicationConfig();
application.setName("test-protocol-random-port");
application.setEnableFileCache(false);
- ApplicationModel.getConfigManager().setApplication(application);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(application);
RegistryConfig registry = new RegistryConfig();
registry.setAddress(registryUrl);
@@ -118,7 +118,7 @@ public class ReferenceConfigTest {
ApplicationConfig application = new ApplicationConfig();
application.setName("test-reference-retry");
application.setEnableFileCache(false);
- ApplicationModel.getConfigManager().setApplication(application);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(application);
RegistryConfig registry = new RegistryConfig();
registry.setAddress(registryUrl);
@@ -212,7 +212,7 @@ public class ReferenceConfigTest {
configCenterConfig.setAddress("diamond://");
testInitReferences(0, amount, applicationConfig, metadataReportConfig, configCenterConfig);
- ApplicationModel.getConfigManager().clear();
+ ApplicationModel.defaultModel().getConfigManager().clear();
testInitReferences(0, 1, applicationConfig, metadataReportConfig, configCenterConfig);
long t1 = System.currentTimeMillis();
@@ -269,7 +269,7 @@ public class ReferenceConfigTest {
referenceConfig.setConfigCenter(configCenterConfig);
DubboBootstrap.getInstance().reference(referenceConfig);
- //ApplicationModel.getConfigManager().getConfigCenters();
+ //ApplicationModel.defaultModel().getConfigManager().getConfigCenters();
}
} catch (Throwable e) {
e.printStackTrace();
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
index 76e79bd..1352f19 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
@@ -227,7 +227,7 @@ public class RegistryConfigTest {
DubboBootstrap.getInstance()
.application("demo-app")
.initialize();
- Collection<RegistryConfig> registries = ApplicationModel.getConfigManager().getRegistries();
+ Collection<RegistryConfig> registries = ApplicationModel.defaultModel().getConfigManager().getRegistries();
Assertions.assertEquals(1, registries.size());
RegistryConfig registryConfig = registries.iterator().next();
Assertions.assertEquals("zookeeper://localhost:2188", registryConfig.getAddress());
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index a9cd67f..0fb444d 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -88,7 +88,7 @@ public class ServiceConfigTest {
@BeforeEach
public void setUp() throws Exception {
- ApplicationModel.getConfigManager().clear();
+ ApplicationModel.defaultModel().getConfigManager().clear();
MockProtocol2.delegate = protocolDelegate;
MockRegistryFactory2.registry = registryDelegate;
@@ -151,7 +151,7 @@ public class ServiceConfigTest {
@AfterEach
public void tearDown() {
- ApplicationModel.getConfigManager().clear();
+ ApplicationModel.defaultModel().getConfigManager().clear();
}
@Test
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
index 068cb69..bdd40ec 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
@@ -125,7 +125,7 @@ public class DubboBootstrapTest {
serviceConfig.refresh();
- //ApplicationModel.getEnvironment().setDynamicConfiguration(new CompositeDynamicConfiguration());
+ //ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(new CompositeDynamicConfiguration());
List<URL> urls = ConfigValidationUtils.loadRegistries(serviceConfig, true);
Assertions.assertEquals(2, urls.size());
for (URL url : urls) {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java
index fd63b8a..e0dab84 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java
@@ -55,7 +55,7 @@ public class CacheTest {
@AfterEach
public void tearDown() {
-// ApplicationModel.getConfigManager().clear();
+// ApplicationModel.defaultModel().getConfigManager().clear();
}
private void testCache(String type) throws Exception {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java
index fee5470..5e932c6 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java
@@ -136,13 +136,13 @@ public class InvokerSideConfigUrlTest extends UrlTestBase {
public void setUp() {
initServConf();
initRefConf();
-// ApplicationModel.getConfigManager().clear();
+// ApplicationModel.defaultModel().getConfigManager().clear();
}
@AfterEach()
public void teardown() {
//RegistryServer.reloadCache();
-// ApplicationModel.getConfigManager().clear();
+// ApplicationModel.defaultModel().getConfigManager().clear();
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
index 77c04fe..9175bf2 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
@@ -43,9 +43,9 @@ public class MetadataServiceExporterTest {
@BeforeAll
public static void init() {
DubboBootstrap.reset();
- ApplicationModel.getConfigManager().setApplication(new ApplicationConfig("Test"));
- ApplicationModel.getConfigManager().addRegistry(new RegistryConfig("multicast://224.5.6.7:1234"));
- ApplicationModel.getConfigManager().addProtocol(new ProtocolConfig("injvm"));
+ ApplicationModel.defaultModel().getConfigManager().setApplication(new ApplicationConfig("Test"));
+ ApplicationModel.defaultModel().getConfigManager().addRegistry(new RegistryConfig("multicast://224.5.6.7:1234"));
+ ApplicationModel.defaultModel().getConfigManager().addProtocol(new ProtocolConfig("injvm"));
}
@AfterAll
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboConfigBeanInitializer.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboConfigBeanInitializer.java
index 61e0f81..59db26e 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboConfigBeanInitializer.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboConfigBeanInitializer.java
@@ -73,7 +73,7 @@ public class DubboConfigBeanInitializer implements BeanFactoryAware, Initializin
private void init() {
if (initialized.compareAndSet(false, true)) {
- configManager = ApplicationModel.getConfigManager();
+ configManager = ApplicationModel.defaultModel().getConfigManager();
referenceBeanManager = beanFactory.getBean(ReferenceBeanManager.BEAN_NAME, ReferenceBeanManager.class);
try {
prepareDubboConfigBeans();
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java
index 7952982..d223ca9 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java
@@ -74,10 +74,10 @@ public class DubboInfraBeanRegisterPostProcessor implements BeanDefinitionRegist
// Extract dubbo props from Spring env and put them to app config
ConfigurableEnvironment environment = (ConfigurableEnvironment) applicationContext.getEnvironment();
SortedMap<String, String> dubboProperties = EnvironmentUtils.filterDubboProperties(environment);
- ApplicationModel.getEnvironment().setAppConfigMap(dubboProperties);
+ ApplicationModel.defaultModel().getEnvironment().setAppConfigMap(dubboProperties);
// register ConfigManager singleton
- beanFactory.registerSingleton(ConfigManager.BEAN_NAME, ApplicationModel.getConfigManager());
+ beanFactory.registerSingleton(ConfigManager.BEAN_NAME, ApplicationModel.defaultModel().getConfigManager());
}
@Override
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index 401fab0..35559f7 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -135,10 +135,10 @@ public class ConfigTest {
try {
ctx.start();
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// clear config manager
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
DemoService demoService = refer("dubbo://127.0.0.1:20887");
String hello = demoService.sayName("hello");
@@ -245,10 +245,10 @@ public class ConfigTest {
try {
ctx.start();
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// clear config manager
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
DemoService demoService = refer("dubbo://127.0.0.1:20881");
String hello = demoService.sayName("hello");
@@ -487,10 +487,10 @@ public class ConfigTest {
try {
providerContext.start();
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// clear config manager
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/init-reference.xml",
resourcePath + "/init-reference-properties.xml");
@@ -732,7 +732,7 @@ public class ConfigTest {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/override-protocol.xml");
try {
providerContext.start();
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
ProtocolConfig protocol = configManager.getProtocol("dubbo").get();
assertEquals(20812, protocol.getPort());
} finally {
@@ -748,7 +748,7 @@ public class ConfigTest {
"/override-multi-protocol.xml");
try {
providerContext.start();
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
ProtocolConfig dubboProtocol = configManager.getProtocol("dubbo").get();
assertEquals(20814, dubboProtocol.getPort().intValue());
@@ -841,7 +841,7 @@ public class ConfigTest {
// set default value of check
assertEquals(false, reference.shouldCheck());
- ConsumerConfig defaultConsumer = ApplicationModel.getConfigManager().getDefaultConsumer().get();
+ ConsumerConfig defaultConsumer = ApplicationModel.defaultModel().getConfigManager().getDefaultConsumer().get();
assertEquals(1234, defaultConsumer.getTimeout());
assertEquals(false, defaultConsumer.isCheck());
} finally {
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/JavaConfigBeanTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/JavaConfigBeanTest.java
index 2514121..1ce8a05 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/JavaConfigBeanTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/JavaConfigBeanTest.java
@@ -88,7 +88,7 @@ public class JavaConfigBeanTest {
try {
consumerContext.start();
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
ApplicationConfig application = configManager.getApplication().get();
Assertions.assertEquals(false, application.getQosEnable());
Assertions.assertEquals("Tom", application.getOwner());
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
index e15175d..a6f9b2a 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
@@ -76,10 +76,10 @@ public class DubboComponentScanRegistrarTest {
// Test @Transactional is present or not
Assertions.assertNotNull(findAnnotation(beanClass, Transactional.class));
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// reset ConfigManager of provider context
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
AnnotationConfigApplicationContext consumerContext = new AnnotationConfigApplicationContext();
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
index 9f12ad1..ee3c846 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
@@ -113,7 +113,7 @@ public class EnableDubboConfigTest {
RegistryConfig registry2 = context.getBean("registry2", RegistryConfig.class);
Assertions.assertEquals(2182, registry2.getPort());
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
Collection<ProtocolConfig> protocolConfigs = configManager.getProtocols();
Assertions.assertEquals(3, protocolConfigs.size());
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue7003/Issue7003Test.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue7003/Issue7003Test.java
index 8534009..344d07c 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue7003/Issue7003Test.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue7003/Issue7003Test.java
@@ -72,7 +72,7 @@ public class Issue7003Test {
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(1, referenceBeanMap.size());
- Collection<ReferenceConfigBase<?>> references = ApplicationModel.getConfigManager().getReferences();
+ Collection<ReferenceConfigBase<?>> references = ApplicationModel.defaultModel().getConfigManager().getReferences();
Assertions.assertEquals(1, references.size());
} finally {
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/PropertyConfigurerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/PropertyConfigurerTest.java
index c9acd72..1cbfa9b 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/PropertyConfigurerTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/PropertyConfigurerTest.java
@@ -62,10 +62,10 @@ public class PropertyConfigurerTest {
try {
providerContext.start();
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// reset ConfigManager of provider context
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
try {
Thread.sleep(1000);
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/PropertySourcesConfigurerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/PropertySourcesConfigurerTest.java
index 323803e..ad51e21 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/PropertySourcesConfigurerTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/PropertySourcesConfigurerTest.java
@@ -68,10 +68,10 @@ public class PropertySourcesConfigurerTest {
} catch (InterruptedException e) {
}
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// reset ConfigManager of provider context
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
// Resolve placeholder by PropertySourcesPlaceholderConfigurer in dubbo-consumer.xml, without import property source.
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer3/PropertySourcesInJavaConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer3/PropertySourcesInJavaConfigTest.java
index f7d066c..f8e3fb8 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer3/PropertySourcesInJavaConfigTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer3/PropertySourcesInJavaConfigTest.java
@@ -78,10 +78,10 @@ public class PropertySourcesInJavaConfigTest {
} catch (InterruptedException e) {
}
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// reset ConfigManager of provider context
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
// Resolve placeholder by import property sources
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class, ImportPropertyConfiguration.class);
@@ -116,10 +116,10 @@ public class PropertySourcesInJavaConfigTest {
} catch (InterruptedException e) {
}
- ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.getServiceRepository().getProviderUrlsWithoutGroup();
+ ConcurrentMap<String, Set<URL>> tmp = ApplicationModel.defaultModel().getServiceRepository().getProviderUrlsWithoutGroup();
// reset ConfigManager of provider context
DubboBootstrap.reset(false);
- ApplicationModel.getServiceRepository().setProviderUrlsWithoutGroup(tmp);
+ ApplicationModel.defaultModel().getServiceRepository().setProviderUrlsWithoutGroup(tmp);
// Resolve placeholder by custom PropertySourcesPlaceholderConfigurer bean
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class, PropertyBeanConfiguration.class);
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
index d0b2816..aa31db2 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
@@ -127,7 +127,7 @@ public class DubboNamespaceHandlerTest {
Map<String, ProtocolConfig> protocolConfigMap = ctx.getBeansOfType(ProtocolConfig.class);
assertThat(protocolConfigMap.size(), is(2));
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
Collection<ProtocolConfig> protocolConfigs = configManager.getProtocols();
assertThat(protocolConfigs.size(), is(2));
@@ -176,7 +176,7 @@ public class DubboNamespaceHandlerTest {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/provider-nested-service.xml");
ctx.start();
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
Collection<ProviderConfig> providerConfigs = configManager.getProviders();
Assertions.assertEquals(2, providerConfigs.size());
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 1dddfc2..fcd888f 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.getName();
+ return ApplicationModel.defaultModel().getName();
}
/**
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java
index 7f05844..8c6576f 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java
@@ -53,9 +53,9 @@ public class MetadataReportInstance {
.removeParameter(METADATA_REPORT_KEY)
.build();
}
- url = url.addParameterIfAbsent(APPLICATION_KEY, ApplicationModel.getApplicationConfig().getName());
+ url = url.addParameterIfAbsent(APPLICATION_KEY, ApplicationModel.defaultModel().getApplicationConfig().getName());
String relatedRegistryId = config.getRegistry() == null ? DEFAULT_KEY : config.getRegistry();
-// RegistryConfig registryConfig = ApplicationModel.getConfigManager().getRegistry(relatedRegistryId)
+// RegistryConfig registryConfig = ApplicationModel.defaultModel().getConfigManager().getRegistry(relatedRegistryId)
// .orElseThrow(() -> new IllegalStateException("Registry id " + relatedRegistryId + " does not exist."));
metadataReports.put(relatedRegistryId, metadataReportFactory.getMetadataReport(url));
init.set(true);
diff --git a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/ServiceNameMappingTest.java b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/ServiceNameMappingTest.java
index 709dc18..7a03cd4 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/ServiceNameMappingTest.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/ServiceNameMappingTest.java
@@ -64,13 +64,13 @@ public class ServiceNameMappingTest {
applicationName = getClass().getSimpleName();
- ApplicationModel.getConfigManager().setApplication(new ApplicationConfig(applicationName));
+ ApplicationModel.defaultModel().getConfigManager().setApplication(new ApplicationConfig(applicationName));
configuration = new FileSystemDynamicConfiguration();
FileUtils.deleteQuietly(configuration.getRootDirectory());
- ApplicationModel.getEnvironment().setDynamicConfiguration(configuration);
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(configuration);
serviceNameMapping = getDefaultExtension();
}
diff --git a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
index 37b0d3c..1d7ae6c 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportTest.java
@@ -73,7 +73,7 @@ public class AbstractMetadataReportTest {
URL url = URL.valueOf("zookeeper://" + NetUtils.getLocalAddress().getHostName() + ":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic");
abstractMetadataReport = new NewMetadataReport(url);
// set the simple name of current class as the application name
- ApplicationModel.getConfigManager().setApplication(new ApplicationConfig(getClass().getSimpleName()));
+ ApplicationModel.defaultModel().getConfigManager().setApplication(new ApplicationConfig(getClass().getSimpleName()));
}
@AfterEach
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java
index 85c4321..f762219 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java
@@ -34,7 +34,7 @@ import java.util.List;
public class BaseOffline implements BaseCommand {
private Logger logger = LoggerFactory.getLogger(OfflineInterface.class);
public static RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
- public static ServiceRepository serviceRepository = ApplicationModel.getServiceRepository();
+ public static ServiceRepository serviceRepository = ApplicationModel.defaultModel().getServiceRepository();
@Override
public String execute(CommandContext commandContext, String[] args) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOnline.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOnline.java
index cf01ff1..b3d101b 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOnline.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOnline.java
@@ -35,7 +35,7 @@ import java.util.List;
public class BaseOnline implements BaseCommand {
private static final Logger logger = LoggerFactory.getLogger(Online.class);
public static RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
- public static ServiceRepository serviceRepository = ApplicationModel.getServiceRepository();
+ public static ServiceRepository serviceRepository = ApplicationModel.defaultModel().getServiceRepository();
@Override
public String execute(CommandContext commandContext, String[] args) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/InvokeTelnet.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/InvokeTelnet.java
index 7790845..64c5c15 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/InvokeTelnet.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/InvokeTelnet.java
@@ -87,7 +87,7 @@ public class InvokeTelnet implements BaseCommand {
selectedProvider = channel.attr(INVOKE_METHOD_PROVIDER_KEY).get();
invokeMethod = channel.attr(SelectTelnet.SELECT_METHOD_KEY).get();
} else {
- for (ProviderModel provider : ApplicationModel.allProviderModels()) {
+ for (ProviderModel provider : ApplicationModel.defaultModel().allProviderModels()) {
if (!isServiceMatch(service, provider)) {
continue;
}
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Live.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Live.java
index d355845..f29ed2c 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Live.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Live.java
@@ -33,7 +33,7 @@ public class Live implements BaseCommand {
@Override
public String execute(CommandContext commandContext, String[] args) {
URL url = URL.valueOf("application://")
- .addParameter(CommonConstants.QOS_LIVE_PROBE_EXTENSION, ApplicationModel.getApplicationConfig().getLivenessProbe());
+ .addParameter(CommonConstants.QOS_LIVE_PROBE_EXTENSION, ApplicationModel.defaultModel().getApplicationConfig().getLivenessProbe());
List<LivenessProbe> livenessProbes = ExtensionLoader.getExtensionLoader(LivenessProbe.class)
.getActivateExtension(url, CommonConstants.QOS_LIVE_PROBE_EXTENSION);
if (!livenessProbes.isEmpty()) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
index 99dad44..314a000 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
@@ -43,7 +43,7 @@ public class Ls implements BaseCommand {
public String listProvider() {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("As Provider side:" + System.lineSeparator());
- Collection<ProviderModel> providerModelList = ApplicationModel.allProviderModels();
+ Collection<ProviderModel> providerModelList = ApplicationModel.defaultModel().allProviderModels();
TTable tTable = new TTable(new TTable.ColumnDefine[]{
new TTable.ColumnDefine(TTable.Align.MIDDLE),
@@ -65,7 +65,7 @@ public class Ls implements BaseCommand {
public String listConsumer() {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("As Consumer side:" + System.lineSeparator());
- Collection<ConsumerModel> consumerModelList = ApplicationModel.allConsumerModels();
+ Collection<ConsumerModel> consumerModelList = ApplicationModel.defaultModel().allConsumerModels();
TTable tTable = new TTable(new TTable.ColumnDefine[]{
new TTable.ColumnDefine(TTable.Align.MIDDLE),
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ready.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ready.java
index 109adbc..461785e 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ready.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ready.java
@@ -33,7 +33,7 @@ public class Ready implements BaseCommand {
@Override
public String execute(CommandContext commandContext, String[] args) {
URL url = URL.valueOf("application://")
- .addParameter(CommonConstants.QOS_READY_PROBE_EXTENSION, ApplicationModel.getApplicationConfig().getReadinessProbe());
+ .addParameter(CommonConstants.QOS_READY_PROBE_EXTENSION, ApplicationModel.defaultModel().getApplicationConfig().getReadinessProbe());
List<ReadinessProbe> readinessProbes = ExtensionLoader.getExtensionLoader(ReadinessProbe.class)
.getActivateExtension(url, CommonConstants.QOS_READY_PROBE_EXTENSION);
if (!readinessProbes.isEmpty()) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Startup.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Startup.java
index e9a5b54..6045253 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Startup.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Startup.java
@@ -33,7 +33,7 @@ public class Startup implements BaseCommand {
@Override
public String execute(CommandContext commandContext, String[] args) {
URL url = URL.valueOf("application://")
- .addParameter(CommonConstants.QOS_STARTUP_PROBE_EXTENSION, ApplicationModel.getApplicationConfig().getStartupProbe());
+ .addParameter(CommonConstants.QOS_STARTUP_PROBE_EXTENSION, ApplicationModel.defaultModel().getApplicationConfig().getStartupProbe());
List<StartupProbe> startupProbes = ExtensionLoader.getExtensionLoader(StartupProbe.class)
.getActivateExtension(url, CommonConstants.QOS_STARTUP_PROBE_EXTENSION);
if (!startupProbes.isEmpty()) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/ProviderReadinessProbe.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/ProviderReadinessProbe.java
index 5825107..82f8e54 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/ProviderReadinessProbe.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/ProviderReadinessProbe.java
@@ -27,7 +27,7 @@ import java.util.List;
@Activate
public class ProviderReadinessProbe implements ReadinessProbe {
- private static ServiceRepository serviceRepository = ApplicationModel.getServiceRepository();
+ private static ServiceRepository serviceRepository = ApplicationModel.defaultModel().getServiceRepository();
@Override
public boolean check() {
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/InvokeTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/InvokeTelnetTest.java
index a842b4b..b78f818 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/InvokeTelnetTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/InvokeTelnetTest.java
@@ -46,7 +46,7 @@ public class InvokeTelnetTest {
private Channel mockChannel;
private CommandContext mockCommandContext;
private final DefaultAttributeMap defaultAttributeMap = new DefaultAttributeMap();
- private final ServiceRepository repository = ApplicationModel.getServiceRepository();
+ private final ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
@BeforeEach
public void setup() {
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
index 414f308..2bae3d3 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
@@ -52,7 +52,7 @@
// when(providerUrl.toFullString()).thenReturn("dubbo://localhost:8888/org.apache.dubbo.BarService");
// when(providerInvoker.getUrl()).thenReturn(providerUrl);
// ApplicationModel.registerProviderInvoker(providerInvoker, registryUrl, providerUrl);
-// for (ProviderInvokerWrapper wrapper : ApplicationModel.getProviderInvokers("org.apache.dubbo.BarService")) {
+// for (ProviderInvokerWrapper wrapper : ApplicationModel.defaultModel().getProviderInvokers("org.apache.dubbo.BarService")) {
// wrapper.setReg(true);
// }
//
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
index 251d672..cdda677 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
@@ -47,7 +47,7 @@
// when(providerUrl.toFullString()).thenReturn("dubbo://localhost:8888/org.apache.dubbo.BarService");
// when(providerInvoker.getUrl()).thenReturn(providerUrl);
// ApplicationModel.registerProviderInvoker(providerInvoker, registryUrl, providerUrl);
-// for (ProviderInvokerWrapper wrapper : ApplicationModel.getProviderInvokers("org.apache.dubbo.BarService")) {
+// for (ProviderInvokerWrapper wrapper : ApplicationModel.defaultModel().getProviderInvokers("org.apache.dubbo.BarService")) {
// wrapper.setReg(true);
// }
//
@@ -58,7 +58,7 @@
// String output = offline.execute(mock(CommandContext.class), new String[]{"org.apache.dubbo.BarService"});
// assertThat(output, containsString("OK"));
// Mockito.verify(registry).unregister(providerUrl);
-// for (ProviderInvokerWrapper wrapper : ApplicationModel.getProviderInvokers("org.apache.dubbo.BarService")) {
+// for (ProviderInvokerWrapper wrapper : ApplicationModel.defaultModel().getProviderInvokers("org.apache.dubbo.BarService")) {
// assertThat(wrapper.isReg(), is(false));
// }
//
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
index b43ade3..ef8a037 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
@@ -53,7 +53,7 @@
// Online online = new Online();
// String output = online.execute(mock(CommandContext.class), new String[]{"org.apache.dubbo.BarService"});
// assertThat(output, equalTo("OK"));
-// for (ProviderInvokerWrapper wrapper : ApplicationModel.getProviderInvokers("org.apache.dubbo.BarService")) {
+// for (ProviderInvokerWrapper wrapper : ApplicationModel.defaultModel().getProviderInvokers("org.apache.dubbo.BarService")) {
// assertTrue(wrapper.isReg());
// }
// }
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/SelectTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/SelectTelnetTest.java
index 03476eb..23d9298 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/SelectTelnetTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/SelectTelnetTest.java
@@ -49,7 +49,7 @@ public class SelectTelnetTest {
private Channel mockChannel;
private CommandContext mockCommandContext;
- private final ServiceRepository repository = ApplicationModel.getServiceRepository();
+ private final ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
private final DefaultAttributeMap defaultAttributeMap = new DefaultAttributeMap();
private List<Method> methods;
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 43bb167..f41fc7e 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
@@ -225,7 +225,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.getName() + NetUtils.getLocalHost();
+ String consumerId = ApplicationModel.defaultModel().getName() + 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 3e8a6ae..828a988 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
@@ -66,7 +66,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
@Override
public void subscribe(URL url) {
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
enableConfigurationListen = true;
CONSUMER_CONFIGURATION_LISTENER.addNotifyListener(this);
referenceConfigurationListener = new ReferenceConfigurationListener(this, url);
@@ -80,7 +80,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
public void unSubscribe(URL url) {
super.unSubscribe(url);
this.originalUrls = null;
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
CONSUMER_CONFIGURATION_LISTENER.removeNotifyListener(this);
referenceConfigurationListener.stop();
}
@@ -421,7 +421,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
void addNotifyListener(ServiceDiscoveryRegistryDirectory<?> listener) {
if (listeners.size() == 0) {
- this.initWith(ApplicationModel.getApplication() + CONFIGURATORS_SUFFIX);
+ this.initWith(ApplicationModel.defaultModel().getName() + CONFIGURATORS_SUFFIX);
}
this.listeners.add(listener);
}
@@ -429,7 +429,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
void removeNotifyListener(ServiceDiscoveryRegistryDirectory<?> listener) {
this.listeners.remove(listener);
if (listeners.size() == 0) {
- this.stopListen(ApplicationModel.getApplication() + CONFIGURATORS_SUFFIX);
+ this.stopListen(ApplicationModel.defaultModel().getName() + 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 38cef11..bfe2cc4 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
@@ -37,7 +37,6 @@ import java.util.Set;
import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SEPARATOR;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
-import static org.apache.dubbo.rpc.model.ApplicationModel.getName;
public class MetadataServiceNameMapping extends AbstractServiceNameMapping {
@@ -50,7 +49,7 @@ public class MetadataServiceNameMapping extends AbstractServiceNameMapping {
@Override
public void map(URL url) {
execute(() -> {
- if (CollectionUtils.isEmpty(ApplicationModel.getConfigManager().getMetadataConfigs())) {
+ if (CollectionUtils.isEmpty(ApplicationModel.defaultModel().getConfigManager().getMetadataConfigs())) {
return;
}
String serviceInterface = url.getServiceInterface();
@@ -60,23 +59,24 @@ public class MetadataServiceNameMapping extends AbstractServiceNameMapping {
String registryCluster = getRegistryCluster(url);
MetadataReport metadataReport = MetadataReportInstance.getMetadataReport(registryCluster);
- if (metadataReport.registerServiceAppMapping(serviceInterface, getName(), url)) {
+ String appName = ApplicationModel.defaultModel().getName();
+ if (metadataReport.registerServiceAppMapping(serviceInterface, appName, url)) {
// MetadataReport support directly register service-app mapping
return;
}
int currentRetryTimes = 1;
boolean success;
- String newConfigContent = getName();
+ String newConfigContent = appName;
do {
ConfigItem configItem = metadataReport.getConfigItem(serviceInterface, DEFAULT_MAPPING_GROUP);
String oldConfigContent = configItem.getContent();
if (StringUtils.isNotEmpty(oldConfigContent)) {
- boolean contains = StringUtils.isContains(oldConfigContent, getName());
+ boolean contains = StringUtils.isContains(oldConfigContent, appName);
if (contains) {
break;
}
- newConfigContent = oldConfigContent + COMMA_SEPARATOR + getName();
+ newConfigContent = oldConfigContent + COMMA_SEPARATOR + appName;
}
success = metadataReport.registerServiceAppMapping(serviceInterface, DEFAULT_MAPPING_GROUP, newConfigContent, configItem.getTicket());
} while (!success && currentRetryTimes++ <= CAS_RETRY_TIMES);
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 580f80c..4786264 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
@@ -63,7 +63,7 @@ public class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomi
Set<InfraAdapter> adapters = ExtensionLoader.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.defaultModel().getName());
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 c8d70fd..26e2814 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
@@ -259,7 +259,7 @@ public class ServiceInstanceMetadataUtils {
public static void refreshMetadataAndInstance(ServiceInstance serviceInstance) {
RemoteMetadataServiceImpl remoteMetadataService = MetadataUtils.getRemoteMetadataService();
- remoteMetadataService.publishMetadata(ApplicationModel.getName());
+ remoteMetadataService.publishMetadata(ApplicationModel.defaultModel().getName());
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/StandardMetadataServiceURLBuilder.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java
index a7dda4b..5622300 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java
@@ -100,7 +100,7 @@ public class StandardMetadataServiceURLBuilder implements MetadataServiceURLBuil
}
private URL generateUrlWithoutMetadata(String serviceName, String host, Integer instancePort) {
- Integer port = ApplicationModel.getApplicationConfig().getMetadataServicePort();
+ Integer port = ApplicationModel.defaultModel().getApplicationConfig().getMetadataServicePort();
if (port == null || port < 1) {
logger.warn("Metadata Service Port is not provided, since DNS is not able to negotiate the metadata port " +
"between Provider and Consumer, will try to use instance port as the default metadata port.");
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 bf30f4f..17f8547 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
@@ -167,7 +167,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.defaultModel().getName()));
metadataInfo.addService(new ServiceInfo(url));
}
metadataSemaphore.release();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationInvoker.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationInvoker.java
index 39612cc..c133182 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationInvoker.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationInvoker.java
@@ -92,7 +92,7 @@ public class MigrationInvoker<T> implements MigrationClusterInvoker<T> {
this.url = url;
this.consumerUrl = consumerUrl;
- ConsumerModel consumerModel = ApplicationModel.getConsumerModel(consumerUrl.getServiceKey());
+ ConsumerModel consumerModel = ApplicationModel.defaultModel().getConsumerModel(consumerUrl.getServiceKey());
if (consumerModel != null) {
Object object = consumerModel.getServiceMetadata().getAttribute("currentClusterInvoker");
Map<Registry, MigrationInvoker<?>> invokerMap;
@@ -315,7 +315,7 @@ public class MigrationInvoker<T> implements MigrationClusterInvoker<T> {
if (serviceDiscoveryInvoker != null) {
serviceDiscoveryInvoker.destroy();
}
- ConsumerModel consumerModel = ApplicationModel.getConsumerModel(consumerUrl.getServiceKey());
+ ConsumerModel consumerModel = ApplicationModel.defaultModel().getConsumerModel(consumerUrl.getServiceKey());
if (consumerModel != null) {
Object object = consumerModel.getServiceMetadata().getAttribute("currentClusterInvoker");
Map<Registry, MigrationInvoker<?>> invokerMap;
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 a2e0b8c..bb44230 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
@@ -51,7 +51,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur
private static final Logger logger = LoggerFactory.getLogger(MigrationRuleListener.class);
private static final String DUBBO_SERVICEDISCOVERY_MIGRATION = "DUBBO_SERVICEDISCOVERY_MIGRATION";
private static final String MIGRATION_DELAY_KEY = "dubbo.application.migration.delay";
- private final String RULE_KEY = ApplicationModel.getName() + ".migration";
+ private final String RULE_KEY = ApplicationModel.defaultModel().getName() + ".migration";
private final Map<MigrationInvoker, MigrationRuleHandler> handlers = new ConcurrentHashMap<>();
private final LinkedBlockingQueue<String> ruleQueue = new LinkedBlockingQueue<>();
@@ -65,7 +65,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur
private volatile MigrationRule rule;
public MigrationRuleListener() {
- this.configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().orElse(null);
+ this.configuration = ApplicationModel.defaultModel().getEnvironment().getDynamicConfiguration().orElse(null);
if (this.configuration != null) {
logger.info("Listening for migration rules on dataId " + RULE_KEY + ", group " + DUBBO_SERVICEDISCOVERY_MIGRATION);
@@ -83,7 +83,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur
setRawRule(INIT);
}
- String localRawRule = ApplicationModel.getEnvironment().getLocalMigrationRule();
+ String localRawRule = ApplicationModel.defaultModel().getEnvironment().getLocalMigrationRule();
if (!StringUtils.isEmpty(localRawRule)) {
Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("DubboMigrationRuleDelayWorker", true))
.schedule(() -> {
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 e0996ba..53bcf1b 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.getName() + CONFIGURATORS_SUFFIX);
+ this.initWith(ApplicationModel.defaultModel().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 e4ff7c4..ffe01a4 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
@@ -185,7 +185,7 @@ public class RegistryProtocol implements Protocol {
}
private void registerStatedUrl(URL registryUrl, URL registeredProviderUrl, boolean registered) {
- ProviderModel model = ApplicationModel.getProviderModel(registeredProviderUrl.getServiceKey());
+ ProviderModel model = ApplicationModel.defaultModel().getProviderModel(registeredProviderUrl.getServiceKey());
model.addStatedUrl(new ProviderModel.RegisterStatedURL(
registeredProviderUrl,
registryUrl,
@@ -339,7 +339,7 @@ public class RegistryProtocol implements Protocol {
}
private ProviderModel.RegisterStatedURL getStatedUrl(URL registryUrl, URL providerUrl) {
- ProviderModel providerModel = ApplicationModel.getServiceRepository()
+ ProviderModel providerModel = ApplicationModel.defaultModel().getServiceRepository()
.lookupExportedService(providerUrl.getServiceKey());
List<ProviderModel.RegisterStatedURL> statedUrls = providerModel.getStatedUrl();
@@ -561,9 +561,9 @@ public class RegistryProtocol implements Protocol {
}
bounds.clear();
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
ExtensionLoader.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension()
- .removeListener(ApplicationModel.getName() + CONFIGURATORS_SUFFIX, providerConfigurationListener);
+ .removeListener(ApplicationModel.defaultModel().getName() + CONFIGURATORS_SUFFIX, providerConfigurationListener);
}
}
@@ -719,7 +719,7 @@ public class RegistryProtocol implements Protocol {
public ServiceConfigurationListener(URL providerUrl, OverrideListener notifyListener) {
this.providerUrl = providerUrl;
this.notifyListener = notifyListener;
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
this.initWith(DynamicConfiguration.getRuleKey(providerUrl) + CONFIGURATORS_SUFFIX);
}
}
@@ -737,8 +737,8 @@ public class RegistryProtocol implements Protocol {
private class ProviderConfigurationListener extends AbstractConfiguratorListener {
public ProviderConfigurationListener() {
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
- this.initWith(ApplicationModel.getName() + CONFIGURATORS_SUFFIX);
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ this.initWith(ApplicationModel.defaultModel().getName() + CONFIGURATORS_SUFFIX);
}
}
@@ -806,7 +806,7 @@ public class RegistryProtocol implements Protocol {
try {
NotifyListener listener = RegistryProtocol.this.overrideListeners.remove(subscribeUrl);
registry.unsubscribe(subscribeUrl, listener);
- if (ApplicationModel.getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
+ if (ApplicationModel.defaultModel().getEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) {
ExtensionLoader.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension()
.removeListener(subscribeUrl.getServiceKey() + CONFIGURATORS_SUFFIX,
serviceConfigurationListeners.get(subscribeUrl.getServiceKey()));
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
index aadb374..85c5d7a 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
@@ -41,7 +41,7 @@ public class MigrationInvokerTest {
public void before() {
ApplicationConfig applicationConfig = new ApplicationConfig();
applicationConfig.setName("Test");
- ApplicationModel.getConfigManager().setApplication(applicationConfig);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(applicationConfig);
}
@AfterEach
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
index 5b4a8a3..b49995d 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
@@ -45,11 +45,11 @@ public class MigrationRuleListenerTest {
DynamicConfiguration dynamicConfiguration = Mockito.mock(DynamicConfiguration.class);
- ApplicationModel.getEnvironment().setDynamicConfiguration(dynamicConfiguration);
- ApplicationModel.getEnvironment().setLocalMigrationRule(rule);
+ ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(dynamicConfiguration);
+ ApplicationModel.defaultModel().getEnvironment().setLocalMigrationRule(rule);
ApplicationConfig applicationConfig = new ApplicationConfig();
applicationConfig.setName("demo-consumer");
- ApplicationModel.getConfigManager().setApplication(applicationConfig);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(applicationConfig);
URL consumerURL = Mockito.mock(URL.class);
Mockito.when(consumerURL.getServiceKey()).thenReturn("Test");
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
index bc0906f..27d2bbe 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
@@ -85,7 +85,7 @@ public class ServiceOrientedRegistryTest {
registry = ServiceDiscoveryRegistry.create(registryURL);
metadataService = WritableMetadataService.getDefaultExtension();
notifyListener = new MyNotifyListener();
- ApplicationModel.getConfigManager().setApplication(new ApplicationConfig("Test"));
+ ApplicationModel.defaultModel().getConfigManager().setApplication(new ApplicationConfig("Test"));
}
@Test
diff --git a/dubbo-registry/dubbo-registry-dns/src/test/java/org/apache/dubbo/registry/dns/DNSServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-dns/src/test/java/org/apache/dubbo/registry/dns/DNSServiceDiscoveryTest.java
index be8ab9e..c42df40 100644
--- a/dubbo-registry/dubbo-registry-dns/src/test/java/org/apache/dubbo/registry/dns/DNSServiceDiscoveryTest.java
+++ b/dubbo-registry/dubbo-registry-dns/src/test/java/org/apache/dubbo/registry/dns/DNSServiceDiscoveryTest.java
@@ -62,7 +62,7 @@ public class DNSServiceDiscoveryTest {
public void setup() {
DubboBootstrap.reset();
ApplicationConfig applicationConfig = new ApplicationConfig("Test");
- ApplicationModel.getConfigManager().setApplication(applicationConfig);
+ ApplicationModel.defaultModel().getConfigManager().setApplication(applicationConfig);
}
@AfterEach
@@ -111,7 +111,7 @@ public class DNSServiceDiscoveryTest {
URL registryURL = URL.valueOf("dns://")
.addParameter(DNSClientConst.DNS_POLLING_CYCLE, 100)
.addParameter(Constants.ECHO_POLLING_CYCLE_KEY, 100);
- ApplicationModel.getEnvironment().getAppExternalConfigMap()
+ ApplicationModel.defaultModel().getEnvironment().getAppExternalConfigMap()
.put(METADATA_PROXY_TIMEOUT_KEY, String.valueOf(500));
dnsServiceDiscovery.initialize(registryURL);
@@ -122,7 +122,7 @@ public class DNSServiceDiscoveryTest {
dnsServiceDiscovery.register(serviceInstance);
int port = NetUtils.getAvailablePort();
- ApplicationModel.getApplicationConfig().setMetadataServicePort(port);
+ ApplicationModel.defaultModel().getApplicationConfig().setMetadataServicePort(port);
WritableMetadataService spiedMetadataService = Mockito.spy(metadataService);
@@ -164,7 +164,7 @@ public class DNSServiceDiscoveryTest {
serviceConfig.unexport();
dnsServiceDiscovery.destroy();
- ApplicationModel.getEnvironment().getAppExternalConfigMap()
+ ApplicationModel.defaultModel().getEnvironment().getAppExternalConfigMap()
.remove(METADATA_PROXY_TIMEOUT_KEY);
}
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
index 2e45589..f9c1427 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
import org.apache.curator.framework.api.CuratorWatcher;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -31,7 +32,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import static org.apache.dubbo.rpc.model.ApplicationModel.getExecutorRepository;
import static org.apache.zookeeper.Watcher.Event.EventType.NodeChildrenChanged;
import static org.apache.zookeeper.Watcher.Event.EventType.NodeDataChanged;
@@ -65,7 +65,7 @@ public class ZookeeperServiceDiscoveryChangeWatcher implements CuratorWatcher {
this.serviceName = serviceName;
this.path = path;
this.latch = latch;
- this.notifier = new RegistryNotifier(zookeeperServiceDiscovery.getDelay(), getExecutorRepository().getServiceDiscoveryAddressNotificationExecutor()) {
+ this.notifier = new RegistryNotifier(zookeeperServiceDiscovery.getDelay(), ApplicationModel.defaultModel().getExecutorRepository().getServiceDiscoveryAddressNotificationExecutor()) {
@Override
protected void doNotify(Object rawAddresses) {
listeners.forEach(listener -> listener.onEvent((ServiceInstancesChangedEvent)rawAddresses));
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/NettyEventLoopFactory.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/NettyEventLoopFactory.java
index d6e2698..3871f54 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/NettyEventLoopFactory.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/NettyEventLoopFactory.java
@@ -55,7 +55,7 @@ public class NettyEventLoopFactory {
}
private static boolean shouldEpoll() {
- Configuration configuration = ApplicationModel.getEnvironment().getConfiguration();
+ Configuration configuration = ApplicationModel.defaultModel().getEnvironment().getConfiguration();
if (configuration.getBoolean("netty.epoll.enable", false)) {
String osName = configuration.getString("os.name");
return osName.toLowerCase().contains("linux") && Epoll.isAvailable();
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/SslContexts.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/SslContexts.java
index 41d343b..fc2958c 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/SslContexts.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/SslContexts.java
@@ -39,7 +39,7 @@ public class SslContexts {
private static final Logger logger = LoggerFactory.getLogger(SslContexts.class);
public static SslContext buildServerSslContext(URL url) {
- ConfigManager globalConfigManager = ApplicationModel.getConfigManager();
+ ConfigManager globalConfigManager = ApplicationModel.defaultModel().getConfigManager();
SslConfig sslConfig = globalConfigManager.getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
SslContextBuilder sslClientContextBuilder;
@@ -68,7 +68,7 @@ public class SslContexts {
}
public static SslContext buildClientSslContext(URL url) {
- ConfigManager globalConfigManager = ApplicationModel.getConfigManager();
+ ConfigManager globalConfigManager = ApplicationModel.defaultModel().getConfigManager();
SslConfig sslConfig = globalConfigManager.getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
SslContextBuilder builder = SslContextBuilder.forClient();
@@ -98,7 +98,7 @@ public class SslContexts {
}
private static SslConfig getSslConfig() {
- return ApplicationModel.getConfigManager().getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
+ return ApplicationModel.defaultModel().getConfigManager().getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
}
/**
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java
index 6db207b..a10a3a5 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java
@@ -158,7 +158,7 @@ public class CodecSupport {
}
public static void checkSerialization(String path, String version, Byte id) throws IOException {
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
Set<URL> urls = repository.lookupRegisteredProviderUrlsWithoutGroup(keyWithoutGroup(path, version));
if (CollectionUtils.isEmpty(urls)) {
throw new IOException("Service " + path + " with version " + version + " not found, invocation rejected.");
diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyEventLoopFactory.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyEventLoopFactory.java
index f9c5680..c313d81 100644
--- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyEventLoopFactory.java
+++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyEventLoopFactory.java
@@ -49,7 +49,7 @@ public class NettyEventLoopFactory {
}
private static boolean shouldEpoll() {
- Configuration configuration = ApplicationModel.getEnvironment().getConfiguration();
+ Configuration configuration = ApplicationModel.defaultModel().getEnvironment().getConfiguration();
if (configuration.getBoolean("netty.epoll.enable", false)) {
String osName = configuration.getString("os.name");
return osName.toLowerCase().contains("linux") && Epoll.isAvailable();
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
index 4dccbab..73bc8cb 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
@@ -150,7 +150,7 @@ public class RpcInvocation implements Invocation, Serializable {
}
private void initParameterDesc() {
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
if (StringUtils.isNotEmpty(serviceName)) {
ServiceDescriptor serviceDescriptor = repository.lookupService(serviceName);
if (serviceDescriptor != null) {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
index 41bc2d1..0757245 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
@@ -108,7 +108,7 @@ public class GenericFilter implements Filter, Filter.Listener {
} else if (ProtocolUtils.isGsonGenericSerialization(generic)) {
args = getGsonGenericArgs(args, method.getGenericParameterTypes());
} else if (ProtocolUtils.isJavaGenericSerialization(generic)) {
- Configuration configuration = ApplicationModel.getEnvironment().getConfiguration();
+ Configuration configuration = ApplicationModel.defaultModel().getEnvironment().getConfiguration();
if (!configuration.getBoolean(CommonConstants.ENABLE_NATIVE_JAVA_GENERIC_SERIALIZE, false)) {
String notice = "Trigger the safety barrier! " +
"Native Java Serializer is not allowed by default." +
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
index 7d9722b..756eec3 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
@@ -42,7 +42,7 @@ public class ProtocolSerializationWrapper implements Protocol {
@Override
public <T> Exporter<T> export(Invoker<T> invoker) throws RpcException {
- ApplicationModel.getServiceRepository().registerProviderUrl(invoker.getUrl());
+ ApplicationModel.defaultModel().getServiceRepository().registerProviderUrl(invoker.getUrl());
return protocol.export(invoker);
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java
index 6117b96..8c5738d 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java
@@ -57,7 +57,7 @@ public class InvokerInvocationHandler implements InvocationHandler {
String serviceKey = this.url.getServiceKey();
this.protocolServiceKey = this.url.getProtocolServiceKey();
if (serviceKey != null) {
- this.consumerModel = ApplicationModel.getConsumerModel(serviceKey);
+ this.consumerModel = ApplicationModel.defaultModel().getConsumerModel(serviceKey);
}
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java
index df5bdf3..1ba88b6 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java
@@ -368,7 +368,7 @@ public class RpcUtilsTest {
RpcInvocation inv = new RpcInvocation("testReturnType", serviceName, "", new Class<?>[] {String.class}, null, null, invoker, null);
Assertions.assertFalse(RpcUtils.isReturnTypeFuture(inv));
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
repository.registerService(demoServiceClass);
inv = new RpcInvocation("testReturnType4", serviceName, "", new Class<?>[] {String.class}, null, null, invoker, null);
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
index 6ef932d..8605e4e 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
@@ -129,7 +129,7 @@ class CallbackServiceCodec {
// one channel can have multiple callback instances, no need to re-export for different instance.
if (!channel.hasAttribute(cacheKey)) {
if (!isInstancesOverLimit(channel, url, clazz.getName(), instid, false)) {
- ApplicationModel.getServiceRepository().registerService(clazz);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(clazz);
Invoker<?> invoker = PROXY_FACTORY.getInvoker(inst, clazz, exportUrl);
// should destroy resource?
Exporter<?> exporter = PROTOCOL.export(invoker);
@@ -167,7 +167,7 @@ class CallbackServiceCodec {
URL referurl = URL.valueOf("callback://" + url.getAddress() + "/" + clazz.getName() + "?" + INTERFACE_KEY + "=" + clazz.getName());
referurl = referurl.addParametersIfAbsent(url.getParameters()).removeParameter(METHODS_KEY);
if (!isInstancesOverLimit(channel, referurl, clazz.getName(), instid, true)) {
- ApplicationModel.getServiceRepository().registerService(clazz);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(clazz);
@SuppressWarnings("rawtypes")
Invoker<?> invoker = new ChannelWrappedInvoker(clazz, channel, referurl, String.valueOf(instid));
proxy = PROXY_FACTORY.getProxy(invoker);
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
index 91ebb81..133732d 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
@@ -132,7 +132,7 @@ public class DecodeableRpcInvocation extends RpcInvocation implements Codec, Dec
// if (RpcUtils.isGenericCall(path, getMethodName()) || RpcUtils.isEcho(path, getMethodName())) {
// pts = ReflectUtils.desc2classArray(desc);
// } else {
- ServiceRepository repository = ApplicationModel.getServiceRepository();
+ ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
ServiceDescriptor serviceDescriptor = repository.lookupService(path);
if (serviceDescriptor != null) {
MethodDescriptor methodDescriptor = serviceDescriptor.getMethod(getMethodName(), desc);
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
index ad95481..65b74a0 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
@@ -192,7 +192,7 @@ public class FutureFilter implements ClusterFilter, ClusterFilter.Listener {
return asyncMethodInfo;
}
- ConsumerModel consumerModel = ApplicationModel.getConsumerModel(invoker.getUrl().getServiceKey());
+ ConsumerModel consumerModel = ApplicationModel.defaultModel().getConsumerModel(invoker.getUrl().getServiceKey());
if (consumerModel == null) {
return null;
}
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
index 4bc0800..84236f2 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ArgumentCallbackTest.java
@@ -59,14 +59,14 @@ public class ArgumentCallbackTest {
// export one service first, to test connection sharing
serviceURL = serviceURL.addParameter("connections", 1);
URL hellourl = serviceURL.setPath(IHelloService.class.getName());
- ApplicationModel.getServiceRepository().registerService(IDemoService.class);
- ApplicationModel.getServiceRepository().registerService(IHelloService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(IDemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(IHelloService.class);
hello_exporter = ProtocolUtils.export(new HelloServiceImpl(), IHelloService.class, hellourl);
exporter = ProtocolUtils.export(new DemoServiceImpl(), IDemoService.class, serviceURL);
}
void referService() {
- ApplicationModel.getServiceRepository().registerService(IDemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(IDemoService.class);
demoProxy = (IDemoService) ProtocolUtils.refer(IDemoService.class, consumerUrl);
}
@@ -96,7 +96,7 @@ public class ArgumentCallbackTest {
}
public void destroyService() {
- ApplicationModel.getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
demoProxy = null;
try {
if (exporter != null) exporter.unexport();
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
index e3141c8..a64f15a 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java
@@ -64,12 +64,12 @@ public class DubboProtocolTest {
@AfterAll
public static void after() {
ProtocolUtils.closeAll();
- ApplicationModel.getServiceRepository().unregisterService(DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().unregisterService(DemoService.class);
}
@BeforeAll
public static void setup() {
- ApplicationModel.getServiceRepository().registerService(DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(DemoService.class);
}
@Test
@@ -165,7 +165,7 @@ public class DubboProtocolTest {
RemoteService remote = new RemoteServiceImpl();
- ApplicationModel.getServiceRepository().registerService(RemoteService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(RemoteService.class);
int port = NetUtils.getAvailablePort();
protocol.export(proxy.getInvoker(remote, RemoteService.class, URL.valueOf("dubbo://127.0.0.1:" + port + "/" + RemoteService.class.getName())));
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java
index 113ae7b..6fa9351 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java
@@ -44,12 +44,12 @@ public class MultiThreadTest {
@AfterEach
public void after() {
ProtocolUtils.closeAll();
- ApplicationModel.getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
}
@Test
public void testDubboMultiThreadInvoke() throws Exception {
- ApplicationModel.getServiceRepository().registerService("TestService", DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService("TestService", DemoService.class);
int port = NetUtils.getAvailablePort();
Exporter<?> rpcExporter = protocol.export(proxy.getInvoker(new DemoServiceImpl(), DemoService.class, URL.valueOf("dubbo://127.0.0.1:" + port + "/TestService")));
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java
index 980d323..00ce04a 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java
@@ -45,7 +45,7 @@ public class RpcFilterTest {
DemoService service = new DemoServiceImpl();
int port = NetUtils.getAvailablePort();
URL url = URL.valueOf("dubbo://127.0.0.1:" + port + "/org.apache.dubbo.rpc.protocol.dubbo.support.DemoService?service.filter=echo");
- ApplicationModel.getServiceRepository().registerService(DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(DemoService.class);
protocol.export(proxy.getInvoker(service, DemoService.class, url));
service = proxy.getProxy(protocol.refer(DemoService.class, url));
Assertions.assertEquals("123", service.echo("123"));
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/decode/DubboTelnetDecodeTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/decode/DubboTelnetDecodeTest.java
index 3122865..209b243 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/decode/DubboTelnetDecodeTest.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/decode/DubboTelnetDecodeTest.java
@@ -69,13 +69,13 @@ public class DubboTelnetDecodeTest {
@BeforeAll
public static void setup() {
- ApplicationModel.getServiceRepository().destroy();
- ApplicationModel.getServiceRepository().registerService(DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().registerService(DemoService.class);
}
@AfterAll
public static void teardown() {
- ApplicationModel.getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
}
/**
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java
index 0b74b10..be002d7 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java
@@ -47,7 +47,7 @@ public class EnumBak {
);
DemoService demo = new DemoServiceImpl();
- ApplicationModel.getServiceRepository().registerService("test", DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService("test", DemoService.class);
Invoker<DemoService> invoker = proxy.getInvoker(demo, DemoService.class, serviceurl);
protocol.export(invoker);
@@ -93,7 +93,7 @@ public class EnumBak {
);
DemoService demo = new DemoServiceImpl();
- ApplicationModel.getServiceRepository().registerService("test", DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService("test", DemoService.class);
Invoker<DemoService> invoker = proxy.getInvoker(demo, DemoService.class, serviceurl);
protocol.export(invoker);
@@ -117,7 +117,7 @@ public class EnumBak {
URL consumerurl = URL.valueOf("dubbo://127.0.0.1:" + port + "/test?timeout=" + Integer.MAX_VALUE
);
- ApplicationModel.getServiceRepository().registerService(DemoService.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerService(DemoService.class);
Invoker<DemoService> reference = protocol.refer(DemoService.class, consumerurl);
DemoService demoProxy = (DemoService) proxy.getProxy(reference);
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java
index d1b1cda..2086c02 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java
@@ -153,7 +153,7 @@ public class GrpcOptionsUtils {
}
private static SslContext buildServerSslContext(URL url) {
- ConfigManager globalConfigManager = ApplicationModel.getConfigManager();
+ ConfigManager globalConfigManager = ApplicationModel.defaultModel().getConfigManager();
SslConfig sslConfig = globalConfigManager.getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
SslContextBuilder sslClientContextBuilder = null;
@@ -183,7 +183,7 @@ public class GrpcOptionsUtils {
}
private static SslContext buildClientSslContext(URL url) {
- ConfigManager globalConfigManager = ApplicationModel.getConfigManager();
+ ConfigManager globalConfigManager = ApplicationModel.defaultModel().getConfigManager();
SslConfig sslConfig = globalConfigManager.getSsl().orElseThrow(() -> new IllegalStateException("Ssl enabled, but no ssl cert information provided!"));
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
index 1342a17..db99fdb 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
@@ -72,7 +72,7 @@ public class GrpcProtocol extends AbstractProxyProtocol {
GrpcRemotingServer grpcServer = (GrpcRemotingServer) protocolServer.getRemotingServer();
- ServiceRepository serviceRepository = ApplicationModel.getServiceRepository();
+ ServiceRepository serviceRepository = ApplicationModel.defaultModel().getServiceRepository();
ProviderModel providerModel = serviceRepository.lookupExportedService(url.getServiceKey());
if (providerModel == null) {
throw new IllegalStateException("Service " + url.getServiceKey() + "should have already been stored in service repository, " +
@@ -123,7 +123,7 @@ public class GrpcProtocol extends AbstractProxyProtocol {
channel,
GrpcOptionsUtils.buildCallOptions(url),
url,
- ApplicationModel.getConsumerModel(url.getServiceKey()).getReferenceConfig()
+ ApplicationModel.defaultModel().getConsumerModel(url.getServiceKey()).getReferenceConfig()
);
final Invoker<T> target = proxyFactory.getInvoker(stub, type, url);
GrpcInvoker<T> grpcInvoker = new GrpcInvoker<>(type, url, target, channel);
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/test/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocolTest.java b/dubbo-rpc/dubbo-rpc-grpc/src/test/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocolTest.java
index ca4d6b1..1f9e614 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/test/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/test/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocolTest.java
@@ -49,8 +49,8 @@ public class GrpcProtocolTest {
URL url = URL.valueOf("grpc://127.0.0.1:" + availablePort + "/" + DubboGreeterGrpc.IGreeter.class.getName());
- ServiceDescriptor serviceDescriptor = ApplicationModel.getServiceRepository().registerService(DubboGreeterGrpc.IGreeter.class);
- ApplicationModel.getServiceRepository().registerProvider(
+ ServiceDescriptor serviceDescriptor = ApplicationModel.defaultModel().getServiceRepository().registerService(DubboGreeterGrpc.IGreeter.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerProvider(
url.getServiceKey(),
serviceImpl,
serviceDescriptor,
@@ -66,7 +66,7 @@ public class GrpcProtocolTest {
serviceMetadata.setServiceKey(URL.buildKey(DubboGreeterGrpc.IGreeter.class.getName(), null, null));
Map<String, AsyncMethodInfo> methodConfigs = new HashMap<>();
- ApplicationModel.getServiceRepository().registerConsumer(
+ ApplicationModel.defaultModel().getServiceRepository().registerConsumer(
url.getServiceKey(),
serviceDescriptor,
mockReferenceConfig,
@@ -81,7 +81,7 @@ public class GrpcProtocolTest {
Assertions.assertEquals("Hello World", hello.getMessage());
// resource recycle.
- ApplicationModel.getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
}
class MockReferenceConfig extends ReferenceConfigBase {
diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
index 7e22132..8db22f5 100644
--- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
@@ -94,7 +94,7 @@ public class RestProtocol extends AbstractProxyProtocol {
@Override
protected <T> Runnable doExport(T impl, Class<T> type, URL url) throws RpcException {
String addr = getAddr(url);
- Class implClass = ApplicationModel.getProviderModel(url.getServiceKey()).getServiceInstance().getClass();
+ Class implClass = ApplicationModel.defaultModel().getProviderModel(url.getServiceKey()).getServiceInstance().getClass();
RestProtocolServer server = (RestProtocolServer) serverMap.computeIfAbsent(addr, restServer -> {
RestProtocolServer s = serverFactory.createServer(url.getParameter(SERVER_KEY, DEFAULT_SERVER));
s.setAddress(url.getAddress());
diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
index 8004d38..6053101 100644
--- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
@@ -50,7 +50,7 @@ public class RestProtocolTest {
private ProxyFactory proxy = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
private final int availablePort = NetUtils.getAvailablePort();
private final URL exportUrl = URL.valueOf("rest://127.0.0.1:" + availablePort + "/rest?interface=org.apache.dubbo.rpc.protocol.rest.DemoService");
- private final ServiceRepository repository = ApplicationModel.getServiceRepository();
+ private final ServiceRepository repository = ApplicationModel.defaultModel().getServiceRepository();
@AfterEach
public void tearDown() {
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/AbstractServerStream.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/AbstractServerStream.java
index ce155ba..e3aecf2 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/AbstractServerStream.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/AbstractServerStream.java
@@ -86,7 +86,7 @@ public abstract class AbstractServerStream extends AbstractStream implements Str
}
private static ProviderModel lookupProviderModel(URL url) {
- ServiceRepository repo = ApplicationModel.getServiceRepository();
+ ServiceRepository repo = ApplicationModel.defaultModel().getServiceRepository();
final ProviderModel model = repo.lookupExportedService(url.getServiceKey());
if (model != null) {
ClassLoadUtil.switchContextLoader(model.getServiceInterfaceClass().getClassLoader());
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleClientHandler.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleClientHandler.java
index 3600143..be9bfd3 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleClientHandler.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleClientHandler.java
@@ -66,7 +66,7 @@ public class TripleClientHandler extends ChannelDuplexHandler {
private void writeRequest(ChannelHandlerContext ctx, final Request req, final ChannelPromise promise) {
final RpcInvocation inv = (RpcInvocation) req.getData();
final URL url = inv.getInvoker().getUrl();
- ServiceRepository repo = ApplicationModel.getServiceRepository();
+ ServiceRepository repo = ApplicationModel.defaultModel().getServiceRepository();
MethodDescriptor methodDescriptor = repo.lookupMethod(inv.getServiceName(), inv.getMethodName());
String serviceKey = url.getServiceKey();
// If it is InstanceAddressURL, the serviceKey may not be obtained.
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2FrameServerHandler.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2FrameServerHandler.java
index cbe37b6..64c1634 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2FrameServerHandler.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2FrameServerHandler.java
@@ -159,7 +159,7 @@ public class TripleHttp2FrameServerHandler extends ChannelDuplexHandler {
GrpcStatus.fromCode(Code.UNIMPLEMENTED).withDescription("Service not found:" + serviceName));
return;
}
- ServiceRepository repo = ApplicationModel.getServiceRepository();
+ ServiceRepository repo = ApplicationModel.defaultModel().getServiceRepository();
final ServiceDescriptor serviceDescriptor = repo.lookupService(invoker.getUrl().getServiceKey());
if (serviceDescriptor == null) {
responseErr(ctx,
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java b/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java
index 23d6d89..6e8d20c 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java
@@ -43,8 +43,8 @@ public class TripleProtocolTest {
URL url = URL.valueOf("tri://127.0.0.1:" + availablePort + "/" + IGreeter.class.getName());
- ServiceDescriptor serviceDescriptor = ApplicationModel.getServiceRepository().registerService(IGreeter.class);
- ApplicationModel.getServiceRepository().registerProvider(
+ ServiceDescriptor serviceDescriptor = ApplicationModel.defaultModel().getServiceRepository().registerService(IGreeter.class);
+ ApplicationModel.defaultModel().getServiceRepository().registerProvider(
url.getServiceKey(),
serviceImpl,
serviceDescriptor,
@@ -58,6 +58,6 @@ public class TripleProtocolTest {
Assertions.assertEquals("hello world", serviceImpl.echo("hello world"));
// resource recycle.
- ApplicationModel.getServiceRepository().destroy();
+ ApplicationModel.defaultModel().getServiceRepository().destroy();
}
}
diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboShutdownMetadata.java b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboShutdownMetadata.java
index 3bd6113..f255273 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboShutdownMetadata.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboShutdownMetadata.java
@@ -61,7 +61,7 @@ public class DubboShutdownMetadata extends AbstractDubboMetadata {
shutdownCountData.put("services", serviceBeansMap.size());
// Reference Beans
- Collection<ReferenceConfigBase<?>> references = ApplicationModel.getConfigManager().getReferences();
+ Collection<ReferenceConfigBase<?>> references = ApplicationModel.defaultModel().getConfigManager().getReferences();
for (ReferenceConfigBase<?> reference : references) {
reference.destroy();
}
diff --git a/dubbo-test/dubbo-test-spring/src/main/java/org/apache/dubbo/test/spring/SpringJavaConfigBeanTest.java b/dubbo-test/dubbo-test-spring/src/main/java/org/apache/dubbo/test/spring/SpringJavaConfigBeanTest.java
index 074baeb..608e0b3 100644
--- a/dubbo-test/dubbo-test-spring/src/main/java/org/apache/dubbo/test/spring/SpringJavaConfigBeanTest.java
+++ b/dubbo-test/dubbo-test-spring/src/main/java/org/apache/dubbo/test/spring/SpringJavaConfigBeanTest.java
@@ -83,7 +83,7 @@ public class SpringJavaConfigBeanTest {
try {
consumerContext.start();
- ConfigManager configManager = ApplicationModel.getConfigManager();
+ ConfigManager configManager = ApplicationModel.defaultModel().getConfigManager();
ApplicationConfig application = configManager.getApplication().get();
Assertions.assertEquals(false, application.getQosEnable());
Assertions.assertEquals("Tom", application.getOwner());