You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/10/29 11:06:39 UTC
[dubbo] branch master updated: Refactor ServiceConfig package
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 3b4b67b Refactor ServiceConfig package
3b4b67b is described below
commit 3b4b67b61af25b176106bd71dd4a70e850142a1d
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Oct 29 19:05:49 2019 +0800
Refactor ServiceConfig package
---
.../org/apache/dubbo/bootstrap/BootstrapUtils.java | 4 +--
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 4 +--
.../dubbo/bootstrap/ReferenceConfigCache.java | 2 +-
.../dubbo/bootstrap/builders/ReferenceBuilder.java | 2 +-
.../dubbo/bootstrap/builders/ServiceBuilder.java | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 4 +--
.../org/apache/dubbo/config/ServiceConfig.java | 4 +--
.../event/ReferenceConfigDestroyedEvent.java | 2 +-
.../event/ReferenceConfigInitializedEvent.java | 2 +-
.../config/event/ServiceConfigExportedEvent.java | 2 +-
.../config/event/ServiceConfigUnexportedEvent.java | 2 +-
.../event/listener/ServiceNameMappingListener.java | 2 +-
.../invoker/DelegateProviderMetaDataInvoker.java | 2 +-
.../ConfigurableMetadataServiceExporter.java | 2 +-
.../bootstrap/DubboServiceProviderBootstrap.java | 2 +-
.../EtcdDubboServiceProviderBootstrap.java | 2 +-
.../apache/dubbo/config/spring/ReferenceBean.java | 2 +-
.../apache/dubbo/config/spring/ServiceBean.java | 2 +-
.../spring/schema/DubboBeanDefinitionParser.java | 2 +-
.../src/main/resources/META-INF/compat/dubbo.xsd | 4 +--
.../src/main/resources/META-INF/dubbo.xsd | 8 +++---
.../org/apache/dubbo/config/spring/ConfigTest.java | 4 +--
.../dubbo/config/AbstractReferenceConfig.java | 2 +-
.../dubbo/config/AppendParametersComponent.java | 4 +--
.../org/apache/dubbo/config/ProviderConfig.java | 2 +-
.../apache/dubbo/config/context/ConfigManager.java | 4 +--
.../config/{inner => service}/ReferenceConfig.java | 2 +-
.../config/{inner => service}/ServiceConfig.java | 2 +-
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 2 +-
.../org/apache/dubbo/rpc/model/ProviderModel.java | 2 +-
.../apache/dubbo/rpc/model/ServiceRepository.java | 4 +--
.../com/alibaba/dubbo/config/ReferenceConfig.java | 2 +-
.../com/alibaba/dubbo/config/ServiceConfig.java | 2 +-
.../apollo/ApolloDynamicConfigurationTest.java | 29 +++++++++++-----------
.../apache/dubbo/demo/consumer/Application.java | 2 +-
.../apache/dubbo/demo/provider/Application.java | 2 +-
.../apache/dubbo/demo/provider/Application.java | 2 +-
.../dubbo/qos/command/util/ServiceCheckUtils.java | 4 +--
.../legacy/service/generic/GenericServiceTest.java | 4 +--
.../transport/grizzly/GrizzlyTransporterTest.java | 4 +--
.../dubbo/rpc/protocol/rest/DemoServiceImpl.java | 4 +--
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 6 ++---
42 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/BootstrapUtils.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/BootstrapUtils.java
index 7bdb256..0f51c02 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/BootstrapUtils.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/BootstrapUtils.java
@@ -38,8 +38,8 @@ import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.SslConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.monitor.MonitorFactory;
import org.apache.dubbo.monitor.MonitorService;
import org.apache.dubbo.registry.RegistryService;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
index df46e3d..a9c31f3 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
@@ -57,10 +57,10 @@ import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.event.ServiceConfigExportedEvent;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
import org.apache.dubbo.config.invoker.DelegateProviderMetaDataInvoker;
import org.apache.dubbo.config.metadata.ConfigurableMetadataServiceExporter;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.event.EventDispatcher;
import org.apache.dubbo.event.EventListener;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
index 024a1c7..c509570 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
@@ -30,7 +30,7 @@ import org.apache.dubbo.common.utils.UrlUtils;
import org.apache.dubbo.config.AbstractConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.event.ReferenceConfigDestroyedEvent;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.event.EventDispatcher;
import org.apache.dubbo.metadata.WritableMetadataService;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ReferenceBuilder.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ReferenceBuilder.java
index bf91a5b..72a1e83 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ReferenceBuilder.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ReferenceBuilder.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.bootstrap.builders;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.MethodConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import java.util.ArrayList;
import java.util.List;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ServiceBuilder.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ServiceBuilder.java
index 9be6f23..b94a49f 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ServiceBuilder.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/builders/ServiceBuilder.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.bootstrap.builders;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ProviderConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import java.util.ArrayList;
import java.util.List;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index a45ee7d..047f8a4 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -20,10 +20,10 @@ import org.apache.dubbo.bootstrap.DubboBootstrap;
/**
* Please avoid using this class for any new application,
- * use {@link org.apache.dubbo.config.inner.ReferenceConfig} instead.
+ * use {@link org.apache.dubbo.config.service.ReferenceConfig} instead.
*/
@Deprecated
-public class ReferenceConfig<T> extends org.apache.dubbo.config.inner.ReferenceConfig<T> {
+public class ReferenceConfig<T> extends org.apache.dubbo.config.service.ReferenceConfig<T> {
public synchronized T get() {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 31e9fc7..29cb5a3 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -20,10 +20,10 @@ import org.apache.dubbo.bootstrap.DubboBootstrap;
/**
* Please avoid using this class for any new application,
- * use {@link org.apache.dubbo.config.inner.ServiceConfig} instead.
+ * use {@link org.apache.dubbo.config.service.ServiceConfig} instead.
*/
@Deprecated
-public class ServiceConfig<T> extends org.apache.dubbo.config.inner.ServiceConfig<T> {
+public class ServiceConfig<T> extends org.apache.dubbo.config.service.ServiceConfig<T> {
@Deprecated
public void export() {
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java
index 226325d..da7ada6 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.config.event;
import org.apache.dubbo.config.annotation.Reference;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.event.Event;
/**
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java
index 71bc149..97b4d11 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.config.event;
import org.apache.dubbo.config.annotation.Reference;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.rpc.Invoker;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java
index 1a9344c..65ad527 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.config.event;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.event.Event;
/**
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java
index e94d0b2a..2a84a17 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.config.event;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.event.Event;
/**
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java
index 41ef470..1c16b19 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.config.event.listener;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.event.ServiceConfigExportedEvent;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.event.EventListener;
import org.apache.dubbo.metadata.ServiceNameMapping;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java
index 7f63bc0..a4be1e3 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.config.invoker;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index e97c1d2..9b9928d 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -24,7 +24,7 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.context.ConfigManager;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.metadata.MetadataService;
import org.apache.dubbo.metadata.MetadataServiceExporter;
import org.apache.dubbo.rpc.Exporter;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
index 81f37b6..596f214 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import java.util.Arrays;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java
index 02b0f95..68e8c5a 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-api/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.bootstrap.rest.UserServiceImpl;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import java.util.Arrays;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
index f1ea239..08b00cf 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.config.spring;
import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.config.annotation.Reference;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
import org.apache.dubbo.config.support.Parameter;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
index 8b52486..5bebf4f 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.config.spring;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.annotation.Service;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 8974b46..3e7f0ab8 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -26,7 +26,7 @@ import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.beans.factory.annotation.DubboConfigAliasPostProcessor;
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/compat/dubbo.xsd
index cdec241..d81993b 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/compat/dubbo.xsd
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/compat/dubbo.xsd
@@ -1474,7 +1474,7 @@
<xsd:documentation><![CDATA[ Export service config ]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation>
- <tool:exports type="org.apache.dubbo.config.inner.ServiceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ServiceConfig"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1485,7 +1485,7 @@
<xsd:documentation><![CDATA[ Reference service config ]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation>
- <tool:exports type="org.apache.dubbo.config.inner.ReferenceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ReferenceConfig"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/dubbo.xsd
index 5936fed..c01e449 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/resources/META-INF/dubbo.xsd
@@ -1388,8 +1388,8 @@
<xsd:documentation><![CDATA[ The annotation config ]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation>
- <tool:exports type="org.apache.dubbo.config.inner.ServiceConfig"/>
- <tool:exports type="org.apache.dubbo.config.inner.ReferenceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ServiceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ReferenceConfig"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1499,7 +1499,7 @@
<xsd:documentation><![CDATA[ Export service config ]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation>
- <tool:exports type="org.apache.dubbo.config.inner.ServiceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ServiceConfig"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1510,7 +1510,7 @@
<xsd:documentation><![CDATA[ Reference service config ]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation>
- <tool:exports type="org.apache.dubbo.config.inner.ReferenceConfig"/>
+ <tool:exports type="org.apache.dubbo.config.service.ReferenceConfig"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
diff --git a/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java b/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index 813b93b..27643a5 100644
--- a/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++ b/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -26,8 +26,8 @@ import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.config.spring.action.DemoActionByAnnotation;
import org.apache.dubbo.config.spring.action.DemoActionBySetter;
import org.apache.dubbo.config.spring.annotation.consumer.AnnotationAction;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
index 4f1b430..ebdd1ac 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.config;
import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.config.support.Parameter;
import org.apache.dubbo.rpc.support.ProtocolUtils;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AppendParametersComponent.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AppendParametersComponent.java
index 31f9fb1..77a9473 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AppendParametersComponent.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AppendParametersComponent.java
@@ -17,8 +17,8 @@
package org.apache.dubbo.config;
import org.apache.dubbo.common.extension.SPI;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
/**
* Dynamically add some parameters / check config
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java
index e2a14d7..8954bcd 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.config;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.config.support.Parameter;
import java.util.ArrayList;
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 2af2dfd..5a4e2bf 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
@@ -32,8 +32,8 @@ import org.apache.dubbo.config.MonitorConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
import java.util.Collection;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/inner/ReferenceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfig.java
similarity index 99%
rename from dubbo-common/src/main/java/org/apache/dubbo/config/inner/ReferenceConfig.java
rename to dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfig.java
index d5cf7aa..e624a2b 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/inner/ReferenceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.config.inner;
+package org.apache.dubbo.config.service;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/inner/ServiceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfig.java
similarity index 99%
rename from dubbo-common/src/main/java/org/apache/dubbo/config/inner/ServiceConfig.java
rename to dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfig.java
index 00c53fb..76a2a55 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/inner/ServiceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.config.inner;
+package org.apache.dubbo.config.service;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
index 8153cce..d6be59b 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.CollectionUtils;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
index f8523d0..eff7f26 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
index 113949c..19ae0d7 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.context.FrameworkExt;
import org.apache.dubbo.common.context.LifecycleAdapter;
import org.apache.dubbo.common.utils.CollectionUtils;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index 7d2753b..5d3e9da 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -20,7 +20,7 @@ package com.alibaba.dubbo.config;
import org.apache.dubbo.config.annotation.Reference;
@Deprecated
-public class ReferenceConfig<T> extends org.apache.dubbo.config.inner.ReferenceConfig<T> {
+public class ReferenceConfig<T> extends org.apache.dubbo.config.service.ReferenceConfig<T> {
public ReferenceConfig() {
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index 88d1ecd..1c944c3 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -20,7 +20,7 @@ package com.alibaba.dubbo.config;
import org.apache.dubbo.config.annotation.Service;
@Deprecated
-public class ServiceConfig<T> extends org.apache.dubbo.config.inner.ServiceConfig<T> {
+public class ServiceConfig<T> extends org.apache.dubbo.config.service.ServiceConfig<T> {
public ServiceConfig() {
}
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
index c004899..ee28629 100644
--- a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.dubbo.configcenter.support.apollo;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
+import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
import com.ctrip.framework.apollo.mockserver.EmbeddedApollo;
import com.google.common.util.concurrent.SettableFuture;
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.configcenter.ConfigChangeType;
-import org.apache.dubbo.configcenter.ConfigurationListener;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
@@ -72,10 +73,10 @@ public class ApolloDynamicConfigurationTest {
String mockValue = String.valueOf(new Random().nextInt());
putMockRuleData(mockKey, mockValue, DEFAULT_NAMESPACE);
apolloDynamicConfiguration = new ApolloDynamicConfiguration(url);
- assertEquals(mockValue, apolloDynamicConfiguration.getRule(mockKey, DEFAULT_NAMESPACE, 3000L));
+ assertEquals(mockValue, apolloDynamicConfiguration.getConfig(mockKey, DEFAULT_NAMESPACE, 3000L));
mockKey = "notExistKey";
- assertNull(apolloDynamicConfiguration.getRule(mockKey, DEFAULT_NAMESPACE, 3000L));
+ assertNull(apolloDynamicConfiguration.getConfig(mockKey, DEFAULT_NAMESPACE, 3000L));
}
/**
@@ -110,20 +111,20 @@ public class ApolloDynamicConfigurationTest {
String mockKey = "mockKey3";
String mockValue = String.valueOf(new Random().nextInt());
- final SettableFuture<org.apache.dubbo.configcenter.ConfigChangeEvent> future = SettableFuture.create();
+ final SettableFuture<org.apache.dubbo.common.config.configcenter.ConfigChangedEvent> future = SettableFuture.create();
apolloDynamicConfiguration = new ApolloDynamicConfiguration(url);
apolloDynamicConfiguration.addListener(mockKey, DEFAULT_NAMESPACE, new ConfigurationListener() {
@Override
- public void process(org.apache.dubbo.configcenter.ConfigChangeEvent event) {
+ public void process(org.apache.dubbo.common.config.configcenter.ConfigChangedEvent event) {
future.set(event);
}
});
putData(mockKey, mockValue);
- org.apache.dubbo.configcenter.ConfigChangeEvent result = future.get(3000, TimeUnit.MILLISECONDS);
- assertEquals(mockValue, result.getValue());
+ org.apache.dubbo.common.config.configcenter.ConfigChangedEvent result = future.get(3000, TimeUnit.MILLISECONDS);
+ assertEquals(mockValue, result.getContent());
assertEquals(mockKey, result.getKey());
assertEquals(ConfigChangeType.MODIFIED, result.getChangeType());
}
diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
index 8e87bbf..7e1de6e 100644
--- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
+++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.bootstrap.DubboBootstrap;
import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.demo.DemoService;
public class Application {
diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
index bd293ee..f872f5f 100644
--- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
+++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
@@ -21,7 +21,7 @@ package org.apache.dubbo.demo.provider;
import org.apache.dubbo.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.demo.DemoService;
public class Application {
diff --git a/dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java b/dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
index bcfa07d..ec164ac 100644
--- a/dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
+++ b/dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.demo.provider.rest.UserService;
import org.apache.dubbo.demo.provider.rest.UserServiceImpl;
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java
index d9b9618..a2acd86 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java
@@ -21,8 +21,8 @@ import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.support.AbstractRegistry;
import org.apache.dubbo.rpc.model.ConsumerModel;
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
index 98d534d..67fd22b 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
@@ -29,8 +29,8 @@ import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.inner.ReferenceConfig;
-import org.apache.dubbo.config.inner.ServiceConfig;
+import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/test/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java b/dubbo-remoting/dubbo-remoting-grizzly/src/test/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java
index b0468c3..8244529 100644
--- a/dubbo-remoting/dubbo-remoting-grizzly/src/test/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java
+++ b/dubbo-remoting/dubbo-remoting-grizzly/src/test/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.remoting.transport.grizzly;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
-import org.apache.dubbo.remoting.Server;
+import org.apache.dubbo.remoting.RemotingServer;
import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter;
import org.junit.jupiter.api.Test;
@@ -34,7 +34,7 @@ public class GrizzlyTransporterTest {
URL url = new URL("http", "localhost", port,
new String[]{BIND_PORT_KEY, String.valueOf(port)});
- Server server = new GrizzlyTransporter().bind(url, new ChannelHandlerAdapter());
+ RemotingServer server = new GrizzlyTransporter().bind(url, new ChannelHandlerAdapter());
assertThat(server.isBound(), is(true));
}
diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoServiceImpl.java
index 3b7b876..aee092d 100644
--- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoServiceImpl.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoServiceImpl.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.rpc.RpcContext;
import java.util.Map;
public class DemoServiceImpl implements DemoService {
- private static Map<String, String> context;
+ private static Map<String, Object> context;
private boolean called;
public String sayHello(String name) {
@@ -46,7 +46,7 @@ public class DemoServiceImpl implements DemoService {
throw new RuntimeException();
}
- public static Map<String, String> getAttachments() {
+ public static Map<String, Object> getAttachments() {
return context;
}
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 f56beb1..4567c19 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
@@ -224,7 +224,7 @@ public class RestProtocolTest {
assertThat(result, is(3));
- Map<String, String> attachment = DemoServiceImpl.getAttachments();
+ Map<String, Object> attachment = DemoServiceImpl.getAttachments();
assertThat(attachment.get("key1"), nullValue());
assertThat(attachment.get("key2"), equalTo("value"));
assertThat(attachment.get("key3"), equalTo("=value"));
@@ -255,8 +255,8 @@ public class RestProtocolTest {
public void testRemoteApplicationName() {
URL url = URL.valueOf("rest://127.0.0.1:5342/rest/say?version=1.0.0&interface=org.apache.dubbo.rpc.protocol.rest.DemoService").addParameter("application","consumer");
DemoServiceImpl server = new DemoServiceImpl();
- ProviderModel providerModel = new ProviderModel(url.getPathKey(), server, DemoService.class);
- ApplicationModel.initProviderModel(url.getPathKey(), providerModel);
+
+ this.registerProvider(url, server, DemoService.class);
Exporter<DemoService> exporter = protocol.export(proxy.getInvoker(server, DemoService.class, url));
Invoker<DemoService> invoker = protocol.refer(DemoService.class, url);