You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/12/04 08:59:46 UTC
[dubbo-samples] branch master updated: Fix isolation executor test cases (#611)
This is an automated email from the ASF dual-hosted git repository.
albumenj 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 0ee5c9aa Fix isolation executor test cases (#611)
0ee5c9aa is described below
commit 0ee5c9aa7eadec9bbad8d7d4901f1b9ea14eedee
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Dec 4 16:59:42 2022 +0800
Fix isolation executor test cases (#611)
* Fix isolation executor test cases
* Enhance isolation executor test cases
---
.../java/org/apache/dubbo/samples/Application.java | 37 ----------------------
2-advanced/pom.xml | 1 -
.../dubbo-samples-isolation-executor/README.md | 0
.../case-configuration.yml | 18 ++++++++---
.../case-versions.conf | 0
.../dubbo-samples-isolation-executor/pom.xml | 8 ++++-
.../java/org/apache/dubbo/samples/Application.java | 7 ++--
.../apache/dubbo/samples/api/ApiIsolationIT.java | 29 ++++++++++-------
.../org/apache/dubbo/samples/spring/BaseTest.java | 8 +++--
.../spring/annotation/AnnotationIsolationIT.java | 10 ++++--
.../annotation/consumer/dubbo/DemoServiceV1.java | 0
.../annotation/consumer/dubbo/HelloServiceV2.java | 0
.../annotation/consumer/dubbo/HelloServiceV3.java | 0
.../annotation/consumer/tri/DemoServiceV1.java | 0
.../annotation/consumer/tri/HelloServiceV2.java | 0
.../annotation/consumer/tri/HelloServiceV3.java | 0
.../annotation/provider/DemoServiceImplV1.java | 2 +-
.../annotation/provider/HelloServiceImplV2.java | 2 +-
.../annotation/provider/HelloServiceImplV3.java | 2 +-
.../spring/support/DemoServiceExecutor.java | 0
.../spring/support/HelloServiceExecutor.java | 0
.../dubbo/samples/spring/xml/XmlIsolationIT.java | 4 ++-
.../apache/dubbo/samples/support/DemoService.java | 0
.../dubbo/samples/support/DemoServiceImpl.java | 4 +--
.../apache/dubbo/samples/support/HelloService.java | 0
.../dubbo/samples/support/HelloServiceImpl.java | 2 +-
.../META-INF/isolation/dubbo-consumer.xml | 4 +--
.../META-INF/isolation/dubbo-provider.xml | 6 ++--
.../src/test}/resources/log4j.properties | 0
99-integration/pom.xml | 1 +
30 files changed, 70 insertions(+), 75 deletions(-)
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.java b/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.java
deleted file mode 100644
index 79a3c910..00000000
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.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.samples;
-
-import org.apache.dubbo.samples.api.ApiIsolationTest;
-import org.apache.dubbo.samples.spring.annotation.AnnotationIsolationTest;
-import org.apache.dubbo.samples.spring.xml.XmlIsolationTest;
-
-public class Application {
- public static void main(String[] args) {
- // Use the Api configuration way and test it
- ApiIsolationTest apiIsolationTest = new ApiIsolationTest();
- apiIsolationTest.test();
-
- // Use the Spring-XML configuration way and test it
- XmlIsolationTest xmlIsolationTest = new XmlIsolationTest();
- xmlIsolationTest.test();
-
- // Use the Spring-Annotation configuration way and test it
- AnnotationIsolationTest annotationIsolationTest = new AnnotationIsolationTest();
- annotationIsolationTest.test();
- }
-}
diff --git a/2-advanced/pom.xml b/2-advanced/pom.xml
index 2fc98d56..a75aef1c 100644
--- a/2-advanced/pom.xml
+++ b/2-advanced/pom.xml
@@ -38,7 +38,6 @@
<module>dubbo-samples-environment-keys</module>
<module>dubbo-samples-generic</module>
<module>dubbo-samples-group</module>
- <module>dubbo-samples-isolation-executor</module>
<module>dubbo-samples-local</module>
<module>dubbo-samples-merge</module>
<module>dubbo-samples-migration</module>
diff --git a/2-advanced/dubbo-samples-isolation-executor/README.md b/99-integration/dubbo-samples-isolation-executor/README.md
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/README.md
rename to 99-integration/dubbo-samples-isolation-executor/README.md
diff --git a/2-advanced/dubbo-samples-isolation-executor/case-configuration.yml b/99-integration/dubbo-samples-isolation-executor/case-configuration.yml
similarity index 73%
rename from 2-advanced/dubbo-samples-isolation-executor/case-configuration.yml
rename to 99-integration/dubbo-samples-isolation-executor/case-configuration.yml
index 5a348d51..942e6a0d 100644
--- a/2-advanced/dubbo-samples-isolation-executor/case-configuration.yml
+++ b/99-integration/dubbo-samples-isolation-executor/case-configuration.yml
@@ -13,8 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from: app-external-zookeeper.yml
+services:
+ zookeeper:
+ image: zookeeper:latest
-props:
- project_name: dubbo-samples-isolation-executor
- main_class: org.apache.dubbo.samples.Application
+ dubbo-samples-isolation-executor-test:
+ type: test
+ basedir: .
+ tests:
+ - "**/*IT.class"
+ systemProps:
+ - zookeeper.address=zookeeper
+ waitPortsBeforeRun:
+ - zookeeper:2181
+ depends_on:
+ - zookeeper
\ No newline at end of file
diff --git a/2-advanced/dubbo-samples-isolation-executor/case-versions.conf b/99-integration/dubbo-samples-isolation-executor/case-versions.conf
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/case-versions.conf
rename to 99-integration/dubbo-samples-isolation-executor/case-versions.conf
diff --git a/2-advanced/dubbo-samples-isolation-executor/pom.xml b/99-integration/dubbo-samples-isolation-executor/pom.xml
similarity index 93%
rename from 2-advanced/dubbo-samples-isolation-executor/pom.xml
rename to 99-integration/dubbo-samples-isolation-executor/pom.xml
index 495bd79b..4c665b65 100644
--- a/2-advanced/dubbo-samples-isolation-executor/pom.xml
+++ b/99-integration/dubbo-samples-isolation-executor/pom.xml
@@ -26,7 +26,7 @@
<version>1.0-SNAPSHOT</version>
<properties>
- <dubbo.version>3.2.0-beta.1</dubbo.version>
+ <dubbo.version>3.2.0-beta.2</dubbo.version>
<junit.version>4.12</junit.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<source.level>1.8</source.level>
@@ -85,6 +85,12 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoService.java b/99-integration/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.java
similarity index 87%
copy from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoService.java
copy to 99-integration/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.java
index 5ea98c1a..e1413abb 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoService.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/Application.java
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.samples.support;
+package org.apache.dubbo.samples;
-public interface DemoService {
- String sayName(String name);
+public class Application {
+ public static void main(String[] args) {
+ }
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/api/ApiIsolationTest.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/api/ApiIsolationIT.java
similarity index 89%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/api/ApiIsolationTest.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/api/ApiIsolationIT.java
index 0ef4b851..f36cf5b1 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/api/ApiIsolationTest.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/api/ApiIsolationIT.java
@@ -32,6 +32,9 @@ import org.apache.dubbo.samples.support.DemoServiceImpl;
import org.apache.dubbo.samples.support.HelloService;
import org.apache.dubbo.samples.support.HelloServiceImpl;
+import org.junit.Assert;
+import org.junit.Test;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
@@ -39,14 +42,16 @@ import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_ISOLATION;
-public class ApiIsolationTest {
+public class ApiIsolationIT {
private static final String version1 = "1.0";
private static final String version2 = "2.0";
private static final String version3 = "3.0";
+ @Test
public void test() {
- RegistryConfig registryConfig = new RegistryConfig("zookeeper://127.0.0.1:2181");
+ String zookeeperHost = System.getProperty("zookeeper.address", "127.0.0.1");
+ RegistryConfig registryConfig = new RegistryConfig("zookeeper://" + zookeeperHost + ":2181");
DubboBootstrap providerBootstrap = null;
DubboBootstrap consumerBootstrap1 = null;
@@ -62,7 +67,7 @@ public class ApiIsolationTest {
serviceConfig1.setRef(new DemoServiceImpl());
serviceConfig1.setVersion(version1);
// set executor1 for serviceConfig1, max threads is 10
- NamedThreadFactory threadFactory1 = new NamedThreadFactory("DemoService-executor");
+ NamedThreadFactory threadFactory1 = new NamedThreadFactory("DemoServiceExecutor");
ExecutorService executor1 = Executors.newFixedThreadPool(10, threadFactory1);
serviceConfig1.setExecutor(executor1);
@@ -71,7 +76,7 @@ public class ApiIsolationTest {
serviceConfig2.setRef(new HelloServiceImpl());
serviceConfig2.setVersion(version2);
// set executor2 for serviceConfig2, max threads is 100
- NamedThreadFactory threadFactory2 = new NamedThreadFactory("HelloService-executor");
+ NamedThreadFactory threadFactory2 = new NamedThreadFactory("HelloServiceExecutor");
ExecutorService executor2 = Executors.newFixedThreadPool(100, threadFactory2);
serviceConfig2.setExecutor(executor2);
@@ -147,17 +152,19 @@ public class ApiIsolationTest {
HelloService helloServiceV2 = consumerBootstrap.getCache().get(HelloService.class.getName() + ":" + version2);
HelloService helloServiceV3 = consumerBootstrap.getCache().get(HelloService.class.getName() + ":" + version3);
for (int i = 0; i < 250; i++) {
- String response = demoServiceV1.sayName("name, version = " + version1);
- assert response.equals("say:" + "name, version = " + version1);
+ String invocation = "hello, version = " + version1;
+ String response = demoServiceV1.sayName(invocation);
+ Assert.assertTrue(response.startsWith("say: " + invocation + " from DemoServiceExecutor"));
}
for (int i = 0; i < 250; i++) {
- String response = helloServiceV2.sayHello("hello, version = " + version2);
- assert response.equals("Hello, " + response);
-
+ String invocation = "hello, version = " + version2;
+ String response = helloServiceV2.sayHello(invocation);
+ Assert.assertTrue(response.startsWith("Hello, " + invocation + " from HelloServiceExecutor"));
}
for (int i = 0; i < 250; i++) {
- String response = helloServiceV3.sayHello("hello, version = " + version3);
- assert response.equals("Hello, " + response);
+ String invocation = "hello, version = " + version3;
+ String response = helloServiceV3.sayHello(invocation);
+ Assert.assertTrue(response.startsWith("Hello, " + invocation + " from DubboServerHandler"));
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/BaseTest.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/BaseTest.java
similarity index 94%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/BaseTest.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/BaseTest.java
index fbd392f8..589e996c 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/BaseTest.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/BaseTest.java
@@ -27,6 +27,7 @@ import org.apache.dubbo.samples.spring.support.HelloServiceExecutor;
import org.apache.dubbo.samples.support.DemoService;
import org.apache.dubbo.samples.support.HelloService;
+import org.junit.Assert;
import org.springframework.context.ApplicationContext;
import java.util.Map;
@@ -88,16 +89,17 @@ public abstract class BaseTest {
private void rpcInvoke(DemoService demoServiceV1, HelloService helloServiceV2, HelloService helloServiceV3) {
for (int i = 0; i < 250; i++) {
String response = demoServiceV1.sayName("name");
- assert response.equals("say:" + response);
+ Assert.assertTrue(response.startsWith("say: name from DemoServiceExecutor"));
}
for (int i = 0; i < 250; i++) {
String response = helloServiceV2.sayHello("hello");
- assert response.equals("Hello, " + response);
+ Assert.assertTrue(response.startsWith("Hello, hello from HelloServiceExecutor"));
}
for (int i = 0; i < 250; i++) {
String response = helloServiceV3.sayHello("hello");
- assert response.equals("Hello, " + response);
+ Assert.assertTrue(response.startsWith("Hello, hello from DubboServerHandler"));
}
+
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationTest.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationIT.java
similarity index 92%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationTest.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationIT.java
index c274dc75..682dba16 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationTest.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/AnnotationIsolationIT.java
@@ -25,6 +25,7 @@ import org.apache.dubbo.samples.spring.BaseTest;
import org.apache.dubbo.samples.spring.support.DemoServiceExecutor;
import org.apache.dubbo.samples.spring.support.HelloServiceExecutor;
+import org.junit.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -35,8 +36,9 @@ import java.util.concurrent.Executor;
import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_ISOLATION;
-public class AnnotationIsolationTest extends BaseTest {
+public class AnnotationIsolationIT extends BaseTest {
+ @Test
public void test() {
// start provider app
AnnotationConfigApplicationContext providerContext = new AnnotationConfigApplicationContext(ProviderConfiguration.class);
@@ -73,7 +75,8 @@ public class AnnotationIsolationTest extends BaseTest {
@Bean
public RegistryConfig registryConfig() {
RegistryConfig registryConfig = new RegistryConfig();
- registryConfig.setAddress("zookeeper://127.0.0.1:2181");
+ String zookeeperHost = System.getProperty("zookeeper.address", "127.0.0.1");
+ registryConfig.setAddress("zookeeper://" + zookeeperHost + ":2181");
return registryConfig;
}
@@ -91,7 +94,8 @@ public class AnnotationIsolationTest extends BaseTest {
@Bean
public RegistryConfig registryConfig() {
RegistryConfig registryConfig = new RegistryConfig();
- registryConfig.setAddress("zookeeper://127.0.0.1:2181");
+ String zookeeperHost = System.getProperty("zookeeper.address", "127.0.0.1");
+ registryConfig.setAddress("zookeeper://" + zookeeperHost + ":2181");
return registryConfig;
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/DemoServiceV1.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/DemoServiceV1.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/DemoServiceV1.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/DemoServiceV1.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV2.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV2.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV2.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV2.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV3.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV3.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV3.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/dubbo/HelloServiceV3.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/DemoServiceV1.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/DemoServiceV1.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/DemoServiceV1.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/DemoServiceV1.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV2.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV2.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV2.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV2.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV3.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV3.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV3.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/consumer/tri/HelloServiceV3.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java
similarity index 93%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java
index 6bf3cfde..2e554f43 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/DemoServiceImplV1.java
@@ -23,6 +23,6 @@ import org.apache.dubbo.samples.support.DemoService;
public class DemoServiceImplV1 implements DemoService {
@Override
public String sayName(String name) {
- return "server name";
+ return "say: " + name + " from " + Thread.currentThread().getName();
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java
similarity index 94%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java
index 94810eeb..76074fcc 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV2.java
@@ -28,6 +28,6 @@ public class HelloServiceImplV2 implements HelloService {
@Override
public String sayHello(String name) {
- return "server hello";
+ return "Hello, " + name + " from " + Thread.currentThread().getName();
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java
similarity index 94%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java
index a72cdbbe..584179f4 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/annotation/provider/HelloServiceImplV3.java
@@ -28,7 +28,7 @@ public class HelloServiceImplV3 implements HelloService {
@Override
public String sayHello(String name) {
- return "server hello";
+ return "Hello, " + name + " from " + Thread.currentThread().getName();
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/support/DemoServiceExecutor.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/support/DemoServiceExecutor.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/support/DemoServiceExecutor.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/support/DemoServiceExecutor.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/support/HelloServiceExecutor.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/support/HelloServiceExecutor.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/support/HelloServiceExecutor.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/support/HelloServiceExecutor.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/xml/XmlIsolationTest.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/xml/XmlIsolationIT.java
similarity index 96%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/xml/XmlIsolationTest.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/xml/XmlIsolationIT.java
index 2ea836cf..1017ce3b 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/spring/xml/XmlIsolationTest.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/spring/xml/XmlIsolationIT.java
@@ -19,12 +19,14 @@ package org.apache.dubbo.samples.spring.xml;
import org.apache.dubbo.config.ServiceConfig;
import org.apache.dubbo.samples.spring.BaseTest;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.Map;
-public class XmlIsolationTest extends BaseTest {
+public class XmlIsolationIT extends BaseTest {
+ @Test
public void test() {
// start provider app
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext("META-INF/isolation/dubbo-provider.xml");
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoService.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/DemoService.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoService.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/DemoService.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoServiceImpl.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/DemoServiceImpl.java
similarity index 89%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoServiceImpl.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/DemoServiceImpl.java
index 36e1cb8a..2174072a 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/DemoServiceImpl.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/DemoServiceImpl.java
@@ -18,9 +18,9 @@ package org.apache.dubbo.samples.support;
public class DemoServiceImpl implements DemoService {
- private String prefix = "say:";
+ private String prefix = "say: ";
public String sayName(String name) {
- return prefix + name;
+ return prefix + name + " from " + Thread.currentThread().getName();
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/HelloService.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/HelloService.java
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/HelloService.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/HelloService.java
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/HelloServiceImpl.java b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/HelloServiceImpl.java
similarity index 92%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/HelloServiceImpl.java
rename to 99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/HelloServiceImpl.java
index 12a5a664..4e0e22fd 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/java/org/apache/dubbo/samples/support/HelloServiceImpl.java
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/java/org/apache/dubbo/samples/support/HelloServiceImpl.java
@@ -19,6 +19,6 @@ package org.apache.dubbo.samples.support;
public class HelloServiceImpl implements HelloService {
public String sayHello(String name) {
- return "Hello, " + name;
+ return "Hello, " + name + " from " + Thread.currentThread().getName();
}
}
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-consumer.xml b/99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-consumer.xml
similarity index 92%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-consumer.xml
rename to 99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-consumer.xml
index 7794d55c..b2429fe3 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-consumer.xml
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-consumer.xml
@@ -24,9 +24,9 @@
<dubbo:application name="demo-consumer">
</dubbo:application>
- <dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:metadata-report address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
- <dubbo:registry id="demo1" address="zookeeper://127.0.0.1:2181?registry-type=service"/>
+ <dubbo:registry id="demo1" address="zookeeper://${zookeeper.address:127.0.0.1}:2181?registry-type=service"/>
<!-- refer with dubbo protocol-->
<dubbo:reference version="1.0.0" group="Group1" id="dubbo-demoServiceV1" check="false" scope="remote"
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-provider.xml b/99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-provider.xml
similarity index 91%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-provider.xml
rename to 99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-provider.xml
index 74677f67..04211761 100644
--- a/2-advanced/dubbo-samples-isolation-executor/src/main/resources/META-INF/isolation/dubbo-provider.xml
+++ b/99-integration/dubbo-samples-isolation-executor/src/test/resources/META-INF/isolation/dubbo-provider.xml
@@ -25,9 +25,9 @@
<dubbo:application name="demo-provider" executor-management-mode="isolation">
</dubbo:application>
- <dubbo:config-center address="zookeeper://127.0.0.1:2181"/>
- <dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
- <dubbo:registry id="registry1" address="zookeeper://127.0.0.1:2181?registry-type=service"/>
+ <dubbo:config-center address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
+ <dubbo:metadata-report address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
+ <dubbo:registry id="registry1" address="zookeeper://${zookeeper.address:127.0.0.1}:2181?registry-type=service"/>
<dubbo:protocol name="dubbo" port="-1"/>
<dubbo:protocol name="tri" port="-1"/>
diff --git a/2-advanced/dubbo-samples-isolation-executor/src/main/resources/log4j.properties b/99-integration/dubbo-samples-isolation-executor/src/test/resources/log4j.properties
similarity index 100%
rename from 2-advanced/dubbo-samples-isolation-executor/src/main/resources/log4j.properties
rename to 99-integration/dubbo-samples-isolation-executor/src/test/resources/log4j.properties
diff --git a/99-integration/pom.xml b/99-integration/pom.xml
index aba5d9e3..2338f1b6 100644
--- a/99-integration/pom.xml
+++ b/99-integration/pom.xml
@@ -30,6 +30,7 @@
<module>dubbo-samples-empty-protection</module>
<module>dubbo-samples-empty-protection-nacos</module>
<module>dubbo-samples-hibernate</module>
+ <module>dubbo-samples-isolation-executor</module>
<module>dubbo-samples-metadata-report</module>
<module>dubbo-samples-mybatis</module>
<module>dubbo-samples-nacos-merge</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org