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-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 99db1735c Update
dubbo-samples-serialization/dubbo-samples-serialization-java s… (#1078)
99db1735c is described below
commit 99db1735c195c560f5a65df99937f191ffe993cf
Author: fanlobu <[email protected]>
AuthorDate: Mon Mar 18 18:49:33 2024 +0800
Update dubbo-samples-serialization/dubbo-samples-serialization-java s…
(#1078)
---
.../case-versions.conf | 6 +-
.../pom.xml | 81 ++++++++++++
.../dubbo/samples/serialization/DubboConsumer.java | 16 +--
.../src/main/resources/application.yml | 22 ++++
.../src/test/java}/DemoServiceIT.java | 21 ++--
.../pom.xml} | 32 +++--
.../dubbo/samples/serialization}/DemoService.java | 2 +-
.../pom.xml | 76 +++++++++++
.../dubbo/samples/serialization/DubboProvider.java | 11 +-
.../samples/serialization/EmbeddedZooKeeper.java | 0
.../serialization/impl/DemoServiceImpl.java | 8 +-
.../src/main/resources/application.yml | 27 ++++
.../dubbo-samples-serialization-java/pom.xml | 140 ++++++---------------
.../main/resources/spring/dubbo-demo-consumer.xml | 32 -----
.../main/resources/spring/dubbo-demo-provider.xml | 37 ------
15 files changed, 297 insertions(+), 214 deletions(-)
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf
index f7373a530..1a3bfb38e 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf
@@ -20,6 +20,6 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [>= 8]
+dubbo.version= 3.3.*
+spring.version=6.*
+java.version= [>= 17]
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/pom.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/pom.xml
new file mode 100644
index 000000000..96e13da42
--- /dev/null
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>dubbo-samples-serialization-java</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dubbo.samples.serialization</groupId>
+ <artifactId>dubbo-samples-serialization-java-consumer</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo.samples.serialization</groupId>
+ <artifactId>dubbo-samples-serialization-java-interface</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
similarity index 67%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
index df7369bdd..886292c32 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/java/org/apache/dubbo/samples/serialization/DubboConsumer.java
@@ -16,19 +16,15 @@
*/
package org.apache.dubbo.samples.serialization;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import org.apache.dubbo.samples.serialization.api.DemoService;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
+@EnableDubbo
+@SpringBootApplication
public class DubboConsumer {
public static void main(String[] args) {
- ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext("spring/dubbo-demo-consumer.xml");
- context.start();
- DemoService demoService = context.getBean("demoService",
DemoService.class);
- String hello = demoService.sayHello("world");
- System.out.println(hello);
+ SpringApplication.run(DubboConsumer.class);
}
}
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/resources/application.yml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/resources/application.yml
new file mode 100644
index 000000000..e65bf3874
--- /dev/null
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/main/resources/application.yml
@@ -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.
+
+dubbo:
+ application:
+ name: serialization-java-consumer
+ qos-port: 33333
+ registry:
+ address: zookeeper://${zookeeper.address:127.0.0.1}:2181
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/test/java/org/apache/dubbo/samples/serialization/DemoServiceIT.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/test/java/DemoServiceIT.java
similarity index 67%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/test/java/org/apache/dubbo/samples/serialization/DemoServiceIT.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/test/java/DemoServiceIT.java
index 76270fdb7..bfdc43d79 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/test/java/org/apache/dubbo/samples/serialization/DemoServiceIT.java
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-consumer/src/test/java/DemoServiceIT.java
@@ -15,24 +15,21 @@
* limitations under the License.
*/
-package org.apache.dubbo.samples.serialization;
-
-
-import org.apache.dubbo.samples.serialization.api.DemoService;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.samples.serialization.DemoService;
+import org.apache.dubbo.samples.serialization.DubboConsumer;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath*:spring/dubbo-demo-consumer.xml")
+@SpringBootTest(classes = DubboConsumer.class)
+@RunWith(SpringRunner.class)
public class DemoServiceIT {
- @Autowired
- @Qualifier("demoService")
+ @DubboReference
private DemoService service;
@Test
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/log4j2.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/pom.xml
similarity index 51%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/log4j2.xml
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/pom.xml
index 69e1321d2..57ea715d1 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/log4j2.xml
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/pom.xml
@@ -15,15 +15,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%style{%d{HH:mm:ss.SSS}}{Magenta}
%style{|-}{White}%highlight{%-5p} [%t] %style{%40.40c}{Cyan}:%style{%-3L}{Blue}
%style{-|}{White}
%m%n%rEx{filters(jdk.internal.reflect,java.lang.reflect,sun.reflect)}"
disableAnsi="false" charset="UTF-8"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>dubbo-samples-serialization-java</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dubbo.samples.serialization</groupId>
+ <artifactId>dubbo-samples-serialization-java-interface</artifactId>
+
+ <properties>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+</project>
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/api/DemoService.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/src/main/java/org/apache/dubbo/samples/serialization/DemoService.java
similarity index 94%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/api/DemoService.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/src/main/java/org/apache/dubbo/samples/serialization/DemoService.java
index 1c880d4c7..27cbbb30e 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/api/DemoService.java
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-interface/src/main/java/org/apache/dubbo/samples/serialization/DemoService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.samples.serialization.api;
+package org.apache.dubbo.samples.serialization;
public interface DemoService {
String sayHello(String name);
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/pom.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/pom.xml
new file mode 100644
index 000000000..2af718c87
--- /dev/null
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>dubbo-samples-serialization-java</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dubbo.samples.serialization</groupId>
+ <artifactId>dubbo-samples-serialization-java-provider</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo.samples.serialization</groupId>
+ <artifactId>dubbo-samples-serialization-java-interface</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
similarity index 81%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
index 0a4ce0b86..593aa3c9f 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java
@@ -17,10 +17,13 @@
package org.apache.dubbo.samples.serialization;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-import java.util.concurrent.CountDownLatch;
+@EnableDubbo
+@SpringBootApplication
public class DubboProvider {
public static void main(String[] args) throws Exception {
@@ -30,10 +33,8 @@ public class DubboProvider {
new EmbeddedZooKeeper(2181, false).start();
- ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext("spring/dubbo-demo-provider.xml");
- context.start();
+ SpringApplication.run(DubboProvider.class);
System.out.println("dubbo service started");
- new CountDownLatch(1).await();
}
}
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/EmbeddedZooKeeper.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/EmbeddedZooKeeper.java
similarity index 100%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/EmbeddedZooKeeper.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/EmbeddedZooKeeper.java
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
similarity index 81%
rename from
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
rename to
3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
index 35677ff75..e41f659fd 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/java/org/apache/dubbo/samples/serialization/impl/DemoServiceImpl.java
@@ -17,18 +17,20 @@
package org.apache.dubbo.samples.serialization.impl;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.rpc.RpcContext;
-import org.apache.dubbo.samples.serialization.api.DemoService;
+import org.apache.dubbo.samples.serialization.DemoService;
import java.text.SimpleDateFormat;
import java.util.Date;
+@DubboService
public class DemoServiceImpl implements DemoService {
@Override
public String sayHello(String name) {
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new
Date()) + "] Hello " + name +
- ", request from consumer: " +
RpcContext.getContext().getRemoteAddress());
- return "Hello " + name + ", response from provider: " +
RpcContext.getContext().getLocalAddress();
+ ", request from consumer: " +
RpcContext.getServiceContext().getRemoteAddress());
+ return "Hello " + name + ", response from provider: " +
RpcContext.getServerContext().getLocalAddress();
}
}
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/resources/application.yml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/resources/application.yml
new file mode 100644
index 000000000..283cde4b7
--- /dev/null
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/dubbo-samples-serialization-java-provider/src/main/resources/application.yml
@@ -0,0 +1,27 @@
+# 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.
+
+dubbo:
+ application:
+ name: serialization-java-provider
+ protocol:
+ name: dubbo
+ port: -1
+ serialization: java
+ registry:
+ address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+ provider:
+ token: true
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml
index 70e1eb783..dc71407ec 100644
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml
+++
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml
@@ -20,6 +20,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <modules>
+ <module>dubbo-samples-serialization-java-consumer</module>
+ <module>dubbo-samples-serialization-java-interface</module>
+ <module>dubbo-samples-serialization-java-provider</module>
+ </modules>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -35,134 +41,70 @@
<description>Dubbo Samples Serialization Java</description>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dubbo.version>3.2.6</dubbo.version>
- <spring.version>4.3.30.RELEASE</spring.version>
- <log4j2.version>2.20.0</log4j2.version>
- <junit.version>4.13.1</junit.version>
+ <dubbo.version>3.3.0-beta.1</dubbo.version>
+ <spring-boot.version>3.2.3</spring-boot.version>
+ <junit5.version>5.10.1</junit5.version>
+ <junit.platform>1.9.3</junit.platform>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-bom</artifactId>
- <version>${dubbo.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <version>${dubbo.version}</version>
- <type>pom</type>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot.version}</version>
<exclusions>
<exclusion>
- <artifactId>logback-classic</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logback-core</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Embedded Zookeeper Server Dependencies -->
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.1.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.1.10.5</version>
- </dependency>
</dependencies>
- <profiles>
- <!-- For jdk 11 above JavaEE annotation -->
- <profile>
- <id>javax.annotation</id>
- <activation>
- <jdk>[1.11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-consumer.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-consumer.xml
deleted file mode 100644
index c76d6e9e2..000000000
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-consumer.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:dubbo="http://dubbo.apache.org/schema/dubbo";
- xmlns="http://www.springframework.org/schema/beans";
xmlns:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo
http://dubbo.apache.org/schema/dubbo/dubbo.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <context:property-placeholder/>
-
- <dubbo:application name="serialization-java-consumer"/>
-
- <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
-
- <dubbo:reference id="demoService" check="true"
interface="org.apache.dubbo.samples.serialization.api.DemoService"/>
-
-</beans>
diff --git
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-provider.xml
b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-provider.xml
deleted file mode 100644
index 9792fbd95..000000000
---
a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/resources/spring/dubbo-demo-provider.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:dubbo="http://dubbo.apache.org/schema/dubbo";
- xmlns="http://www.springframework.org/schema/beans";
xmlns:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo
http://dubbo.apache.org/schema/dubbo/dubbo.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <context:property-placeholder/>
-
- <dubbo:application name="demo-provider"/>
-
- <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
-
- <dubbo:provider token="true"/>
-
- <bean id="demoService"
class="org.apache.dubbo.samples.serialization.impl.DemoServiceImpl"/>
-
- <dubbo:service
interface="org.apache.dubbo.samples.serialization.api.DemoService"
ref="demoService"
- serialization="java"/>
-
-</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
