You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2023/04/13 12:34:29 UTC
[dubbo-samples] branch master updated: Change some legacy package usage (com.alibaba.dubbo) to the present one. (#810)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 71dedf4e Change some legacy package usage (com.alibaba.dubbo) to the present one. (#810)
71dedf4e is described below
commit 71dedf4e033141b059fffbac6ce5d53a057fd714
Author: Andy Cheung <mi...@msn.cn>
AuthorDate: Thu Apr 13 20:34:19 2023 +0800
Change some legacy package usage (com.alibaba.dubbo) to the present one. (#810)
* `com.alibaba.dubbo` -> `org.apache.dubbo`
* `com.alibaba.dubbo.rpc.RpcContext` -> `org.apache.dubbo.rpc.RpcContext`
* Revert namespace change of compatible sample.
* `@Reference` -> `@DubboReference`
* Revert `3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriGenericTest.java`.
---
.../org/apache/dubbo/samples/async/filter/AsyncPostprocessFilter.java | 4 ++--
.../java/org/apache/dubbo/samples/async/filter/LegacyBlockFilter.java | 4 ++--
.../org/apache/dubbo/samples/async/filter/LegacyListenableFilter.java | 4 ++--
.../src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java | 2 +-
.../java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java | 4 ++--
.../dubbo/samples/metrics/springboot/provider/DemoServiceImpl.java | 2 +-
.../java/org/apache/dubbo/samples/metrics/impl/DemoServiceImpl.java | 2 +-
.../src/main/java/org/apache/dubbo/samples/client/Application.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/AsyncPostprocessFilter.java b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/AsyncPostprocessFilter.java
index 6e8d2ec8..cfdfef19 100644
--- a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/AsyncPostprocessFilter.java
+++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/AsyncPostprocessFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.samples.async.filter;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.Filter;
@@ -25,11 +26,10 @@ import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.common.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Activate(group = {Constants.PROVIDER, Constants.CONSUMER})
+@Activate(group = {CommonConstants.PROVIDER, CommonConstants.CONSUMER})
public class AsyncPostprocessFilter implements Filter, Filter.Listener {
private static Logger logger = LoggerFactory.getLogger(AsyncPostprocessFilter.class);
diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyBlockFilter.java b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyBlockFilter.java
index f17c7362..eb4fbcfc 100644
--- a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyBlockFilter.java
+++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyBlockFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.samples.async.filter;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.Filter;
@@ -25,11 +26,10 @@ import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.common.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Activate(group = {Constants.PROVIDER, Constants.CONSUMER})
+@Activate(group = {CommonConstants.PROVIDER, CommonConstants.CONSUMER})
public class LegacyBlockFilter implements Filter {
private static Logger logger = LoggerFactory.getLogger(LegacyBlockFilter.class);
diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyListenableFilter.java b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyListenableFilter.java
index 5f5cfd35..0a41280a 100644
--- a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyListenableFilter.java
+++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async/filter/LegacyListenableFilter.java
@@ -26,11 +26,11 @@ import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.common.Constants;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Activate(group = {Constants.PROVIDER, Constants.CONSUMER})
+@Activate(group = {CommonConstants.PROVIDER, CommonConstants.CONSUMER})
public class LegacyListenableFilter extends ListenableFilter {
private static Logger logger = LoggerFactory.getLogger(LegacyListenableFilter.class);
diff --git a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java
index 2d43f82f..a569d672 100644
--- a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java
+++ b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java
@@ -18,7 +18,7 @@
*/
package org.apache.dubbo.samples.jetty;
-import com.alibaba.dubbo.container.Container;
+import org.apache.dubbo.container.Container;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.slf4j.Logger;
diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
index d530226e..bbbb8530 100644
--- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
+++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/test/java/org/apache/dubbo/samples/configcenter/DemoServiceIT.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.samples.configcenter;
-import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.samples.configcenter.api.DemoService;
@@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations = "classpath:spring/configcenter-consumer.xml")
@EnableDubbo
public class DemoServiceIT {
- @Reference(id = "demoService")
+ @DubboReference(id = "demoService")
private DemoService demoService;
@Test
diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/main/java/org/apache/dubbo/samples/metrics/springboot/provider/DemoServiceImpl.java b/4-governance/dubbo-samples-metrics-spring-boot/src/main/java/org/apache/dubbo/samples/metrics/springboot/provider/DemoServiceImpl.java
index 0c626ffe..4f9f575d 100644
--- a/4-governance/dubbo-samples-metrics-spring-boot/src/main/java/org/apache/dubbo/samples/metrics/springboot/provider/DemoServiceImpl.java
+++ b/4-governance/dubbo-samples-metrics-spring-boot/src/main/java/org/apache/dubbo/samples/metrics/springboot/provider/DemoServiceImpl.java
@@ -42,7 +42,7 @@ import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.samples.metrics.springboot.api.DemoService;
import org.apache.dubbo.samples.metrics.springboot.api.Result;
-import com.alibaba.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcContext;
@DubboService
public class DemoServiceImpl implements DemoService {
diff --git a/4-governance/dubbo-samples-metrics/src/main/java/org/apache/dubbo/samples/metrics/impl/DemoServiceImpl.java b/4-governance/dubbo-samples-metrics/src/main/java/org/apache/dubbo/samples/metrics/impl/DemoServiceImpl.java
index 810710d1..23d0b1c1 100644
--- a/4-governance/dubbo-samples-metrics/src/main/java/org/apache/dubbo/samples/metrics/impl/DemoServiceImpl.java
+++ b/4-governance/dubbo-samples-metrics/src/main/java/org/apache/dubbo/samples/metrics/impl/DemoServiceImpl.java
@@ -39,7 +39,7 @@ import org.apache.dubbo.samples.metrics.api.DemoService;
import org.apache.dubbo.samples.metrics.model.Result;
import org.apache.dubbo.samples.metrics.model.User;
-import com.alibaba.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcContext;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/4-governance/dubbo-samples-zipkin/src/main/java/org/apache/dubbo/samples/client/Application.java b/4-governance/dubbo-samples-zipkin/src/main/java/org/apache/dubbo/samples/client/Application.java
index 4aa05252..f8b2e383 100644
--- a/4-governance/dubbo-samples-zipkin/src/main/java/org/apache/dubbo/samples/client/Application.java
+++ b/4-governance/dubbo-samples-zipkin/src/main/java/org/apache/dubbo/samples/client/Application.java
@@ -19,9 +19,9 @@
package org.apache.dubbo.samples.client;
+import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.samples.api.GreetingService;
-import com.alibaba.dubbo.rpc.RpcContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.concurrent.Future;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org