This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 96786d8a9a61970a8793fa3990e14e6f31cc526b Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Tue Aug 13 20:14:09 2019 +0800 demos --- .../bootstrap/DubboServiceConsumerBootstrap.java | 6 +++--- .../bootstrap/DubboServiceProvider2Bootstrap.java | 6 +++--- .../bootstrap/DubboServiceProviderBootstrap.java | 8 ++++---- .../DubboInterfaceConsumerBootstrap.java} | 21 +++++++++++++++------ .../apache/dubbo/bootstrap/rest/UserService.java | 2 -- .../dubbo/bootstrap/rest/UserServiceImpl.java | 6 ------ 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java index def1d07..f082192 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java @@ -32,9 +32,9 @@ public class DubboServiceConsumerBootstrap { new DubboBootstrap() .application("dubbo-consumer-demo") // Zookeeper -// .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo")) + .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service&subscribed.services=dubbo-provider-demo")) // Nacos - .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry-type=service&subscribed-services=dubbo-provider-demo")) +// .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1")) .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo")) .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest")) .onlyRegisterProvider(true) @@ -43,7 +43,7 @@ public class DubboServiceConsumerBootstrap { ConfigManager configManager = ConfigManager.getInstance(); - ReferenceConfig<EchoService> referenceConfig = configManager.getReferenceConfig("ref"); + ReferenceConfig<EchoService> referenceConfig = configManager.getReferenceConfig("echo"); EchoService echoService = referenceConfig.get(); diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java index cc2948e..ad87adb 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java @@ -27,10 +27,10 @@ public class DubboServiceProvider2Bootstrap { new DubboBootstrap() .application("dubbo-provider-demo") // Zookeeper in service registry type - .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) + .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service")) // Nacos -// .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service")) -// .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry-type=service").build()) +// .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service")) +// .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry.type=service").build()) .protocol(builder -> builder.port(20885).name("dubbo")) .service(builder -> builder.id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl())) .start() diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java index 2639d6b..dd2060c 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java @@ -47,7 +47,7 @@ public class DubboServiceProviderBootstrap { RegistryConfig serviceRegistry = new RegistryConfig(); serviceRegistry.setId("serviceRegistry"); - serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry-type=service"); + serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry.type=service"); ServiceConfig<EchoService> echoService = new ServiceConfig<>(); echoService.setInterface(EchoService.class.getName()); @@ -64,11 +64,11 @@ public class DubboServiceProviderBootstrap { new DubboBootstrap() .application("dubbo-provider-demo") // Zookeeper in service registry type -// .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) +// .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service")) // Nacos -// .registry("zookeeper", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service")) +// .registry("zookeeper", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service")) .registries(Arrays.asList(interfaceRegistry, serviceRegistry)) -// .registry(RegistryBuilder.newBuilder().address("consul://127.0.0.1:8500?registry-type=service").build()) +// .registry(RegistryBuilder.newBuilder().address("consul://127.0.0.1:8500?registry.type=service").build()) .protocol(builder -> builder.port(-1).name("dubbo")) .service(echoService) .service(userService) diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java similarity index 68% copy from dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java copy to dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java index def1d07..59a8fb1 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.bootstrap; +package org.apache.dubbo.bootstrap.compatible; +import org.apache.dubbo.bootstrap.DubboBootstrap; +import org.apache.dubbo.bootstrap.EchoService; import org.apache.dubbo.bootstrap.rest.UserService; import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.context.ConfigManager; /** @@ -25,16 +28,19 @@ import org.apache.dubbo.config.context.ConfigManager; * * @since 2.7.4 */ -public class DubboServiceConsumerBootstrap { +public class DubboInterfaceConsumerBootstrap { public static void main(String[] args) throws Exception { + RegistryConfig interfaceRegistry = new RegistryConfig(); + interfaceRegistry.setId("interfaceRegistry"); + interfaceRegistry.setAddress("zookeeper://127.0.0.1:2181"); new DubboBootstrap() .application("dubbo-consumer-demo") // Zookeeper -// .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo")) + .registry(interfaceRegistry) // Nacos - .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry-type=service&subscribed-services=dubbo-provider-demo")) +// .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo")) .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo")) .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest")) .onlyRegisterProvider(true) @@ -43,13 +49,16 @@ public class DubboServiceConsumerBootstrap { ConfigManager configManager = ConfigManager.getInstance(); - ReferenceConfig<EchoService> referenceConfig = configManager.getReferenceConfig("ref"); - + ReferenceConfig<EchoService> referenceConfig = configManager.getReferenceConfig("echo"); EchoService echoService = referenceConfig.get(); + ReferenceConfig<UserService> referenceConfig1 = configManager.getReferenceConfig("user"); + UserService userService = referenceConfig1.get(); + for (int i = 0; i < 500; i++) { Thread.sleep(2000L); System.out.println(echoService.echo("Hello,World")); + System.out.println(userService.getUser(1L)); } } diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserService.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserService.java index 514a0bf..3d18f86 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserService.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserService.java @@ -42,6 +42,4 @@ public interface UserService { @Path("{id : \\d+}") @ApiOperation(value = "getUser") User getUser(@ApiParam(value = "id") @PathParam("id") Long id); - - Long registerUser(User user); } diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserServiceImpl.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserServiceImpl.java index 01259eb..7439c53 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserServiceImpl.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/rest/UserServiceImpl.java @@ -29,10 +29,4 @@ public class UserServiceImpl implements UserService { return new User(id, "username" + id); } - - @Override - public Long registerUser(User user) { -// System.out.println("Username is " + user.getName()); - return idGen.incrementAndGet(); - } }