You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by il...@apache.org on 2019/03/26 06:55:08 UTC
[incubator-dubbo-samples] branch master updated: clean up
dubbo-samples-stub samples
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 89aecc7 clean up dubbo-samples-stub samples
89aecc7 is described below
commit 89aecc75a9e56985a8d1b7b8ad6331b8b0befa79
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Tue Mar 26 14:54:36 2019 +0800
clean up dubbo-samples-stub samples
---
dubbo-samples-stub/pom.xml | 159 ++-------------------
.../apache/dubbo/samples/stub/StubConsumer.java | 9 +-
.../apache/dubbo/samples/stub/StubProvider.java | 6 +-
.../apache/dubbo/samples/stub/api/DemoService.java | 2 +-
.../dubbo/samples/stub/impl/DemoServiceImpl.java | 2 +-
.../dubbo/samples/stub/impl/DemoServiceStub.java | 15 +-
.../src/main/resources/spring/stub-consumer.xml | 4 +-
.../src/main/resources/spring/stub-provider.xml | 6 +-
8 files changed, 35 insertions(+), 168 deletions(-)
diff --git a/dubbo-samples-stub/pom.xml b/dubbo-samples-stub/pom.xml
index e8b4553..88b498d 100644
--- a/dubbo-samples-stub/pom.xml
+++ b/dubbo-samples-stub/pom.xml
@@ -30,182 +30,46 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
- <spring.version>4.3.16.RELEASE</spring.version>
- <dubbo.version>2.7.0</dubbo.version>
- <dubbo.rpc.version>2.7.0</dubbo.rpc.version>
- <zookeeper.version>3.4.13</zookeeper.version>
- <curator.version>4.0.1</curator.version>
- <validation-api.version>1.1.0.Final</validation-api.version>
- <hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
- <resteasy.version>3.0.19.Final</resteasy.version>
- <curator-client.version>4.0.1</curator-client.version>
- <swagger.version>1.5.19</swagger.version>
- <tomcat.version>7.0.88</tomcat.version>
- <servlet.version>3.0.1</servlet.version>
+ <dubbo.version>2.7.1-SNAPSHOT</dubbo.version>
+ <slf4j-log4j12.version>1.7.25</slf4j-log4j12.version>
<maven_checkstyle_version>3.0.0</maven_checkstyle_version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
- <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.16.Final</version>
- </dependency>
- <dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-bom</artifactId>
+ <artifactId>dubbo-dependencies-bom</artifactId>
<version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo</artifactId>
- <version>${dubbo.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-rest</artifactId>
- <version>${dubbo.rpc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${validation-api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- <version>${curator-client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <!-- swagger -->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
- <version>${swagger.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-configcenter-zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12.version}</version>
</dependency>
</dependencies>
-
-
<build>
<pluginManagement>
<plugins>
@@ -304,7 +168,8 @@
<phase>validate</phase>
<configuration>
<configLocation>../codestyle/checkstyle.xml</configLocation>
- <suppressionsLocation>../codestyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsLocation>../codestyle/checkstyle-suppressions.xml
+ </suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
diff --git a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubConsumer.java b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubConsumer.java
index 90326ae..2040ce3 100644
--- a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubConsumer.java
+++ b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubConsumer.java
@@ -26,12 +26,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class StubConsumer {
public static void main(String[] args) {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
- new String[] {"spring/stub-consumer.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/stub-consumer.xml");
context.start();
- DemoService demoService = (DemoService)context.getBean("demoService"); // get remote service proxy
- demoService.sayHello("aaa");
-
-
+ DemoService demoService = (DemoService) context.getBean("demoService");
+ demoService.sayHello("dubbo");
}
}
diff --git a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubProvider.java b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubProvider.java
index 31f4435..ea25c99 100644
--- a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubProvider.java
+++ b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/StubProvider.java
@@ -25,9 +25,9 @@ public class StubProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/stub-provider.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/stub-provider.xml");
context.start();
-
- System.in.read(); // press any key to exit
+ // press any key to exit
+ System.in.read();
}
}
diff --git a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/api/DemoService.java b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/api/DemoService.java
index b0edd19..d36a800 100644
--- a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/api/DemoService.java
+++ b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/api/DemoService.java
@@ -21,5 +21,5 @@ package org.apache.dubbo.samples.stub.api;
public interface DemoService {
- public String sayHello(String name);
+ String sayHello(String name);
}
diff --git a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceImpl.java b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceImpl.java
index b952743..412af05 100644
--- a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceImpl.java
+++ b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceImpl.java
@@ -25,6 +25,6 @@ public class DemoServiceImpl implements DemoService {
@Override
public String sayHello(String name) {
- return null;
+ return "greeting " + name;
}
}
diff --git a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceStub.java b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceStub.java
index 490ecf5..7860d0e 100644
--- a/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceStub.java
+++ b/dubbo-samples-stub/src/main/java/org/apache/dubbo/samples/stub/impl/DemoServiceStub.java
@@ -21,7 +21,12 @@ package org.apache.dubbo.samples.stub.impl;
import org.apache.dubbo.samples.stub.api.DemoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
public class DemoServiceStub implements DemoService {
+ private static Logger logger = LoggerFactory.getLogger(DemoServiceStub.class);
private final DemoService demoService;
@@ -31,13 +36,13 @@ public class DemoServiceStub implements DemoService {
@Override
public String sayHello(String name) {
- //client check code goes here
- System.out.println("stub sayHello");
-
+ logger.info("before execute remote service, parameter: " + name);
try {
- return demoService.sayHello(name);
+ String result = demoService.sayHello(name);
+ logger.info("after execute remote service, result: " + result);
+ return result;
} catch (Exception e) {
- //handle Exception
+ logger.warn("fail to execute service", e);
return null;
}
}
diff --git a/dubbo-samples-stub/src/main/resources/spring/stub-consumer.xml b/dubbo-samples-stub/src/main/resources/spring/stub-consumer.xml
index 7bac1da..deeb54c 100644
--- a/dubbo-samples-stub/src/main/resources/spring/stub-consumer.xml
+++ b/dubbo-samples-stub/src/main/resources/spring/stub-consumer.xml
@@ -26,7 +26,7 @@
<!-- consumer's application name, used for tracing dependency relationship (not a matching criterion),
don't set it same as provider -->
- <dubbo:application name="demo-consumer"/>
+ <dubbo:application name="stub-demo-consumer"/>
<!-- use multicast registry center to discover service -->
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
@@ -35,4 +35,4 @@
local regular interface -->
<dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.stub.api.DemoService"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-stub/src/main/resources/spring/stub-provider.xml b/dubbo-samples-stub/src/main/resources/spring/stub-provider.xml
index c47aec7..80389fb 100644
--- a/dubbo-samples-stub/src/main/resources/spring/stub-provider.xml
+++ b/dubbo-samples-stub/src/main/resources/spring/stub-provider.xml
@@ -25,7 +25,7 @@
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
<!-- provider's application name, used for tracing dependency relationship -->
- <dubbo:application name="demo-provider"/>
+ <dubbo:application name="stub-demo-provider"/>
<!-- use multicast registry center to export service -->
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
@@ -37,6 +37,6 @@
<bean id="demoService" class="org.apache.dubbo.samples.stub.impl.DemoServiceImpl"/>
<!-- declare the service interface to be exported -->
- <dubbo:service interface="org.apache.dubbo.samples.stub.api.DemoService" ref="demoService" stub="org.apache.dubbo.samples.stub.impl.DemoServiceStub"/>
+ <dubbo:service interface="org.apache.dubbo.samples.stub.api.DemoService" ref="demoService" stub="true"/>
-</beans>
\ No newline at end of file
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org