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/06/30 09:18:33 UTC
[dubbo-samples] branch master updated: integration test for
dubbo-samples-notify
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/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 007e453 integration test for dubbo-samples-notify
007e453 is described below
commit 007e453905ffc16be8904d4fdd8aac5d93a185a3
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Sun Jun 30 17:17:20 2019 +0800
integration test for dubbo-samples-notify
---
dubbo-samples-notify/pom.xml | 387 ++++++++-------------
.../dubbo/samples/notify/NotifyConsumer.java | 20 +-
.../dubbo/samples/notify/NotifyProvider.java | 8 +-
.../dubbo/samples/notify/api/DemoService.java | 3 +-
.../apache/dubbo/samples/notify/api/Notify.java | 5 +-
.../dubbo/samples/notify/impl/DemoServiceImpl.java | 5 +-
.../dubbo/samples/notify/impl/NotifyImpl.java | 12 +-
.../src/main/resources/spring/notify-consumer.xml | 25 +-
.../src/main/resources/spring/notify-provider.xml | 19 +-
.../org/apache/dubbo/samples/notify/NotifyIT.java | 82 +++++
10 files changed, 265 insertions(+), 301 deletions(-)
diff --git a/dubbo-samples-notify/pom.xml b/dubbo-samples-notify/pom.xml
index d30fba2..1f72049 100644
--- a/dubbo-samples-notify/pom.xml
+++ b/dubbo-samples-notify/pom.xml
@@ -31,291 +31,176 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
+ <dubbo.version>2.7.2</dubbo.version>
<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>
- <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>
+ <junit.version>4.12</junit.version>
+ <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
+ <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
+ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+ <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
+ <image.name>${artifactId}:${dubbo.version}</image.name>
+ <dubbo.port>20880</dubbo.port>
+ <zookeeper.port>2181</zookeeper.port>
+ <main-class>org.apache.dubbo.samples.notify.NotifyProvider</main-class>
</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>
- <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>
+ <type>pom</type>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- <configuration>
- <source>${source.level}</source>
- <target>${target.level}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>verify.rat</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/.idea/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.load</exclude>
- <exclude>**/*.flex</exclude>
- <exclude>**/*.fc</exclude>
- <exclude>**/*.javascript</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.thrift</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- <exclude>**/*.md</exclude>
- <exclude>.git/</exclude>
- <exclude>.gitignore</exclude>
- <!-- ASF jenkins box puts the Maven repo in our root directory. -->
- <exclude>.repository/</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>CODE_OF_CONDUCT.md</exclude>
- <exclude>.codecov.yml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>PULL_REQUEST_TEMPLATE.md</exclude>
- <exclude>CONTRIBUTING.md</exclude>
- <exclude>README.md</exclude>
- <exclude>**/codestyle/*</exclude>
- <exclude>**/resources/META-INF/**</exclude>
- <exclude>**/webapp/swagger/**</exclude>
- <exclude>**/org/apache/dubbo/samples/rpc/nativethrift/api/DemoService.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
- <id>checkstyle</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
+ <id>dubbo-integration-test</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven_checkstyle_version}</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>8.9</version>
- </dependency>
- </dependencies>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-maven-address-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
<executions>
<execution>
- <id>checkstyle-validation</id>
- <phase>validate</phase>
+ <goals>
+ <goal>local-address</goal>
+ </goals>
<configuration>
- <configLocation>../codestyle/checkstyle.xml</configLocation>
- <suppressionsLocation>../codestyle/checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>true</failOnViolation>
+ <localAddress>dubbo-local-address</localAddress>
</configuration>
+ <phase>initialize</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <version>${jib-maven-plugin.version}</version>
+ <configuration>
+ <from>
+ <image>openjdk:8</image>
+ </from>
+ <to>
+ <image>${image.name}</image>
+ </to>
+ <container>
+ <mainClass>${main-class}</mainClass>
+ <environment>
+ <DUBBO_IP_TO_REGISTRY>${dubbo-local-address}</DUBBO_IP_TO_REGISTRY>
+ </environment>
+ <jvmFlags>
+ <jvmFlag>-Dzookeeper.address=${dubbo-local-address}</jvmFlag>
+ </jvmFlags>
+ </container>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
<goals>
- <goal>check</goal>
+ <goal>dockerBuild</goal>
</goals>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>${image.name}</name>
+ <run>
+ <ports>
+ <port>${dubbo.port}:${dubbo.port}</port>
+ <port>${zookeeper.port}:${zookeeper.port}</port>
+ </ports>
+ <wait>
+ <log>dubbo service started</log>
+ </wait>
+ </run>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <zookeeper.address>${dubbo-local-address}</zookeeper.address>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/*IT.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <source>${source.level}</source>
+ <target>${target.level}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyConsumer.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyConsumer.java
index 459b4e5..c774910 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyConsumer.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyConsumer.java
@@ -20,6 +20,7 @@
package org.apache.dubbo.samples.notify;
import org.apache.dubbo.samples.notify.api.DemoService;
+import org.apache.dubbo.samples.notify.api.Notify;
import org.apache.dubbo.samples.notify.impl.NotifyImpl;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -27,26 +28,23 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class NotifyConsumer {
public static void main(String[] args) throws Exception {
- //Prevent to get IPV6 address,this way only work in debug mode
- //But you can pass use -Djava.net.preferIPv4Stack=true,then it work well whether in debug mode or not
- System.setProperty("java.net.preferIPv4Stack", "true");
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/notify-consumer.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/notify-consumer.xml");
context.start();
- DemoService demoService = (DemoService) context.getBean("demoService"); // get remote service proxy
- NotifyImpl notify = (NotifyImpl)context.getBean("demoCallback");
+
+ DemoService demoService = context.getBean("demoService", DemoService.class);
+ NotifyImpl notify = context.getBean("demoCallback", NotifyImpl.class);
+
int id = 1;
String result = demoService.sayHello(id);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
if (!notify.ret.containsKey(id)) {
Thread.sleep(200);
- }
- else {
+ } else {
break;
}
}
- System.out.println(notify.ret.get(id));
-
+ System.out.println("result: " + notify.ret.get(id));
}
}
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyProvider.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyProvider.java
index 420162a..652a52c 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyProvider.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/NotifyProvider.java
@@ -21,14 +21,18 @@ package org.apache.dubbo.samples.notify;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.util.concurrent.CountDownLatch;
+
public class NotifyProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/notify-provider.xml"});
+
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/notify-provider.xml");
context.start();
- System.in.read(); // press any key to exit
+ System.out.println("dubbo service started");
+ new CountDownLatch(1).await();
}
}
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/DemoService.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/DemoService.java
index 866bf04..225d167 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/DemoService.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/DemoService.java
@@ -21,6 +21,5 @@ package org.apache.dubbo.samples.notify.api;
public interface DemoService {
- public String sayHello(int id);
-
+ String sayHello(int id);
}
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/Notify.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/Notify.java
index c7bc0a3..058ba76 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/Notify.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/api/Notify.java
@@ -20,10 +20,9 @@
package org.apache.dubbo.samples.notify.api;
-
public interface Notify {
- public void onreturn(String name, int id);
+ void onReturn(String name, int id);
- public void onthrow(Throwable ex, String name, int id);
+ void onThrow(Throwable ex, int id);
}
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/DemoServiceImpl.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/DemoServiceImpl.java
index 03a6a3c..1ee5fc6 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/DemoServiceImpl.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/DemoServiceImpl.java
@@ -25,6 +25,9 @@ import org.apache.dubbo.samples.notify.api.DemoService;
public class DemoServiceImpl implements DemoService {
public String sayHello(int id) {
- return "aaa";
+ if (id > 10) {
+ throw new RuntimeException("exception from sayHello: too large id");
+ }
+ return "demo" + id;
}
}
diff --git a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/NotifyImpl.java b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/NotifyImpl.java
index 30d6fd1..947afb9 100644
--- a/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/NotifyImpl.java
+++ b/dubbo-samples-notify/src/main/java/org/apache/dubbo/samples/notify/impl/NotifyImpl.java
@@ -26,15 +26,17 @@ import java.util.Map;
public class NotifyImpl implements Notify {
- public Map<Integer, String> ret = new HashMap<Integer, String>();
+ public Map<Integer, Object> ret = new HashMap<>();
+
@Override
- public void onreturn(String name, int id) {
+ public void onReturn(String name, int id) {
ret.put(id, name);
- System.out.println("onreturn: " + name);
+ System.out.println("onReturn: " + name);
}
@Override
- public void onthrow(Throwable ex, String name, int id) {
- System.out.println("onthrow: " + name);
+ public void onThrow(Throwable ex, int id) {
+ ret.put(id, ex);
+ System.out.println("onThrow: " + ex);
}
}
diff --git a/dubbo-samples-notify/src/main/resources/spring/notify-consumer.xml b/dubbo-samples-notify/src/main/resources/spring/notify-consumer.xml
index 1138ddb..aeb9974 100644
--- a/dubbo-samples-notify/src/main/resources/spring/notify-consumer.xml
+++ b/dubbo-samples-notify/src/main/resources/spring/notify-consumer.xml
@@ -20,23 +20,18 @@
<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="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://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/>
- <!-- 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="notify-consumer"/>
- <!-- use multicast registry center to discover service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address: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 -->
- <bean id="demoCallback" class="org.apache.dubbo.samples.notify.impl.NotifyImpl" />
- <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.notify.api.DemoService" version="1.0.0" group="cn">
- <dubbo:method name="sayHello" async="true" onreturn="demoCallback.onreturn" onthrow="demoCallback.onthrow"/>
+ <bean id="demoCallback" class="org.apache.dubbo.samples.notify.impl.NotifyImpl"/>
+ <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.notify.api.DemoService"
+ version="1.0.0" group="cn">
+ <dubbo:method name="sayHello" async="false" onreturn="demoCallback.onReturn" onthrow="demoCallback.onThrow"/>
</dubbo:reference>
-
-
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-notify/src/main/resources/spring/notify-provider.xml b/dubbo-samples-notify/src/main/resources/spring/notify-provider.xml
index 355dacb..46dbe67 100644
--- a/dubbo-samples-notify/src/main/resources/spring/notify-provider.xml
+++ b/dubbo-samples-notify/src/main/resources/spring/notify-provider.xml
@@ -20,23 +20,20 @@
<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="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://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/>
- <!-- provider's application name, used for tracing dependency relationship -->
- <dubbo:application name="demo-provider"/>
+ <dubbo:application name="notify-provider"/>
- <!-- use multicast registry center to export service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
- <!-- use dubbo protocol to export service on port 20880 -->
<dubbo:protocol name="dubbo" port="20880"/>
- <!-- service implementation, as same as regular local bean -->
<bean id="demoService" class="org.apache.dubbo.samples.notify.impl.DemoServiceImpl"/>
- <!-- declare the service interface to be exported -->
- <dubbo:service interface="org.apache.dubbo.samples.notify.api.DemoService" ref="demoService" version="1.0.0" group="cn"/>
+ <dubbo:service interface="org.apache.dubbo.samples.notify.api.DemoService" ref="demoService" version="1.0.0"
+ group="cn"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-notify/src/test/java/org/apache/dubbo/samples/notify/NotifyIT.java b/dubbo-samples-notify/src/test/java/org/apache/dubbo/samples/notify/NotifyIT.java
new file mode 100644
index 0000000..4a8b56d
--- /dev/null
+++ b/dubbo-samples-notify/src/test/java/org/apache/dubbo/samples/notify/NotifyIT.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+package org.apache.dubbo.samples.notify;
+
+
+import org.apache.dubbo.samples.notify.api.DemoService;
+import org.apache.dubbo.samples.notify.impl.NotifyImpl;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:/spring/notify-consumer.xml"})
+public class NotifyIT {
+ @Autowired
+ private DemoService demoService;
+
+ @Autowired
+ private NotifyImpl notify;
+
+ @Test
+ public void testDemoService() throws Exception {
+ String result = demoService.sayHello(1);
+ Assert.assertEquals("demo1", result);
+ }
+
+ @Test
+ public void testOnReturn() throws Exception {
+ int id = 2;
+ demoService.sayHello(id);
+ for (int i = 0; i < 10; i++) {
+ if (!notify.ret.containsKey(id)) {
+ Thread.sleep(200);
+ } else {
+ break;
+ }
+ }
+
+ Assert.assertEquals("demo2", notify.ret.get(id));
+ }
+
+ @Test
+ public void testOnThrow() throws Exception {
+ int id = 11;
+ try {
+ demoService.sayHello(id);
+ } catch (Throwable t) {
+ // ignore
+ }
+
+ for (int i = 0; i < 10; i++) {
+ if (!notify.ret.containsKey(id)) {
+ Thread.sleep(200);
+ } else {
+ break;
+ }
+ }
+
+ Assert.assertTrue(notify.ret.get(id) instanceof RuntimeException);
+ Exception e = (Exception) notify.ret.get(id);
+ Assert.assertEquals("exception from sayHello: too large id", e.getMessage());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org