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/07/01 14:57:04 UTC
[dubbo-samples] branch master updated: integration test for
dubbo-samples-spi-compatible
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 53430c0 integration test for dubbo-samples-spi-compatible
new 3f42f37 Merge branch 'master' of https://github.com/apache/incubator-dubbo-samples
53430c0 is described below
commit 53430c09b1007fed681386845d6bade16f835d09
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Mon Jul 1 22:55:25 2019 +0800
integration test for dubbo-samples-spi-compatible
---
dubbo-samples-SPI-compatible/pom.xml | 326 ---------------------
.../META-INF/dubbo/com.alibaba.dubbo.rpc.Filter | 1 -
dubbo-samples-spi-compatible/pom.xml | 203 +++++++++++++
.../dubbo/samples/basic/EmbeddedZooKeeper.java | 0
.../dubbo/samples/basic/SpiCompatibleConsumer.java | 18 +-
.../dubbo/samples/basic/SpiCompatibleProvider.java | 9 +-
.../dubbo/samples/basic/api/DemoService.java | 0
.../dubbo/samples/basic/impl/DemoServiceImpl.java | 4 +-
.../dubbo/samples/basic/spi/CompatibleFilter.java | 10 +-
.../samples/basic/spi/CompatibleProtocol.java | 5 +-
.../samples/basic/spi/CompatibleRegistry.java | 24 +-
.../basic/spi/CompatibleRegistryFactory.java | 3 -
.../apache/dubbo/samples/basic/spi/MyExporter.java | 5 +-
.../apache/dubbo/samples/basic/spi/MyInvoker.java | 16 +-
.../dubbo/com.alibaba.dubbo.registry.Registry | 0
.../com.alibaba.dubbo.registry.RegistryFactory | 0
.../META-INF/dubbo/com.alibaba.dubbo.rpc.Filter | 1 +
.../META-INF/dubbo/com.alibaba.dubbo.rpc.Protocol | 0
.../src/main/resources/log4j.properties | 0
.../main/resources/spring/dubbo-demo-consumer.xml | 19 +-
.../main/resources/spring/dubbo-demo-provider.xml | 19 +-
.../apache/dubbo/samples/basic/DemoServiceIT.java | 64 ++++
.../org/apache/dubbo/samples/basic/ZkUtil.java | 72 +++++
pom.xml | 2 +-
24 files changed, 403 insertions(+), 398 deletions(-)
diff --git a/dubbo-samples-SPI-compatible/pom.xml b/dubbo-samples-SPI-compatible/pom.xml
deleted file mode 100644
index eaabdf6..0000000
--- a/dubbo-samples-SPI-compatible/pom.xml
+++ /dev/null
@@ -1,326 +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.
- -->
-<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">
- <groupId>org.apache.dubbo</groupId>
- <version>1.0-SNAPSHOT</version>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>dubbo-samples-SPI-compatible</artifactId>
-
- <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.1</dubbo.version>
- <dubbo.rpc.version>2.7.1</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>
- </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>
- </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.apache.dubbo</groupId>
- <artifactId>dubbo-compatible</artifactId>
- </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>
- <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>
- <executions>
- <execution>
- <id>checkstyle-validation</id>
- <phase>validate</phase>
- <configuration>
- <configLocation>../codestyle/checkstyle.xml</configLocation>
- <suppressionsLocation>../codestyle/checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
-</project>
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
deleted file mode 100644
index b61d8f3..0000000
--- a/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
+++ /dev/null
@@ -1 +0,0 @@
-compatible=org.apache.dubbo.samples.basic.spi.CompatibleFilter
\ No newline at end of file
diff --git a/dubbo-samples-spi-compatible/pom.xml b/dubbo-samples-spi-compatible/pom.xml
new file mode 100644
index 0000000..79f54c6
--- /dev/null
+++ b/dubbo-samples-spi-compatible/pom.xml
@@ -0,0 +1,203 @@
+<?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">
+ <groupId>org.apache.dubbo</groupId>
+ <version>1.0-SNAPSHOT</version>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-samples-spi-compatible</artifactId>
+
+ <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>
+ <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.basic.SpiCompatibleProvider</main-class>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>${dubbo.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>dubbo-integration-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-maven-address-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>local-address</goal>
+ </goals>
+ <configuration>
+ <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>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-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/EmbeddedZooKeeper.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/EmbeddedZooKeeper.java
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/EmbeddedZooKeeper.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/EmbeddedZooKeeper.java
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java
similarity index 69%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java
index d530945..6cb102f 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleConsumer.java
@@ -26,22 +26,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpiCompatibleConsumer {
public static void main(String[] args) {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/dubbo-demo-consumer.xml"});
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-demo-consumer.xml");
context.start();
- DemoService demoService = (DemoService) context.getBean("demoService"); // get remote service proxy
- while (true) {
- try {
- Thread.sleep(1000);
- String hello = demoService.sayHello("world"); // call remote method
- System.out.println(hello); // get result
-
- } catch (Throwable throwable) {
- throwable.printStackTrace();
- }
-
-
- }
+ DemoService demoService = context.getBean("demoService", DemoService.class);
+ String hello = demoService.sayHello("world");
+ System.out.println(hello);
}
}
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java
similarity index 86%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java
index 00faa44..32c3cba 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/SpiCompatibleProvider.java
@@ -21,14 +21,17 @@ package org.apache.dubbo.samples.basic;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.util.concurrent.CountDownLatch;
+
public class SpiCompatibleProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"spring/dubbo-demo-provider.xml"});
+
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-demo-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-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/api/DemoService.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/api/DemoService.java
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/api/DemoService.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/api/DemoService.java
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java
similarity index 90%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java
index 3974950..8c4ec04 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/impl/DemoServiceImpl.java
@@ -29,8 +29,8 @@ import java.util.Date;
public class DemoServiceImpl implements DemoService {
public String sayHello(String name) {
- System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] Hello " + name + ", request from consumer: " + RpcContext
- .getContext().getRemoteAddress());
+ 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();
}
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java
similarity index 88%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java
index 2f822ea..2797851 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleFilter.java
@@ -16,19 +16,23 @@
*/
package org.apache.dubbo.samples.basic.spi;
+
+import com.alibaba.dubbo.common.extension.Activate;
import com.alibaba.dubbo.rpc.Filter;
import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcException;
-/**
- *
- */
+
+@Activate(group = {"provider", "consumer"})
public class CompatibleFilter implements Filter {
+ public static boolean invoked = false;
+
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
System.out.println("Filter executed!!");
+ invoked = true;
return invoker.invoke(invocation);
}
}
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java
similarity index 95%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java
index 9df56c1..a8e7e35 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleProtocol.java
@@ -22,10 +22,7 @@ import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Protocol;
import com.alibaba.dubbo.rpc.RpcException;
-/**
- *
- */
-public abstract class CompatibleProtocol implements Protocol {
+public class CompatibleProtocol implements Protocol {
@Override
public int getDefaultPort() {
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
similarity index 65%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
index a29dc0c..dab9af6 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
@@ -16,20 +16,28 @@
*/
package org.apache.dubbo.samples.basic.spi;
+import org.apache.dubbo.registry.zookeeper.ZookeeperRegistryFactory;
+import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
+import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter;
+
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.registry.NotifyListener;
import com.alibaba.dubbo.registry.Registry;
import java.util.List;
+import java.util.stream.Collectors;
-/**
- */
public class CompatibleRegistry implements Registry {
- private URL url = URL.valueOf("zookeeper://127.0.0.1:2181/org.apache.dubbo.registry.RegistryService");
+ private URL url;
+ private org.apache.dubbo.registry.Registry delegate;
public CompatibleRegistry(URL url) {
this.url = url;
+ ZookeeperTransporter transporter = new CuratorZookeeperTransporter();
+ ZookeeperRegistryFactory registryFactory = new ZookeeperRegistryFactory();
+ registryFactory.setZookeeperTransporter(transporter);
+ delegate = registryFactory.createRegistry(url.setProtocol("zookeeper"));
}
@Override
@@ -39,36 +47,40 @@ public class CompatibleRegistry implements Registry {
@Override
public boolean isAvailable() {
- return true;
+ return delegate.isAvailable();
}
@Override
public void destroy() {
-
+ delegate.destroy();
}
@Override
public void register(URL url) {
System.out.println("Registering url to Compatible Registry......");
+ delegate.register(url);
}
@Override
public void unregister(URL url) {
System.out.println("Unregistering url from Compatible Registry......");
+ delegate.unregister(url);
}
@Override
public void subscribe(URL url, NotifyListener notifyListener) {
System.out.println("Subscribing url from Compatible Registry......");
+ delegate.subscribe(url, new NotifyListener.ReverseCompatibleNotifyListener(notifyListener));
}
@Override
public void unsubscribe(URL url, NotifyListener notifyListener) {
System.out.println("Unsubscribing url from Compatible Registry......");
+ delegate.subscribe(url, new NotifyListener.ReverseCompatibleNotifyListener(notifyListener));
}
@Override
public List<URL> lookup(URL url) {
- return null;
+ return delegate.lookup(url).stream().map(URL::new).collect(Collectors.toList());
}
}
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java
similarity index 99%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java
index 803026d..3070c7f 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistryFactory.java
@@ -20,9 +20,6 @@ import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.registry.Registry;
import com.alibaba.dubbo.registry.RegistryFactory;
-/**
- *
- */
public class CompatibleRegistryFactory implements RegistryFactory {
@Override
public Registry getRegistry(URL url) {
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java
similarity index 96%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java
index 04da1ca..72c14f7 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyExporter.java
@@ -19,14 +19,11 @@ package org.apache.dubbo.samples.basic.spi;
import com.alibaba.dubbo.rpc.Exporter;
import com.alibaba.dubbo.rpc.Invoker;
-/**
- *
- */
public class MyExporter<T> implements Exporter<T> {
@Override
public Invoker<T> getInvoker() {
- return null;
+ return new MyInvoker<>();
}
@Override
diff --git a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java
similarity index 79%
rename from dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java
rename to dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java
index 3135464..f5e3201 100644
--- a/dubbo-samples-SPI-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/MyInvoker.java
@@ -16,16 +16,16 @@
*/
package org.apache.dubbo.samples.basic.spi;
+import org.apache.dubbo.rpc.AppResponse;
+import org.apache.dubbo.rpc.AsyncRpcResult;
import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.samples.basic.api.DemoService;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcException;
-/**
- *
- */
public class MyInvoker<T> implements Invoker<T> {
@Override
@@ -35,18 +35,19 @@ public class MyInvoker<T> implements Invoker<T> {
@Override
public org.apache.dubbo.rpc.Result invoke(Invocation invocation) throws org.apache.dubbo.rpc.RpcException {
- return null;
+ AsyncRpcResult result = new AsyncRpcResult(invocation);
+ result.setValue("hello");
+ return result;
}
-
@Override
public Result invoke(com.alibaba.dubbo.rpc.Invocation invocation) throws RpcException {
- return null;
+ return new Result.CompatibleResult(new AppResponse());
}
@Override
public URL getUrl() {
- return null;
+ return URL.valueOf("compatible://localhost:20880/" + DemoService.class.getName());
}
@Override
@@ -54,6 +55,7 @@ public class MyInvoker<T> implements Invoker<T> {
return true;
}
+
@Override
public void destroy() {
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.Registry b/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.Registry
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.Registry
rename to dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.Registry
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
rename to dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
diff --git a/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
new file mode 100644
index 0000000..83b296d
--- /dev/null
+++ b/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
@@ -0,0 +1 @@
+compat=org.apache.dubbo.samples.basic.spi.CompatibleFilter
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Protocol b/dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Protocol
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Protocol
rename to dubbo-samples-spi-compatible/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Protocol
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/log4j.properties b/dubbo-samples-spi-compatible/src/main/resources/log4j.properties
similarity index 100%
rename from dubbo-samples-SPI-compatible/src/main/resources/log4j.properties
rename to dubbo-samples-spi-compatible/src/main/resources/log4j.properties
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-consumer.xml b/dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-consumer.xml
similarity index 60%
rename from dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-consumer.xml
rename to dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-consumer.xml
index ae928ad..75450e3 100644
--- a/dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-consumer.xml
+++ b/dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -18,19 +18,14 @@
<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="compatibility-consumer"/>
- <!-- use multicast registry center to discover service -->
- <dubbo:registry protocol="dubbo" address="127.0.0.1:2181"/>
+ <dubbo:registry protocol="compatible" address="${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 -->
- <dubbo:reference url="dubbo://30.5.121.164:20890/org.apache.dubbo.samples.basic.api.DemoService" filter="compatible" id="demoService" check="false" interface="org.apache.dubbo.samples.basic.api.DemoService"/>
-
-</beans>
\ No newline at end of file
+ <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.basic.api.DemoService"/>
+</beans>
diff --git a/dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-provider.xml b/dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-provider.xml
similarity index 64%
rename from dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-provider.xml
rename to dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-provider.xml
index b57edf5..5aa7c46 100644
--- a/dubbo-samples-SPI-compatible/src/main/resources/spring/dubbo-demo-provider.xml
+++ b/dubbo-samples-spi-compatible/src/main/resources/spring/dubbo-demo-provider.xml
@@ -18,24 +18,19 @@
<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="compatibility-provider"/>
- <!-- use multicast registry center to export service -->
<dubbo:registry protocol="compatible" address="127.0.0.1:2181"/>
- <!--<dubbo:registry address="zookeeper://11.163.250.27:2181"/>-->
- <!-- use dubbo protocol to export service on port 20880 -->
- <dubbo:protocol name="compatible" port="20890"/>
+ <dubbo:protocol name="compatible" port="20880"/>
- <!-- service implementation, as same as regular local bean -->
<bean id="demoService" class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/>
- <!-- declare the service interface to be exported -->
- <dubbo:service filter="compatible" interface="org.apache.dubbo.samples.basic.api.DemoService" ref="demoService"/>
+ <dubbo:service interface="org.apache.dubbo.samples.basic.api.DemoService" ref="demoService"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
new file mode 100644
index 0000000..073ef53
--- /dev/null
+++ b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
@@ -0,0 +1,64 @@
+/*
+ * 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.basic;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.samples.basic.api.DemoService;
+import org.apache.dubbo.samples.basic.spi.CompatibleFilter;
+
+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;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:/spring/dubbo-demo-consumer.xml"})
+public class DemoServiceIT {
+ @Autowired
+ private DemoService demoService;
+
+ @Test
+ public void testRegisteredProviders() throws Exception {
+ List<String> urls = ZkUtil.getChildren(ZkUtil.toUrlPath("providers"));
+ List<String> decodedUrls = urls.stream().map(URL::decode).collect(Collectors.toList());
+ Assert.assertEquals(1, decodedUrls.size());
+ String url = decodedUrls.get(0);
+ Assert.assertTrue(url.startsWith("compatible://"));
+ }
+
+ @Test
+ public void testRegisteredConsumers() throws Exception {
+ List<String> urls = ZkUtil.getChildren(ZkUtil.toUrlPath("consumers"));
+ List<String> decodedUrls = urls.stream().map(URL::decode).collect(Collectors.toList());
+ Assert.assertFalse(decodedUrls.isEmpty());
+ String url = decodedUrls.get(0);
+ Assert.assertTrue(url.startsWith("consumer://"));
+ }
+
+ @Test
+ public void testInvoke() throws Exception {
+ String result = demoService.sayHello("world");
+ Assert.assertEquals("hello", result);
+ Assert.assertTrue(CompatibleFilter.invoked);
+ }
+}
diff --git a/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/ZkUtil.java b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/ZkUtil.java
new file mode 100644
index 0000000..c402bfd
--- /dev/null
+++ b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/ZkUtil.java
@@ -0,0 +1,72 @@
+/*
+ * 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.basic;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.samples.basic.api.DemoService;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.ExponentialBackoffRetry;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
+
+
+public class ZkUtil {
+ private static String zookeeperHost = System.getProperty("zookeeper.address", "127.0.0.1");
+ private static CuratorFramework client;
+
+ static {
+ initClient();
+ }
+
+ private static void initClient() {
+ client = CuratorFrameworkFactory.newClient(zookeeperHost + ":2181", 60 * 1000, 60 * 1000,
+ new ExponentialBackoffRetry(1000, 3));
+ client.start();
+ }
+
+ private static String toRootDir() {
+ return "/dubbo";
+ }
+
+ private static String toServicePath() {
+ String name = DemoService.class.getName();
+ return toRootDir() + PATH_SEPARATOR + URL.encode(name);
+ }
+
+ private static String toCategoryPath(String side) {
+ return toServicePath() + PATH_SEPARATOR + side;
+ }
+
+ public static String toUrlPath(String side) {
+ return toCategoryPath(side);
+ }
+
+ public static List<String> getChildren(String path) {
+ try {
+ return client.getChildren().forPath(path);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList();
+ }
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index f75931b..d6f3ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<module>dubbo-samples-rest</module>
<module>dubbo-samples-scala</module>
<module>dubbo-samples-simplified-registry</module>
- <module>dubbo-samples-SPI-compatible</module>
+ <module>dubbo-samples-spi-compatible</module>
<module>dubbo-samples-spring-hystrix</module>
<module>dubbo-samples-spring-boot-hystrix</module>
<module>dubbo-samples-stub</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org