diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/pom.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/pom.xml deleted file mode 100644 index 60d55e6abb..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - 4.0.0 - - org.apache.dubbo - dubbo-demo-service - ${revision} - ../pom.xml - - dubbo-demo-service-consumer - jar - ${project.artifactId} - The demo consumer module of dubbo project - - true - - - - org.apache.dubbo - dubbo-metadata-report-zookeeper - - - org.apache.dubbo - dubbo-metadata-report-failover - - - org.apache.dubbo - dubbo-demo-interface - ${project.parent.version} - - - org.apache.dubbo - dubbo-registry-multicast - - - org.apache.dubbo - dubbo-registry-nacos - - - com.alibaba.nacos - nacos-client - - - org.apache.dubbo - dubbo-registry-zookeeper - - - org.apache.dubbo - dubbo-configcenter-zookeeper - - - org.apache.dubbo - dubbo-configcenter-nacos - - - org.apache.dubbo - dubbo-metadata-report-nacos - - - org.apache.dubbo - dubbo-config-spring - - - org.apache.dubbo - dubbo-rpc-dubbo - - - org.apache.dubbo - dubbo-remoting-netty4 - - - org.apache.dubbo - dubbo-serialization-hessian2 - - - org.apache.dubbo - dubbo-registry-sofa - - - org.apache.dubbo - dubbo-configcenter-apollo - - - org.apache.dubbo - dubbo-cluster - - - - org.apache.dubbo - dubbo-registry-multiple - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/ApplicationConsumer.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/ApplicationConsumer.java deleted file mode 100644 index 909b149653..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/ApplicationConsumer.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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.demo.consumer; - -import org.apache.dubbo.demo.GreetingService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class ApplicationConsumer { - /** - * In order to make sure multicast registry works, need to specify '-Djava.net.preferIPv4Stack=true' before - * launch the application - */ - public static void main(String[] args) throws Exception { - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-consumer-sofaregistry.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-consumer-zk-sofaregistry.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-consumer-zk.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-consumer-zk-apollo.xml"); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-consumer-multiple.xml"); - - context.start(); - //DemoService demoService = context.getBean("demoService", DemoService.class); - GreetingService greetingService = context.getBean("greetingService", GreetingService.class); - - new Thread(() -> { - while (true) { - try { - String greetings = greetingService.hello(); - System.out.println(greetings + " from separated thread."); - } catch (Exception e) { - e.printStackTrace();; - } - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }).start(); - -/* - while (true) { - try { - CompletableFuture hello = demoService.sayHelloAsync("world"); - System.out.println("result: " + hello.get()); - - String greetings = greetingService.hello(); - System.out.println("result: " + greetings); - - - } catch (Exception e) { - e.printStackTrace(); - } - - Thread.sleep(1000); - }*/ - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/RandomMigrationAddressComparator.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/RandomMigrationAddressComparator.java deleted file mode 100644 index 8202102dc9..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/RandomMigrationAddressComparator.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.demo.consumer; - -import org.apache.dubbo.registry.client.migration.MigrationInvoker; -import org.apache.dubbo.registry.client.migration.ServiceDiscoveryMigrationInvoker; -import org.apache.dubbo.rpc.Invoker; -import org.apache.dubbo.rpc.cluster.support.migration.MigrationClusterComparator; - -import java.util.List; - - -public class RandomMigrationAddressComparator implements MigrationClusterComparator { - @Override - public boolean shouldMigrate(List> interfaceInvokers, List> serviceInvokers) { - int interfaceInvokerSize = 0; - for (Invoker invoker : interfaceInvokers) { - MigrationInvoker migrationInvoker = (MigrationInvoker)invoker; - if (migrationInvoker.isAvailable() && null != migrationInvoker.getInvoker().getDirectory().getAllInvokers()) { - interfaceInvokerSize += migrationInvoker.getInvoker().getDirectory().getAllInvokers().size(); - } - } - - int serviceInvokerSize = 0; - for (Invoker invoker : serviceInvokers) { - ServiceDiscoveryMigrationInvoker migrationInvoker = (ServiceDiscoveryMigrationInvoker) invoker; - if (migrationInvoker.isAvailable() && null != migrationInvoker.getServiceDiscoveryInvoker().getDirectory().getAllInvokers()) { - serviceInvokerSize += migrationInvoker.getServiceDiscoveryInvoker().getDirectory().getAllInvokers().size(); - } - } - - if (serviceInvokerSize == 0) { - return false; - } - - return serviceInvokerSize >= interfaceInvokerSize; - } -} \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/TestFailoverCondition.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/TestFailoverCondition.java deleted file mode 100644 index f7f0f0fd8a..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/TestFailoverCondition.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.demo.consumer; - -import org.apache.dubbo.common.URL; -import org.apache.dubbo.metadata.store.failover.FailoverCondition; - -public class TestFailoverCondition implements FailoverCondition { - @Override - public boolean shouldRegister(URL url) { - return url.getPort() == 2182; - } - - @Override - public boolean shouldQuery(URL url) { - return true; - } - - @Override - public boolean isLocalDataCenter(URL url) { - return url.getPort() == 2182; - } -} \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition deleted file mode 100644 index 6d9410f4ae..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition +++ /dev/null @@ -1 +0,0 @@ -local=org.apache.dubbo.demo.consumer.TestFailoverCondition \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.support.migration.MigrationClusterComparator b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.support.migration.MigrationClusterComparator deleted file mode 100644 index c7172d0874..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.support.migration.MigrationClusterComparator +++ /dev/null @@ -1 +0,0 @@ -default=org.apache.dubbo.demo.consumer.RandomMigrationAddressComparator \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/dubbo.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/dubbo.properties deleted file mode 100644 index ff28ac1c0a..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/dubbo.properties +++ /dev/null @@ -1,2 +0,0 @@ -dubbo.application.qos.port=33333 -dubbo.consumer.check=false \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/log4j.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/log4j.properties deleted file mode 100644 index 405f19df71..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/log4j.properties +++ /dev/null @@ -1,7 +0,0 @@ -###set log levels### -log4j.rootLogger=debug, stdout -###output to console### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-multiple.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-multiple.xml deleted file mode 100644 index 9166fbe0bc..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-multiple.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-sofaregistry.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-sofaregistry.xml deleted file mode 100644 index 2551cd1413..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-sofaregistry.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-apollo.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-apollo.xml deleted file mode 100644 index af920473e7..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-apollo.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-sofaregistry.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-sofaregistry.xml deleted file mode 100644 index 4763a71fa9..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-sofaregistry.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk.xml deleted file mode 100644 index b646af024b..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/pom.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/pom.xml deleted file mode 100644 index 8d26365780..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - 4.0.0 - - org.apache.dubbo - dubbo-demo-service - ${revision} - ../pom.xml - - dubbo-demo-service-provider - jar - ${project.artifactId} - The demo provider module of dubbo project - - true - 1.7.25 - - - - - org.apache.dubbo - dubbo-demo-interface - ${project.parent.version} - - - org.apache.dubbo - dubbo-registry-multicast - - - org.apache.dubbo - dubbo-registry-nacos - - - com.alibaba.nacos - nacos-client - - - org.apache.dubbo - dubbo-registry-zookeeper - - - org.apache.dubbo - dubbo-configcenter-zookeeper - - - org.apache.dubbo - dubbo-configcenter-nacos - - - org.apache.dubbo - dubbo-metadata-report-nacos - - - org.apache.dubbo - dubbo-metadata-report-zookeeper - - - org.apache.dubbo - dubbo-metadata-report-failover - - - org.apache.dubbo - dubbo-rpc-dubbo - - - org.apache.dubbo - dubbo-config-spring - - - org.apache.dubbo - dubbo-remoting-netty4 - - - org.apache.dubbo - dubbo-serialization-hessian2 - - - org.apache.dubbo - dubbo-qos - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - - - org.apache.dubbo - dubbo-registry-sofa - - - org.apache.dubbo - dubbo-configcenter-apollo - - - org.apache.dubbo - dubbo-registry-multiple - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider.java deleted file mode 100644 index 104d182082..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.demo.provider; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class ApplicationProvider { - public static void main(String[] args) throws Exception { - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-sofaregistry.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-zk-sofaregistry.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-zk.xml"); - //ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-zk-apollo.xml"); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-multiple.xml"); - context.start(); - System.in.read(); - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java deleted file mode 100644 index 4bccce6c36..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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.demo.provider; - -import org.apache.dubbo.demo.DemoService; -import org.apache.dubbo.rpc.RpcContext; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.CompletableFuture; - -public class DemoServiceImpl implements DemoService { - private static final Logger logger = LoggerFactory.getLogger(DemoServiceImpl.class); - - @Override - public String sayHello(String name) { - logger.info("Hello " + name + ", request from consumer: " + RpcContext.getContext().getRemoteAddress()); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress(); - } - - @Override - public CompletableFuture sayHelloAsync(String name) { - CompletableFuture cf = CompletableFuture.supplyAsync(() -> { -// try { -// Thread.sleep(1000); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } - return "async result"; - }); - return cf; - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java deleted file mode 100644 index 3e60992022..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.demo.provider; - -import org.apache.dubbo.demo.GreetingService; - -/** - * - */ -public class GreetingServiceImpl implements GreetingService { - @Override - public String hello() { - return "Greetings from provider1!"; - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ServiceDemoMetadataParamsFilter.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ServiceDemoMetadataParamsFilter.java deleted file mode 100644 index 4d67ec383d..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ServiceDemoMetadataParamsFilter.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.demo.provider; - -import org.apache.dubbo.common.extension.Activate; -import org.apache.dubbo.metadata.MetadataParamsFilter; - - -@Activate -public class ServiceDemoMetadataParamsFilter implements MetadataParamsFilter { - @Override - public String[] serviceParamsIncluded() { - return new String[] {"serviceKey1", "serviceKey2"}; - } - - @Override - public String[] instanceParamsIncluded() { - return new String[] {"instance1", "instance2"}; - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/TestFailoverCondition.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/TestFailoverCondition.java deleted file mode 100644 index c197fda476..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/TestFailoverCondition.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.demo.provider; - -import org.apache.dubbo.common.URL; -import org.apache.dubbo.metadata.store.failover.FailoverCondition; - -public class TestFailoverCondition implements FailoverCondition { - @Override - public boolean shouldRegister(URL url) { - return url.getPort() == 2182; - } - - @Override - public boolean shouldQuery(URL url) { - return true; - } - - @Override - public boolean isLocalDataCenter(URL url) { - return url.getPort() == 2182; - } -} \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter deleted file mode 100644 index 768fcdf32b..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter +++ /dev/null @@ -1 +0,0 @@ -serviceDemo=org.apache.dubbo.demo.provider.ServiceDemoMetadataParamsFilter \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition deleted file mode 100644 index 86300ecbb4..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition +++ /dev/null @@ -1 +0,0 @@ -local=org.apache.dubbo.demo.provider.TestFailoverCondition \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/dubbo.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/dubbo.properties deleted file mode 100644 index ad602baa94..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/dubbo.properties +++ /dev/null @@ -1 +0,0 @@ -dubbo.application.qos.port=22222 diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/log4j.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/log4j.properties deleted file mode 100644 index 15a0900f0d..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/log4j.properties +++ /dev/null @@ -1,7 +0,0 @@ -###set log levels### -log4j.rootLogger=info, stdout -###output to the console### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-multiple.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-multiple.xml deleted file mode 100644 index 0b88c742b4..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-multiple.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-sofaregistry.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-sofaregistry.xml deleted file mode 100644 index 37dd63cf48..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-sofaregistry.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-apollo.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-apollo.xml deleted file mode 100644 index 8dcbaafbf7..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-apollo.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-sofaregistry.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-sofaregistry.xml deleted file mode 100644 index dfa4686aae..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-sofaregistry.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk.xml deleted file mode 100644 index eb14cbc324..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/pom.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/pom.xml deleted file mode 100644 index 03d5d1b412..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - org.apache.dubbo - dubbo-demo-service - ${revision} - ../pom.xml - - dubbo-demo-service-provider2 - jar - ${project.artifactId} - The demo provider module of dubbo project - - true - 1.7.25 - - - - - org.apache.dubbo - dubbo-demo-interface - ${project.parent.version} - - - org.apache.dubbo - dubbo-registry-multicast - - - org.apache.dubbo - dubbo-registry-nacos - - - com.alibaba.nacos - nacos-client - - - org.apache.dubbo - dubbo-registry-zookeeper - - - org.apache.dubbo - dubbo-configcenter-zookeeper - - - org.apache.dubbo - dubbo-configcenter-nacos - - - org.apache.dubbo - dubbo-metadata-report-nacos - - - org.apache.dubbo - dubbo-metadata-report-zookeeper - - - org.apache.dubbo - dubbo-rpc-dubbo - - - org.apache.dubbo - dubbo-config-spring - - - org.apache.dubbo - dubbo-remoting-netty4 - - - org.apache.dubbo - dubbo-serialization-hessian2 - - - org.apache.dubbo - dubbo-qos - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - - - org.apache.dubbo - dubbo-registry-sofa - - - org.apache.dubbo - dubbo-configcenter-apollo - - - diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider2.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider2.java deleted file mode 100644 index 3aaed48ac5..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider2.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.demo.provider; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class ApplicationProvider2 { - public static void main(String[] args) throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("spring/dubbo-provider-zk.xml"); - context.start(); - System.in.read(); - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java deleted file mode 100644 index 1394552597..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.demo.provider; - -import org.apache.dubbo.demo.GreetingService; - -/** - * - */ -public class GreetingServiceImpl implements GreetingService { - @Override - public String hello() { - return "Greetings from provider2!"; - } -} diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/dubbo.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/dubbo.properties deleted file mode 100644 index 38c53269a4..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/dubbo.properties +++ /dev/null @@ -1 +0,0 @@ -dubbo.application.qos.port=22224 diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/log4j.properties b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/log4j.properties deleted file mode 100644 index 15a0900f0d..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/log4j.properties +++ /dev/null @@ -1,7 +0,0 @@ -###set log levels### -log4j.rootLogger=info, stdout -###output to the console### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/spring/dubbo-provider-zk.xml b/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/spring/dubbo-provider-zk.xml deleted file mode 100644 index 8cda578a8a..0000000000 --- a/dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/spring/dubbo-provider-zk.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-service/pom.xml b/dubbo-demo/dubbo-demo-service/pom.xml deleted file mode 100644 index c9472770b6..0000000000 --- a/dubbo-demo/dubbo-demo-service/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.apache.dubbo - dubbo-demo - ${revision} - ../pom.xml - - 4.0.0 - pom - - dubbo-demo-service - - - true - 2.1.4.RELEASE - - - - dubbo-demo-service-provider - dubbo-demo-service-provider2 - dubbo-demo-service-consumer - - - - - org.apache.dubbo - dubbo-metadata-report-zookeeper - ${project.parent.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - - repackage - - - - - - - - diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml index 1aba80418e..9c632b89f1 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml @@ -28,12 +28,12 @@ - + - - diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index af569a2088..e636a2305a 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -33,7 +33,6 @@ dubbo-demo-interface dubbo-demo-xml - dubbo-demo-service dubbo-demo-annotation dubbo-demo-api diff --git a/dubbo-metadata/pom.xml b/dubbo-metadata/pom.xml index 5aa23fb821..e72db49b9e 100644 --- a/dubbo-metadata/pom.xml +++ b/dubbo-metadata/pom.xml @@ -29,14 +29,14 @@ pom dubbo-metadata-api - + dubbo-metadata-definition-protobuf dubbo-metadata-report-zookeeper dubbo-metadata-report-failover - - - - - + dubbo-metadata-report-redis + dubbo-metadata-report-consul + dubbo-metadata-report-etcd + dubbo-metadata-report-nacos + dubbo-metadata-processor diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java index bebc73ad08..b5b0999c62 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java @@ -27,6 +27,7 @@ public abstract class AbstractServiceDiscovery implements ServiceDiscovery { @Override public void register(ServiceInstance serviceInstance) throws RuntimeException { + this.serviceInstance = serviceInstance; } @Override diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java index 486fd579be..31323efc2f 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java @@ -120,7 +120,7 @@ public abstract class DynamicDirectory extends AbstractDirectory implement private URL turnRegistryUrlToConsumerUrl(URL url) { return URLBuilder.from(url) - .setHost(queryMap.get(REGISTER_IP_KEY)) + .setHost(queryMap.get(REGISTER_IP_KEY) == null ? url.getHost() : queryMap.get(REGISTER_IP_KEY)) .setPort(0) .setProtocol(queryMap.get(PROTOCOL_KEY) == null ? DUBBO : queryMap.get(PROTOCOL_KEY)) .setPath(queryMap.get(INTERFACE_KEY)) diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java index 0c330aab9a..47474f4a9e 100644 --- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java @@ -23,8 +23,8 @@ import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.NamedThreadFactory; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.event.EventListener; +import org.apache.dubbo.registry.client.AbstractServiceDiscovery; import org.apache.dubbo.registry.client.DefaultServiceInstance; -import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; @@ -75,7 +75,7 @@ import static org.apache.dubbo.registry.consul.ConsulParameter.TAGS; /** * 2019-07-31 */ -public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener { +public class ConsulServiceDiscovery extends AbstractServiceDiscovery implements EventListener { private static final Logger logger = LoggerFactory.getLogger(ConsulServiceDiscovery.class); @@ -87,7 +87,7 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener notifiers = new ConcurrentHashMap<>(); private TtlScheduler ttlScheduler; private long checkPassInterval; private URL url; @@ -177,10 +177,12 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener { + if (notifier != null) { + notifier.stop(); + } + }); + notifiers.clear(); notifierExecutor.shutdownNow(); ttlScheduler.stop(); } @@ -194,13 +196,16 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener> response = getHealthServices(serviceName, -1, buildWatchTimeout()); - Long consulIndex = response.getConsulIndex(); - notifier = new ConsulNotifier(serviceName, consulIndex); + Set serviceNames = listener.getServiceNames(); + for (String serviceName : serviceNames) { + ConsulNotifier notifier = notifiers.get(serviceName); + if (notifier == null) { + Response> response = getHealthServices(serviceName, -1, buildWatchTimeout()); + Long consulIndex = response.getConsulIndex(); + notifier = new ConsulNotifier(serviceName, consulIndex); + } + notifierExecutor.execute(notifier); } - notifierExecutor.execute(notifier); } @Override @@ -229,8 +234,10 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener getInstances(String serviceName) throws NullPointerException { Response> response = getHealthServices(serviceName, -1, buildWatchTimeout()); Long consulIndex = response.getConsulIndex(); + ConsulNotifier notifier = notifiers.get(serviceName); if (notifier == null) { notifier = new ConsulNotifier(serviceName, consulIndex); + notifiers.put(serviceName, notifier); } return convert(response.getValue()); } diff --git a/dubbo-registry/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java index 9f10d0ab16..2b6f526957 100644 --- a/dubbo-registry/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java @@ -26,6 +26,7 @@ import com.pszymczyk.consul.ConsulStarterBuilder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -35,6 +36,7 @@ import static java.lang.String.valueOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +@Disabled public class ConsulServiceDiscoveryTest { private URL url; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java index 9ddf3b0651..bb1f9252d4 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java @@ -58,7 +58,9 @@ import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE; import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY; import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE; import static org.apache.dubbo.common.constants.CommonConstants.DISABLED_KEY; +import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL; import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY; +import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY; import static org.apache.dubbo.common.constants.CommonConstants.LOADBALANCE_KEY; import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY; @@ -68,6 +70,7 @@ import static org.apache.dubbo.common.constants.RegistryConstants.PROVIDERS_CATE import static org.apache.dubbo.common.constants.RegistryConstants.ROUTERS_CATEGORY; import static org.apache.dubbo.common.constants.RegistryConstants.ROUTE_PROTOCOL; import static org.apache.dubbo.registry.Constants.CONSUMER_PROTOCOL; +import static org.apache.dubbo.registry.Constants.REGISTER_IP_KEY; import static org.apache.dubbo.rpc.Constants.MOCK_KEY; import static org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK; import static org.apache.dubbo.rpc.cluster.Constants.MOCK_PROTOCOL; @@ -144,13 +147,17 @@ public class RegistryDirectoryTest { @Test public void test_Constructor_CheckStatus() throws Exception { URL url = URL.valueOf("notsupported://10.20.30.40/" + service + "?a=b").addParameterAndEncoded(REFER_KEY, - "foo=bar"); + "foo=bar&" + REGISTER_IP_KEY + "=10.20.30.40&" + INTERFACE_KEY + "=" + service); RegistryDirectory reg = getRegistryDirectory(url); Field field = reg.getClass().getSuperclass().getSuperclass().getDeclaredField("queryMap"); field.setAccessible(true); Map queryMap = (Map) field.get(reg); Assertions.assertEquals("bar", queryMap.get("foo")); - Assertions.assertEquals(url.setProtocol(CONSUMER_PROTOCOL).clearParameters().addParameter("foo", "bar"), reg.getConsumerUrl()); + URL expected = url.setProtocol(DUBBO_PROTOCOL).clearParameters() + .addParameter("foo", "bar") + .addParameter(REGISTER_IP_KEY, "10.20.30.40") + .addParameter(INTERFACE_KEY, service); + Assertions.assertEquals(expected, reg.getConsumerUrl()); } @Test diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java index 596a217ee9..aedf313ef2 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java @@ -19,10 +19,12 @@ package org.apache.dubbo.registry.dubbo; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.ConfigurationUtils; import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.context.ConfigManager; import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.RegistryFactory; import org.apache.dubbo.registry.RegistryService; -import org.apache.dubbo.registry.client.RegistryProtocol; +import org.apache.dubbo.registry.integration.RegistryProtocol; import org.apache.dubbo.registry.support.AbstractRegistry; import org.apache.dubbo.remoting.exchange.ExchangeClient; import org.apache.dubbo.rpc.Exporter; @@ -37,6 +39,7 @@ import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker; import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import org.apache.commons.lang3.ArrayUtils; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -44,7 +47,7 @@ import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.apache.dubbo.registry.client.RegistryProtocol.DEFAULT_REGISTER_PROVIDER_KEYS; +import static org.apache.dubbo.registry.integration.RegistryProtocol.DEFAULT_REGISTER_PROVIDER_KEYS; import static org.apache.dubbo.rpc.cluster.Constants.EXPORT_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -61,7 +64,7 @@ public class RegistryProtocolTest { } final String service = DemoService.class.getName() + ":1.0.0"; - final String serviceUrl = "dubbo://127.0.0.1:9453/" + service + "?notify=true&methods=test1,test2&side=con&side=consumer"; + final String serviceUrl = "dubbo://127.0.0.1:9453/" + service + "?notify=true&methods=test1,test2&side=con&side=consumer®ister.ip=127.0.0.1"; final URL registryUrl = URL.valueOf("registry://127.0.0.1:9090/"); final private Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension(); @@ -72,9 +75,18 @@ public class RegistryProtocolTest { @BeforeEach public void setUp() { ApplicationModel.setApplication("RegistryProtocolTest"); + ConfigManager configManager = ApplicationModel.getConfigManager(); + ApplicationConfig applicationConfig = new ApplicationConfig("dubbo-demo-provider"); + configManager.setApplication(applicationConfig); ApplicationModel.getServiceRepository().registerService(RegistryService.class); } + @AfterEach + public void reset() { + ApplicationModel.getConfigManager().destroy(); + } + + @Test public void testDefaultPort() { RegistryProtocol registryProtocol = getRegistryProtocol(); diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java index 62dcad1267..d8ae08a4ab 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java @@ -64,7 +64,7 @@ public class RegistryStatusCheckerTest { assertEquals(Status.Level.OK, new RegistryStatusChecker().check().getLevel()); String message = new RegistryStatusChecker().check().getMessage(); - Assertions.assertTrue(message.contains(registryUrl.getAddress() + "(connected)")); - Assertions.assertTrue(message.contains(registryUrl2.getAddress() + "(connected)")); + Assertions.assertTrue(message.contains(registryUrl.getHost() + "(connected)")); + Assertions.assertTrue(message.contains(registryUrl2.getHost() + "(connected)")); } } \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java index 7916de2115..39e581855d 100644 --- a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java @@ -24,8 +24,8 @@ import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.ConcurrentHashSet; import org.apache.dubbo.event.EventDispatcher; import org.apache.dubbo.event.EventListener; +import org.apache.dubbo.registry.client.AbstractServiceDiscovery; import org.apache.dubbo.registry.client.DefaultServiceInstance; -import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; @@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * 2019-07-08 */ -public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener { +public class EtcdServiceDiscovery extends AbstractServiceDiscovery implements EventListener { private final static Logger logger = LoggerFactory.getLogger(EtcdServiceDiscovery.class); @@ -158,7 +158,7 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener registerServiceWatcher(serviceName)); } @Override diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java index 91de49da01..a1067f70e4 100644 --- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java @@ -20,11 +20,13 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.common.function.ThrowableFunction; import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.registry.client.AbstractServiceDiscovery; import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; import org.apache.dubbo.registry.nacos.util.NacosNamingServiceUtils; +import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.listener.NamingEvent; import com.alibaba.nacos.api.naming.pojo.Instance; @@ -46,7 +48,7 @@ import static org.apache.dubbo.registry.nacos.util.NacosNamingServiceUtils.toIns * @see ServiceDiscovery * @since 2.7.5 */ -public class NacosServiceDiscovery implements ServiceDiscovery { +public class NacosServiceDiscovery extends AbstractServiceDiscovery { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -70,6 +72,7 @@ public class NacosServiceDiscovery implements ServiceDiscovery { @Override public void register(ServiceInstance serviceInstance) throws RuntimeException { + super.register(serviceInstance); execute(namingService, service -> { Instance instance = toInstance(serviceInstance); service.registerInstance(instance.getServiceName(), group, instance); @@ -79,8 +82,12 @@ public class NacosServiceDiscovery implements ServiceDiscovery { @Override public void update(ServiceInstance serviceInstance) throws RuntimeException { // TODO: Nacos should support - unregister(serviceInstance); - register(serviceInstance); + if (this.serviceInstance == null) { + register(serviceInstance); + } else { + unregister(serviceInstance); + register(serviceInstance); + } } @Override @@ -112,10 +119,16 @@ public class NacosServiceDiscovery implements ServiceDiscovery { public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener) throws NullPointerException, IllegalArgumentException { execute(namingService, service -> { - service.subscribe(listener.getServiceNames(), e -> { // Register Nacos EventListener - if (e instanceof NamingEvent) { - NamingEvent event = (NamingEvent) e; - handleEvent(event, listener); + listener.getServiceNames().forEach(serviceName -> { + try { + service.subscribe(serviceName, e -> { // Register Nacos EventListener + if (e instanceof NamingEvent) { + NamingEvent event = (NamingEvent) e; + handleEvent(event, listener); + } + }); + } catch (NacosException e) { + e.printStackTrace(); } }); }); diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java index 80b7d2ab85..a1277dabe1 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java @@ -23,7 +23,7 @@ import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.DefaultPage; import org.apache.dubbo.common.utils.Page; -import org.apache.dubbo.event.EventDispatcher; +import org.apache.dubbo.registry.client.AbstractServiceDiscovery; import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; @@ -51,22 +51,18 @@ import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkUtils.bui * Zookeeper {@link ServiceDiscovery} implementation based on * Apache Curator X Discovery */ -public class ZookeeperServiceDiscovery implements ServiceDiscovery { +public class ZookeeperServiceDiscovery extends AbstractServiceDiscovery { private final Logger logger = LoggerFactory.getLogger(getClass()); private URL registryURL; - private EventDispatcher dispatcher; - private CuratorFramework curatorFramework; private String rootPath; private org.apache.curator.x.discovery.ServiceDiscovery serviceDiscovery; - private ServiceInstance serviceInstance; - /** * The Key is watched Zookeeper path, the value is an instance of {@link CuratorWatcher} */ @@ -90,20 +86,13 @@ public class ZookeeperServiceDiscovery implements ServiceDiscovery { serviceDiscovery.close(); } - @Override - public ServiceInstance getLocalInstance() { - return serviceInstance; - } - public void register(ServiceInstance serviceInstance) throws RuntimeException { - this.serviceInstance = serviceInstance; doInServiceRegistry(serviceDiscovery -> { serviceDiscovery.registerService(build(serviceInstance)); }); } public void update(ServiceInstance serviceInstance) throws RuntimeException { - this.serviceInstance = serviceInstance; if (isInstanceUpdated(serviceInstance)) { doInServiceRegistry(serviceDiscovery -> { serviceDiscovery.updateService(build(serviceInstance)); diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index f0bb1fff22..7cfba8af64 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -32,15 +32,15 @@ dubbo-registry-api - - + dubbo-registry-default + dubbo-registry-multicast dubbo-registry-zookeeper - - - - + dubbo-registry-redis + dubbo-registry-consul + dubbo-registry-etcd3 + dubbo-registry-nacos dubbo-registry-multiple dubbo-registry-sofa - + dubbo-registry-eureka diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java index 1d8741b06b..6600901621 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java @@ -37,6 +37,7 @@ import org.apache.dubbo.rpc.service.EchoService; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.HashMap; @@ -108,6 +109,7 @@ public class DubboProtocolTest { assertEquals(echo.$echo(1234), 1234); } + @Disabled("Mina has been moved to a separate project") @Test public void testDubboProtocolWithMina() throws Exception { DemoService service = new DemoServiceImpl();