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/21 07:32:33 UTC
[incubator-dubbo-samples] branch master updated: clean up mock
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 8881306 clean up mock samples
new 21347e1 Merge branch 'master' of https://github.com/apache/incubator-dubbo-samples
8881306 is described below
commit 8881306b89c76e44bb9f07bb8e1c9003691a86ae
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Thu Mar 21 15:32:05 2019 +0800
clean up mock samples
---
dubbo-samples-mock/pom.xml | 159 +--------------------
.../apache/dubbo/samples/mock/MockConsumer.java | 8 +-
.../apache/dubbo/samples/mock/MockProvider.java | 7 +-
.../dubbo/samples/mock/api/DemoServiceMock.java | 4 +-
.../dubbo/samples/mock/impl/DemoServiceImpl.java | 3 +-
.../mock/{ZKTools.java => zk/Configurator.java} | 37 +++--
.../samples/mock/{ => zk}/EmbeddedZooKeeper.java | 4 +-
.../src/main/resources/spring/mock-consumer.xml | 7 +-
.../src/main/resources/spring/mock-provider.xml | 6 +-
9 files changed, 44 insertions(+), 191 deletions(-)
diff --git a/dubbo-samples-mock/pom.xml b/dubbo-samples-mock/pom.xml
index fbc2be4..1a94bab 100644
--- a/dubbo-samples-mock/pom.xml
+++ b/dubbo-samples-mock/pom.xml
@@ -29,182 +29,33 @@
<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>
<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>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.20</version>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
</dependencies>
diff --git a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockConsumer.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockConsumer.java
index ff70dae..a75e79e 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockConsumer.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockConsumer.java
@@ -24,10 +24,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MockConsumer {
public static void main(String[] args) {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/mock-consumer.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/mock-consumer.xml");
context.start();
- DemoService demoService = (DemoService) context.getBean("demoService"); // get remote service proxy
- String hello = demoService.sayHello("world"); // call remote method
- System.out.println(hello); // get result
+ DemoService demoService = context.getBean("demoService", DemoService.class);
+ String hello = demoService.sayHello("world");
+ System.out.println(hello);
}
}
diff --git a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockProvider.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockProvider.java
index 1b4e73c..f77fc04 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockProvider.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/MockProvider.java
@@ -17,15 +17,18 @@
package org.apache.dubbo.samples.mock;
+import org.apache.dubbo.samples.mock.zk.EmbeddedZooKeeper;
+
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MockProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/mock-provider.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/mock-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-mock/src/main/java/org/apache/dubbo/samples/mock/api/DemoServiceMock.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/api/DemoServiceMock.java
index 3fa5ee3..3681249 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/api/DemoServiceMock.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/api/DemoServiceMock.java
@@ -17,10 +17,10 @@
package org.apache.dubbo.samples.mock.api;
-public class DemoServiceMock implements DemoService{
+public class DemoServiceMock implements DemoService {
public String sayHello(String name) {
- System.out.println("local mock Impl");
+ System.err.println("about to execute the local mock impl");
return "mock " + name;
}
}
diff --git a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/impl/DemoServiceImpl.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/impl/DemoServiceImpl.java
index 430def4..a516c7c 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/impl/DemoServiceImpl.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/impl/DemoServiceImpl.java
@@ -23,7 +23,8 @@ public class DemoServiceImpl implements DemoService {
public String sayHello(String name) {
try {
- Thread.sleep(5000); // sleep 5 seconds throws TimeoutException, and mock Impl will be called
+ // sleeping 5 seconds leads to TimeoutException on client side, and mock impl will be invoked
+ Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/ZKTools.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/Configurator.java
similarity index 63%
rename from dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/ZKTools.java
rename to dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/Configurator.java
index 448d1c3..a14c281 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/ZKTools.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/Configurator.java
@@ -14,29 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.samples.mock;
-
-import org.apache.dubbo.common.utils.StringUtils;
+package org.apache.dubbo.samples.mock.zk;
import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
-/**
- *
- */
-public class ZKTools {
+import static org.apache.curator.framework.CuratorFrameworkFactory.newClient;
+
+public class Configurator {
private static CuratorFramework client;
- public static void main(String[] args) throws Exception {
- client = CuratorFrameworkFactory.newClient("127.0.0.1:2181", 60 * 1000, 60 * 1000, new ExponentialBackoffRetry(6000, 3));
+ public static void main(String[] args) {
+ client = newClient("127.0.0.1:2181", 60 * 1000, 60 * 1000, new ExponentialBackoffRetry(6000, 3));
client.start();
generateServiceLevelOverride();
}
- public static void generateServiceLevelOverride() {
- String str = "---\n" + "configVersion: v2.7\n" + "scope: service\n" + "key: org.apache.dubbo.samples.mock.api.DemoService\n" + "enabled: true\n" + "configs:\n" + "- addresses: [0.0.0.0]\n" + " side: consumer\n" + " parameters:\n" + " mock: return null\n" + "...\n";
+ private static void generateServiceLevelOverride() {
+ String str = "---\n" +
+ "configVersion: v2.7\n" +
+ "scope: service\n" +
+ "key: org.apache.dubbo.samples.mock.api.DemoService\n" +
+ "enabled: true\n" + "configs:\n" +
+ "- addresses: [0.0.0.0]\n" +
+ " side: consumer\n" +
+ " parameters:\n" +
+ " mock: return null\n"
+ + "...\n";
System.out.println(str);
@@ -54,12 +59,4 @@ public class ZKTools {
private static void setData(String path, String data) throws Exception {
client.setData().forPath(path, data.getBytes());
}
-
- private static String pathToKey(String path) {
- if (StringUtils.isEmpty(path)) {
- return path;
- }
- return path.replace("/dubbo/config/", "").replaceAll("/", ".");
- }
-
}
diff --git a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/EmbeddedZooKeeper.java b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/EmbeddedZooKeeper.java
similarity index 99%
rename from dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/EmbeddedZooKeeper.java
rename to dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/EmbeddedZooKeeper.java
index 62e23af..883dd34 100644
--- a/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/EmbeddedZooKeeper.java
+++ b/dubbo-samples-mock/src/main/java/org/apache/dubbo/samples/mock/zk/EmbeddedZooKeeper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.samples.mock;
+package org.apache.dubbo.samples.mock.zk;
import java.io.File;
import java.lang.reflect.Method;
@@ -252,4 +252,4 @@ public class EmbeddedZooKeeper implements SmartLifecycle {
}
}
-}
\ No newline at end of file
+}
diff --git a/dubbo-samples-mock/src/main/resources/spring/mock-consumer.xml b/dubbo-samples-mock/src/main/resources/spring/mock-consumer.xml
index 3648ccb..61b8ad7 100644
--- a/dubbo-samples-mock/src/main/resources/spring/mock-consumer.xml
+++ b/dubbo-samples-mock/src/main/resources/spring/mock-consumer.xml
@@ -24,12 +24,13 @@
<!-- 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="mock-demo-consumer"/>
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
<!-- generate proxy for the remote service, then demoService can be used in the same way as the
local regular interface -->
- <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.mock.api.DemoService" mock="true"/>
+ <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.mock.api.DemoService"
+ mock="true"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-mock/src/main/resources/spring/mock-provider.xml b/dubbo-samples-mock/src/main/resources/spring/mock-provider.xml
index de056ed..d25ddd8 100644
--- a/dubbo-samples-mock/src/main/resources/spring/mock-provider.xml
+++ b/dubbo-samples-mock/src/main/resources/spring/mock-provider.xml
@@ -23,12 +23,12 @@
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="mock-demo-provider"/>
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
<!-- use dubbo protocol to export service on port 20880 -->
- <dubbo:protocol name="dubbo" port="20890"/>
+ <dubbo:protocol name="dubbo" port="20880"/>
<!-- service implementation, as same as regular local bean -->
<bean id="demoService" class="org.apache.dubbo.samples.mock.impl.DemoServiceImpl"/>
@@ -36,4 +36,4 @@
<!-- declare the service interface to be exported -->
<dubbo:service interface="org.apache.dubbo.samples.mock.api.DemoService" ref="demoService"/>
-</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