You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/12/29 09:58:59 UTC
[skywalking] branch master updated: Checkstyle plugin checks test
codes (#6003)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new c010481 Checkstyle plugin checks test codes (#6003)
c010481 is described below
commit c010481cf69d423dd0e12c520f0b69e8d8ae7776
Author: vcjmhg <zh...@163.com>
AuthorDate: Tue Dec 29 17:58:34 2020 +0800
Checkstyle plugin checks test codes (#6003)
---
.github/workflows/plugins-jdk14-test.0.yaml | 11 +++-
.github/workflows/plugins-test.0.yaml | 2 +
.github/workflows/plugins-test.1.yaml | 2 +
.github/workflows/plugins-test.2.yaml | 2 +
.github/workflows/plugins-test.3.yaml | 4 ++
test/plugin/pom.xml | 65 +++++++++++++++++++++-
test/plugin/run.sh | 8 +++
.../test/helper/AbstractRunningGenerator.java | 1 -
.../plugin/test/helper/ConfigurationImpl.java | 6 +-
.../helper/DockerContainerRunningGenerator.java | 1 -
.../plugin/test/helper/vo/CaseConfiguration.java | 7 ++-
.../plugin/test/helper/vo/DependencyComponent.java | 7 ++-
.../plugin/test/helper/vo/DockerService.java | 2 +-
.../runner-helper/src/main/resources/scenario.sh | 18 +++---
.../src/test/resources/docker-compose-test.yml | 4 +-
.../config/expectedData.yaml | 16 +++---
.../apm/testcase/toolkit}/Application.java | 2 +-
.../toolkit/controller/TestController.java | 2 +-
.../testcase/toolkit/controller/TestService.java | 2 +-
.../baidu.brpc/controller/CaseController.java | 3 -
.../baidu.brpc/service/EchoServiceImpl.java | 1 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 +++---
.../provider/interceptor/ProviderInterceptor.java | 10 ++--
.../config/customize_enhance.xml | 6 +-
.../customize-scenario/config/expectedData.yaml | 2 +-
.../apm/testcase/customize/Application.java | 2 +-
.../customize/controller/CustomizeController.java | 10 ++--
.../apm/testcase/customize/model/Model0.java | 2 +-
.../apm/testcase/customize/model/Model1.java | 2 +-
.../testcase/customize/service/TestService1.java | 5 +-
.../testcase/customize/service/TestService2.java | 2 +-
.../skywalking/apm/testcase/cxf/Application.java | 3 -
.../apm/testcase/cxf/service/UserService.java | 9 +--
.../skywalking/apm/testcase/dbcp/MysqlConfig.java | 22 ++++----
.../testcase/dbcp/controller/CaseController.java | 4 +-
.../apm/testcase/dbcp/service/CaseService.java | 6 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 4 +-
.../elasticsearch/RestHighLevelClientCase.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../config/TransportClientConfig.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../elasticsearch/controller/CaseController.java | 2 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 22 ++++----
.../apm/testcase/exceptionchecker/Application.java | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exceptionchecker/service/TestService.java | 10 ++--
.../config/expectedData.yaml | 22 ++++----
.../configuration.yml | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exception/TestOtherClassLoaderException.java | 4 +-
.../exceptionchecker/service/TestService.java | 10 ++--
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/RestController.java | 10 ++--
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../graphql/configuration/GraphSchema.java | 2 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 +++---
.../testcase/grpc/controller/CaseController.java | 6 +-
.../provider/interceptor/ProviderInterceptor.java | 12 ++--
.../testcase/hbase/controller/HBaseController.java | 26 +++++++--
.../influxdb/controller/CaseController.java | 16 +++---
.../influxdb/executor/InfluxDBExecutor.java | 58 +++++++++----------
.../jdk-threading-scenario/bin/startup.sh | 2 +-
.../config/expectedData.yaml | 4 +-
.../apm/testcase/jdk/threading/Application.java | 2 +-
.../apm/testcase/kafka}/Application.java | 2 +-
.../testcase/kafka/controller/CaseController.java | 2 +-
.../testcase/logger/controller/CaseController.java | 6 +-
.../testcase/logger/controller/CaseController.java | 9 +--
.../testcase/logger/controller/CaseController.java | 8 +--
.../apm/testcase/mariadb/MariadbConfig.java | 18 +++---
.../mariadb/controller/CaseController.java | 2 -
.../mongodb/controller/CaseController.java | 6 +-
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 +++---
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 +++---
.../skywalking/apm/testcase/mysql/MysqlConfig.java | 18 +++---
.../testcase/mysql/controller/CaseController.java | 2 -
.../apm/testcase/pulsar/Application.java | 4 +-
.../testcase/pulsar/controller/CaseController.java | 2 +-
.../apm/testcase/quartzscheduler/job/DemoJob.java | 4 +-
.../testcase/quartzscheduler/job/QuartzConfig.java | 10 +++-
.../apm/testcase/redisson/Application.java | 2 +-
.../redisson/controller/CaseController.java | 2 +-
.../apm/testcase/retransform}/Application.java | 2 +-
.../apm/testcase/retransform}/RetransformUtil.java | 12 ++--
.../retransform}/controller/CaseController.java | 7 +--
.../apm/testcase/retransform}/CaseController.java | 7 +--
.../apm/testcase/retransform}/RetransformUtil.java | 12 ++--
.../apm/testcase/retransform}/StartupListener.java | 2 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 6 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 9 +--
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 ---
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 ---
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../sofarpc/controller/CaseController.java | 2 +-
.../spring-3.0.x-scenario/config/expectedData.yaml | 6 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-3.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 16 +++---
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 16 +++---
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.3.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../implinterface/TestCaseController.java} | 19 ++++---
.../testcase/implinterface/TestCaseInterface.java} | 22 +++-----
.../apm/testcase/inherit/ChildController.java} | 13 ++---
.../apm/testcase/inherit/ParentController.java} | 22 +++-----
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 22 ++++----
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../testcase/implinterface/TestCaseController.java | 36 ------------
.../testcase/implinterface/TestCaseInterface.java | 31 -----------
.../apm/testcase/inherit/ChildController.java | 29 ----------
.../apm/testcase/inherit/ParentController.java | 33 -----------
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/BackController.java | 18 ++++--
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 2 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../scheduled/controller/CaseController.java | 2 +-
.../spring/scheduled/job/SchedulingJob.java | 8 +--
.../spring-tx-scenario/config/expectedData.yaml | 2 +-
.../testcase/spring/transaction/Application.java | 2 +-
.../spring/transaction/config/JdbcConfig.java | 2 +-
.../transaction/config/TransactionConfig.java | 2 +-
.../transaction/controller/CaseController.java | 4 +-
.../testcase/spring/transaction/dao/DemoDao.java | 2 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java | 4 +-
.../spring/transaction/service/DemoService.java | 2 +-
.../transaction/service/impl/DemoServiceImpl.java | 6 +-
.../apm/testcase/thrift/client/Application.java | 4 +-
.../thrift/client/controller/CaseController.java | 2 +-
.../thrift/client/service/AsyncClient.java | 6 +-
.../testcase/thrift/client/service/HttpClient.java | 1 -
.../testcase/thrift/server/service/IServer.java | 1 -
.../apm/testcase/vertxeventbus/Application.java | 1 +
.../vertxeventbus/controller/ClusterReceiver.java | 1 +
.../vertxeventbus/controller/LocalReceiver.java | 1 +
.../controller/VertxEventbusController.java | 5 +-
.../testcase/vertxeventbus/util/CustomMessage.java | 1 +
.../vertxeventbus/util/CustomMessageCodec.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../controller/TestAnnotationController.java | 4 +-
.../sc/webflux/projectB/route/TestHandler.java | 2 +-
.../xxl-job-2.x-scenario/config/expectedData.yaml | 4 +-
.../apm/testcase/xxljob/job/XXLJobConfig.java | 2 +-
.../apm/testcase/xxljob/job/BeanJob.java | 2 +-
201 files changed, 649 insertions(+), 689 deletions(-)
diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml
index db3ffdd..2464549 100644
--- a/.github/workflows/plugins-jdk14-test.0.yaml
+++ b/.github/workflows/plugins-jdk14-test.0.yaml
@@ -39,6 +39,11 @@ jobs:
name: jdk14
runs-on: ubuntu-18.04
timeout-minutes: 90
+ strategy:
+ fail-fast: true
+ matrix:
+ case:
+ - jdk14-with-gson-scenario
steps:
- uses: actions/checkout@v2
with:
@@ -53,6 +58,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
@@ -60,7 +67,7 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 14
- - name: jdk14-with-gson-scenario (1)
- run: bash test/plugin/run.sh --image_version=jdk14-1.0.0 jdk14-with-gson-scenario
+ - name: ${{ matrix.case }}
+ run: bash test/plugin/run.sh --image_version=jdk14-1.0.0 ${{ matrix.case }}
- name: Report Coverage
run: bash -x tools/coverage/report.sh
diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml
index 083561b..77b06b5 100644
--- a/.github/workflows/plugins-test.0.yaml
+++ b/.github/workflows/plugins-test.0.yaml
@@ -84,6 +84,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml
index 0d68244..318b3a7 100644
--- a/.github/workflows/plugins-test.1.yaml
+++ b/.github/workflows/plugins-test.1.yaml
@@ -79,6 +79,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml
index 3d7595e..4e4030e 100644
--- a/.github/workflows/plugins-test.2.yaml
+++ b/.github/workflows/plugins-test.2.yaml
@@ -81,6 +81,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
index 1559371..ebc6325 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -86,6 +86,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"${{ matrix.case }}"'<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
@@ -106,6 +108,8 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 8
+ - name: Add checkstyle-plugin
+ run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/oracle-scenario<\/sourceDirectory>' test/plugin/pom.xml
- name: Build SkyWalking Agent
run: ./mvnw --batch-mode clean package -DskipTests -Pagent
- name: Build Docker image
diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index 2baab0e..eb7afeb 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -15,7 +15,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +32,7 @@
<module>runner-helper</module>
<module>agent-test-tools</module>
<module>containers</module>
- </modules>
+ </modules>
<properties>
<java.version>8</java.version>
@@ -46,6 +48,7 @@
<snakeyaml.version>1.24</snakeyaml.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <checkstyle.fails.on.error>true</checkstyle.fails.on.error>
</properties>
<dependencies>
@@ -88,6 +91,22 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>8.38</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -99,6 +118,48 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <configLocation>${maven.multiModuleProjectDirectory}/apm-checkstyle/checkStyle.xml</configLocation>
+ <headerLocation>${maven.multiModuleProjectDirectory}/apm-checkstyle/CHECKSTYLE_HEAD</headerLocation>
+ <encoding>UTF-8</encoding>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <failOnViolation>${checkstyle.fails.on.error}</failOnViolation>
+ <sourceDirectories>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+ </sourceDirectories>
+ <resourceIncludes>
+ **/*.properties,
+ **/*.sh,
+ **/*.bat,
+ **/*.yml,
+ **/*.yaml,
+ **/*.xml
+ </resourceIncludes>
+ <excludes>
+ **/target/generated-test-sources/**,
+ **/target/generated-sources/**,
+ **/org/apache/skywalking/apm/testcase/baidu.brpc/interfaces/Echo.java,
+ **/org/apache/skywalking/apm/testcase/grpc/proto/*.java
+ </excludes>
+ <propertyExpansion>
+ import.control=${maven.multiModuleProjectDirectory}/apm-checkstyle/importControl.xml
+ </propertyExpansion>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index 2a09008..e6c052e 100755
--- a/test/plugin/run.sh
+++ b/test/plugin/run.sh
@@ -140,11 +140,19 @@ if [[ ! -d ${agent_home} ]]; then
echo "[WARN] SkyWalking Agent not exists"
${mvnw} --batch-mode -f ${home}/../../pom.xml -Pagent -DskipTests clean package
fi
+# if it fails last time, relevant information will be deleted
+sed -i '/<sourceDirectory>scenarios\/'"$scenario_name"'<\/sourceDirectory>/d' ./pom.xml
+# add scenario_name into plugin/pom.xml
+echo check code with the checkstyle-plugin
+sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/'"$scenario_name"'<\/sourceDirectory>' ./pom.xml
+
if [[ "$force_build" == "on" ]]; then
profile=
[[ $image_version =~ "jdk14-" ]] && profile="-Pjdk14"
${mvnw} --batch-mode -f ${home}/pom.xml clean package -DskipTests ${profile}
fi
+# remove scenario_name into plugin/pom.xml
+sed -i '/<sourceDirectory>scenarios\/'"$scenario_name"'<\/sourceDirectory>/d' ./pom.xml
workspace="${home}/workspace/${scenario_name}"
[[ -d ${workspace} ]] && rm -rf $workspace
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java
index 1807486..928fdda 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java
@@ -22,7 +22,6 @@ import freemarker.template.TemplateExceptionHandler;
import java.io.File;
import java.io.FileWriter;
import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java
index d3e9536..0df1dfb 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java
@@ -185,7 +185,7 @@ public class ConfigurationImpl implements IConfiguration {
root.put("expose", caseConfiguration().getExpose());
root.put("hostname", caseConfiguration().getHostname());
- root.put("depends_on", caseConfiguration().getDepends_on());
+ root.put("depends_on", caseConfiguration().getDependsOn());
root.put("environments", caseConfiguration().getEnvironment());
root.put("network_name", dockerNetworkName());
@@ -240,10 +240,10 @@ public class ConfigurationImpl implements IConfiguration {
service.setName(name);
service.setImageName(imageName);
service.setExpose(dependency.getExpose());
- service.setLinks(dependency.getDepends_on());
+ service.setLinks(dependency.getDependsOn());
service.setStartScript(dependency.getStartScript());
service.setHostname(dependency.getHostname());
- service.setDepends_on(dependency.getDepends_on());
+ service.setDependsOn(dependency.getDependsOn());
service.setEntrypoint(dependency.getEntrypoint());
service.setHealthcheck(dependency.getHealthcheck());
service.setEnvironment(dependency.getEnvironment());
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java
index f7e923d..ecda601 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java
@@ -19,7 +19,6 @@ package org.apache.skywalking.plugin.test.helper;
import java.io.StringWriter;
import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java
index b0dc410..a6d3bb2 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java
@@ -34,8 +34,13 @@ public class CaseConfiguration {
private Map<String, DependencyComponent> dependencies;
private List<String> environment;
private List<String> expose;
- private List<String> depends_on;
+ private List<String> dependsOn;
private String runningMode;
private String withPlugins;
private List<RequestHeader> extendEntryHeader;
+
+ //make sure that depends_on can be set correctly
+ public void setDepends_on(List<String> dependsOn) {
+ this.dependsOn = dependsOn;
+ }
}
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java
index c294f25..94cd16b 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java
@@ -34,6 +34,11 @@ public class DependencyComponent {
private List<String> expose;
private List<String> entrypoint;
private List<String> environment;
- private List<String> depends_on;
+ private List<String> dependsOn;
private List<String> healthcheck;
+
+ //make sure that depends_on can be set correctly
+ public void setDepends_on(List<String> dependsOn) {
+ this.dependsOn = dependsOn;
+ }
}
diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java
index 269c208..f0cf90b 100644
--- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java
+++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java
@@ -34,6 +34,6 @@ public class DockerService {
private List<String> expose;
private List<String> entrypoint;
private List<String> healthcheck;
- private List<String> depends_on;
+ private List<String> dependsOn;
private List<String> environment;
}
diff --git a/test/plugin/runner-helper/src/main/resources/scenario.sh b/test/plugin/runner-helper/src/main/resources/scenario.sh
index 347980a..4bb05c4 100644
--- a/test/plugin/runner-helper/src/main/resources/scenario.sh
+++ b/test/plugin/runner-helper/src/main/resources/scenario.sh
@@ -1,12 +1,9 @@
-#!/usr/bin/env bash
-
-# 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
+# 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
#
@@ -15,6 +12,9 @@
# 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.
+#
+
+#!/usr/bin/env bash
[[ -n $1 ]] && set -ex
diff --git a/test/plugin/runner-helper/src/test/resources/docker-compose-test.yml b/test/plugin/runner-helper/src/test/resources/docker-compose-test.yml
index 448178c..58194c9 100644
--- a/test/plugin/runner-helper/src/test/resources/docker-compose-test.yml
+++ b/test/plugin/runner-helper/src/test/resources/docker-compose-test.yml
@@ -11,8 +11,8 @@
# 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.o
-
+# limitations under the License.
+#
version: '2.1'
services:
async-testcase:
diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml b/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml
index d56a438..2a574f1 100644
--- a/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/config/expectedData.yaml
@@ -22,7 +22,7 @@ segmentItems:
- {operationName: tool-kit-set-operation-name, parentSpanId: 0,
spanId: 1, spanLayer: Unknown, startTime: nq 0, endTime: nq 0,
componentId: 0, isError: false, spanType: Local, peer: '', skipAnalysis: true}
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTag()
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTag()
parentSpanId: 0
spanId: 2
spanLayer: Unknown
@@ -35,7 +35,7 @@ segmentItems:
tags:
- {key: key, value: value}
skipAnalysis: 'true'
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testInfo(java.lang.String)
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testInfo(java.lang.String)
parentSpanId: 0
spanId: 3
spanLayer: Unknown
@@ -52,7 +52,7 @@ segmentItems:
tags:
- {key: testTag, value: testInfoParam}
skipAnalysis: 'true'
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testDebug()
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testDebug()
parentSpanId: 0
spanId: 4
spanLayer: Unknown
@@ -67,11 +67,11 @@ segmentItems:
- {key: event, value: debug}
- {key: message, value: TestDebugMsg}
skipAnalysis: 'true'
- - {operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testError(),
+ - {operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testError(),
parentSpanId: 0, spanId: 5, spanLayer: Unknown, startTime: nq 0, endTime: nq 0,
componentId: 0, isError: true, spanType: Local, peer: '',
skipAnalysis: 'true'}
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testErrorMsg()
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testErrorMsg()
parentSpanId: 0
spanId: 6
spanLayer: Unknown
@@ -86,7 +86,7 @@ segmentItems:
- {key: event, value: error}
- {key: message, value: TestErrorMsg}
skipAnalysis: 'true'
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testErrorThrowable()
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testErrorThrowable()
parentSpanId: 0
spanId: 7
spanLayer: Unknown
@@ -103,7 +103,7 @@ segmentItems:
- {key: message, value: Test-Exception}
- {key: stack, value: not null}
skipAnalysis: 'true'
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTagAnnotation(java.lang.String,java.lang.String)
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTagAnnotation(java.lang.String,java.lang.String)
parentSpanId: 0
spanId: 8
spanLayer: Unknown
@@ -117,7 +117,7 @@ segmentItems:
- {key: p1, value: testTagAnnotationParam1}
- {key: p2, value: testTagAnnotationParam2}
skipAnalysis: 'true'
- - operationName: test.org.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTagAnnotationReturnInfo(java.lang.String,java.lang.Integer)
+ - operationName: test.apache.skywalking.apm.testcase.toolkit.controller.TestService.testTagAnnotationReturnInfo(java.lang.String,java.lang.Integer)
parentSpanId: 0
spanId: 9
spanLayer: Unknown
diff --git a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/Application.java
similarity index 95%
rename from test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java
rename to test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/Application.java
index 47b8d78..78b5cfe 100644
--- a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java
+++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.kafka;
+package test.apache.skywalking.apm.testcase.toolkit;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestController.java
similarity index 98%
rename from test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java
rename to test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestController.java
index 6fdd302..b581cfc 100644
--- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java
+++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.toolkit.controller;
+package test.apache.skywalking.apm.testcase.toolkit.controller;
import org.apache.http.HttpEntity;
import org.apache.http.client.ResponseHandler;
diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestService.java
similarity index 97%
rename from test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java
rename to test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestService.java
index ce7f44f..f37ac97 100644
--- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java
+++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit/controller/TestService.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.toolkit.controller;
+package test.apache.skywalking.apm.testcase.toolkit.controller;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
diff --git a/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/controller/CaseController.java b/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/controller/CaseController.java
index 9321eb7..e6e5bfa 100644
--- a/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/controller/CaseController.java
+++ b/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/controller/CaseController.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.apm.testcase.baidu.brpc.controller;
-import com.baidu.brpc.RpcContext;
import com.baidu.brpc.client.BrpcProxy;
import com.baidu.brpc.client.RpcClient;
import com.baidu.brpc.client.RpcClientOptions;
@@ -38,7 +37,6 @@ public class CaseController {
private static final String SUCCESS = "Success";
-
@RequestMapping("/healthCheck")
@ResponseBody
public String healthCheck() {
@@ -66,7 +64,6 @@ public class CaseController {
EchoService echoService = BrpcProxy.getProxy(rpcClient, EchoService.class);
try {
EchoResponse response = echoService.echo(request);
- System.out.println(response.getMessage());
} catch (RpcException ex) {
}
rpcClient.stop();
diff --git a/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/service/EchoServiceImpl.java b/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/service/EchoServiceImpl.java
index 586d31e..b1f96d7 100755
--- a/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/service/EchoServiceImpl.java
+++ b/test/plugin/scenarios/baidu-brpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/baidu.brpc/service/EchoServiceImpl.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.apm.testcase.baidu.brpc.service;
-
import com.baidu.brpc.RpcContext;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
diff --git a/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java b/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
index 5470e7c..e8a35d0 100644
--- a/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
+++ b/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
@@ -36,16 +36,16 @@ public class ConsumerInterceptor implements ClientInterceptor {
private static final Logger LOGGER = LogManager.getLogger(ConsumerInterceptor.class);
@Override
- public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> descriptor,
- CallOptions options, Channel channel) {
+ public <REQ_T, RESP_T> ClientCall<REQ_T, RESP_T> interceptCall(MethodDescriptor<REQ_T, RESP_T> descriptor,
+ CallOptions options, Channel channel) {
LOGGER.info("start interceptor!");
LOGGER.info("method type: {}", descriptor.getType());
- return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(channel.newCall(descriptor, options)) {
+ return new ForwardingClientCall.SimpleForwardingClientCall<REQ_T, RESP_T>(channel.newCall(descriptor, options)) {
@Override
- public void start(Listener<RespT> responseListener, Metadata headers) {
+ public void start(Listener<RESP_T> responseListener, Metadata headers) {
LOGGER.info("Peer: {}", channel.authority());
LOGGER.info("Operation Name : {}", descriptor.getFullMethodName());
- Interceptor<RespT> tracingResponseListener = new Interceptor(responseListener);
+ Interceptor<RESP_T> tracingResponseListener = new Interceptor(responseListener);
tracingResponseListener.contextSnapshot = "contextSnapshot";
delegate().start(tracingResponseListener, headers);
}
@@ -63,19 +63,19 @@ public class ConsumerInterceptor implements ClientInterceptor {
}
@Override
- public void sendMessage(ReqT message) {
+ public void sendMessage(REQ_T message) {
LOGGER.info("sendMessage ....");
super.sendMessage(message);
}
};
}
- private static class Interceptor<RespT> extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT> {
+ private static class Interceptor<RESP_T> extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RESP_T> {
private static final Logger LOGGER = LogManager.getLogger(Interceptor.class);
private Object contextSnapshot;
- protected Interceptor(ClientCall.Listener<RespT> delegate) {
+ protected Interceptor(ClientCall.Listener<RESP_T> delegate) {
super(delegate);
}
@@ -89,7 +89,7 @@ public class ConsumerInterceptor implements ClientInterceptor {
}
@Override
- public void onMessage(RespT message) {
+ public void onMessage(RESP_T message) {
LOGGER.info("contextSnapshot: {}", contextSnapshot);
delegate().onMessage(message);
}
diff --git a/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java b/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
index 66090da..63dbbb1 100644
--- a/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
+++ b/test/plugin/scenarios/correlation-autotag-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
@@ -33,8 +33,8 @@ public class ProviderInterceptor implements ServerInterceptor {
private static final Logger LOGGER = LogManager.getLogger(ProviderInterceptor.class);
@Override
- public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata metadata,
- ServerCallHandler<ReqT, RespT> handler) {
+ public <REQ_T, RESP_T> ServerCall.Listener<REQ_T> interceptCall(ServerCall<REQ_T, RESP_T> call, Metadata metadata,
+ ServerCallHandler<REQ_T, RESP_T> handler) {
Map<String, String> headerMap = new HashMap<String, String>();
for (String key : metadata.keys()) {
LOGGER.info("Receive key: {}", key);
@@ -45,7 +45,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
}
LOGGER.info("authority : {}", call.getAuthority());
- return new ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT>(handler.startCall(new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
+ return new ForwardingServerCallListener.SimpleForwardingServerCallListener<REQ_T>(handler.startCall(new ForwardingServerCall.SimpleForwardingServerCall<REQ_T, RESP_T>(call) {
@Override
public void sendHeaders(Metadata responseHeaders) {
LOGGER.info("sendHeaders....");
@@ -55,7 +55,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
@Override
- public void sendMessage(RespT message) {
+ public void sendMessage(RESP_T message) {
delegate().sendMessage(message);
}
@@ -85,7 +85,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
@Override
- public void onMessage(ReqT message) {
+ public void onMessage(REQ_T message) {
LOGGER.info("onMessage....");
delegate().onMessage(message);
}
diff --git a/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml b/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml
index ef6fee4..bf7ac6f 100644
--- a/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml
+++ b/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml
@@ -17,7 +17,7 @@
~
-->
<enhanced>
- <class class_name="test.org.apache.skywalking.apm.testcase.customize.service.TestService1">
+ <class class_name="test.apache.skywalking.apm.testcase.customize.service.TestService1">
<method method="staticMethod()" operation_name="/is_static_method" static="true"></method>
<method method="staticMethod(java.lang.String,int.class,java.util.Map,java.util.List,[Ljava.lang.Object;)"
operation_name="/is_static_method_args" static="true">
@@ -35,7 +35,7 @@
<log key="log_1">arg[1]</log>
</method>
<method
- method="method(test.org.apache.skywalking.apm.testcase.customize.model.Model0,java.lang.String,int.class)"
+ method="method(test.apache.skywalking.apm.testcase.customize.model.Model0,java.lang.String,int.class)"
operation_name="/method_3" static="false">
<operation_name_suffix>arg[0].id</operation_name_suffix>
<operation_name_suffix>arg[0].model1.name</operation_name_suffix>
@@ -44,7 +44,7 @@
<log key="log_map">arg[0].getM().['k1']</log>
</method>
</class>
- <class class_name="test.org.apache.skywalking.apm.testcase.customize.service.TestService2">
+ <class class_name="test.apache.skywalking.apm.testcase.customize.service.TestService2">
<method method="staticMethod(java.lang.String,int.class)" operation_name="/is_2_static_method" static="true">
<tag key="tag_2_1">arg[0]</tag>
<log key="log_1_1">arg[1]</log>
diff --git a/test/plugin/scenarios/customize-scenario/config/expectedData.yaml b/test/plugin/scenarios/customize-scenario/config/expectedData.yaml
index 1d6d54b..3e6fae9 100644
--- a/test/plugin/scenarios/customize-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/customize-scenario/config/expectedData.yaml
@@ -36,7 +36,7 @@ segmentItems:
- logEvent:
- {key: log_1, value: '3'}
skipAnalysis: 'false'
- - {operationName: test.org.apache.skywalking.apm.testcase.customize.service.TestService1.method(),
+ - {operationName: test.apache.skywalking.apm.testcase.customize.service.TestService1.method(),
operationId: 0, parentSpanId: 0, spanId: 3, startTime: nq 0, endTime: nq 0,
isError: false, spanType: Local, skipAnalysis: 'false'}
- operationName: /method_2/str0
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/Application.java
similarity index 95%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java
rename to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/Application.java
index a3a9e6e..0e170d2 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize;
+package test.apache.skywalking.apm.testcase.customize;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
similarity index 87%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
rename to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
index 760243c..9d3532e 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.controller;
+package test.apache.skywalking.apm.testcase.customize.controller;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,10 +25,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import test.org.apache.skywalking.apm.testcase.customize.model.Model0;
-import test.org.apache.skywalking.apm.testcase.customize.model.Model1;
-import test.org.apache.skywalking.apm.testcase.customize.service.TestService1;
-import test.org.apache.skywalking.apm.testcase.customize.service.TestService2;
+import test.apache.skywalking.apm.testcase.customize.model.Model0;
+import test.apache.skywalking.apm.testcase.customize.service.TestService1;
+import test.apache.skywalking.apm.testcase.customize.service.TestService2;
+import test.apache.skywalking.apm.testcase.customize.model.Model1;
@RestController
@RequestMapping("/case")
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model0.java
similarity index 96%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java
rename to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model0.java
index b18f5d7..9898ed6 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model0.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.model;
+package test.apache.skywalking.apm.testcase.customize.model;
import java.util.List;
import java.util.Map;
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model1.java
similarity index 94%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java
rename to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model1.java
index 3b51247..aaacfef 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model1.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.model;
+package test.apache.skywalking.apm.testcase.customize.model;
public class Model1 {
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService1.java
similarity index 89%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java
rename to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService1.java
index 867cf9d..3640cbc 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService1.java
@@ -16,11 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.service;
+package test.apache.skywalking.apm.testcase.customize.service;
import java.util.List;
import java.util.Map;
-import test.org.apache.skywalking.apm.testcase.customize.model.Model0;
+
+import test.apache.skywalking.apm.testcase.customize.model.Model0;
public class TestService1 {
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService2.java
similarity index 93%
copy from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
copy to test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService2.java
index 67bde16..44fa025 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
+++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService2.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.service;
+package test.apache.skywalking.apm.testcase.customize.service;
import java.util.List;
diff --git a/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/Application.java b/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/Application.java
index 287654b..0a31881 100644
--- a/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/Application.java
+++ b/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/Application.java
@@ -19,10 +19,7 @@
package org.apache.skywalking.apm.testcase.cxf;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.web.bind.annotation.RestController;
@SpringBootApplication
public class Application {
diff --git a/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/service/UserService.java b/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/service/UserService.java
index d077bc5..fe0c113 100644
--- a/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/service/UserService.java
+++ b/test/plugin/scenarios/cxf-scenario/src/main/java/org/apache/skywalking/apm/testcase/cxf/service/UserService.java
@@ -21,14 +21,15 @@ package org.apache.skywalking.apm.testcase.cxf.service;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
+
import org.apache.skywalking.apm.testcase.cxf.entity.User;
@WebService
public interface UserService {
- @WebMethod
- String getName(@WebParam(name = "userId") Long userId);
+ @WebMethod
+ String getName(@WebParam(name = "userId") Long userId);
- @WebMethod
- User getUser(Long userId);
+ @WebMethod
+ User getUser(Long userId);
}
diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/MysqlConfig.java b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/MysqlConfig.java
index af324d9..bbfe535 100755
--- a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/MysqlConfig.java
+++ b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/MysqlConfig.java
@@ -25,10 +25,10 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class MysqlConfig {
- private static Logger logger = LogManager.getLogger(MysqlConfig.class);
- private static String url;
- private static String userName;
- private static String password;
+ private static Logger LOGGER = LogManager.getLogger(MysqlConfig.class);
+ private static String URL;
+ private static String USER_NAME;
+ private static String PASSWORD;
static {
InputStream inputStream = MysqlConfig.class.getClassLoader().getResourceAsStream("/jdbc.properties");
@@ -36,22 +36,22 @@ public class MysqlConfig {
try {
properties.load(inputStream);
} catch (IOException e) {
- logger.error("Failed to load config", e);
+ LOGGER.error("Failed to load config", e);
}
- url = properties.getProperty("mysql.url");
- userName = properties.getProperty("mysql.username");
- password = properties.getProperty("mysql.password");
+ URL = properties.getProperty("mysql.url");
+ USER_NAME = properties.getProperty("mysql.username");
+ PASSWORD = properties.getProperty("mysql.password");
}
public static String getUrl() {
- return url;
+ return URL;
}
public static String getUserName() {
- return userName;
+ return USER_NAME;
}
public static String getPassword() {
- return password;
+ return PASSWORD;
}
}
diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/controller/CaseController.java b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/controller/CaseController.java
index 48d4c9b..eb89b04 100755
--- a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/controller/CaseController.java
+++ b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/controller/CaseController.java
@@ -33,7 +33,7 @@ public class CaseController {
@Autowired
CaseService caseService;
- private static final Logger logger = LogManager.getLogger(CaseController.class);
+ private static final Logger LOGGER = LogManager.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
@@ -43,7 +43,7 @@ public class CaseController {
try {
caseService.testCase();
} catch (Exception e) {
- logger.error("Failed to execute sql.", e);
+ LOGGER.error("Failed to execute sql.", e);
throw e;
}
return SUCCESS;
diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/service/CaseService.java b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/service/CaseService.java
index df8af29..efc353c 100644
--- a/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/service/CaseService.java
+++ b/test/plugin/scenarios/dbcp-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dbcp/service/CaseService.java
@@ -31,7 +31,7 @@ import java.util.Properties;
@Service
public class CaseService {
- public static DataSource ds;
+ public static DataSource DS;
private static final String CREATE_TABLE_SQL = "CREATE TABLE test_DBCP(\n" + "id VARCHAR(1) PRIMARY KEY, \n" + "value VARCHAR(1) NOT NULL)";
private static final String INSERT_DATA_SQL = "INSERT INTO test_DBCP(id, value) VALUES(1,1)";
private static final String QUERY_DATA_SQL = "SELECT id, value FROM test_DBCP WHERE id=1";
@@ -45,7 +45,7 @@ public class CaseService {
properties.setProperty("username", MysqlConfig.getUserName());
properties.setProperty("password", MysqlConfig.getPassword());
try {
- ds = BasicDataSourceFactory.createDataSource(properties);
+ DS = BasicDataSourceFactory.createDataSource(properties);
} catch (Exception e) {
e.printStackTrace();
}
@@ -60,7 +60,7 @@ public class CaseService {
}
public void sqlExecutor(String sql) {
- try (Connection conn = ds.getConnection()) {
+ try (Connection conn = DS.getConnection()) {
Statement statement = conn.createStatement();
statement.execute(sql);
} catch (SQLException e) {
diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
index 7b471ea..5ea39f5 100644
--- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
+++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
@@ -44,7 +44,7 @@ public class CaseController {
@ResponseBody
public String dubbo() {
GreetService greetService = referenceConfig.get();
- System.out.println(greetService.doBusiness());
+ greetService.doBusiness();
return SUCCESS;
}
}
diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
index 7ffa1fb..1acf5c2 100644
--- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
+++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java
@@ -44,7 +44,7 @@ public class CaseController {
@ResponseBody
public String dubbo() {
GreetService greetService = referenceConfig.get();
- System.out.println(greetService.doBusiness("helloWorld"));
+ greetService.doBusiness("helloWorld");
return SUCCESS;
}
}
diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java b/test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java
index fc75385..fb27c07 100644
--- a/test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java
+++ b/test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java
@@ -30,7 +30,7 @@ import java.io.IOException;
@Slf4j
public class DemoSimpleJob implements SimpleJob {
- private static final OkHttpClient client = new OkHttpClient.Builder().build();
+ private static final OkHttpClient CLIENT = new OkHttpClient.Builder().build();
@Override
public void execute(ShardingContext shardingContext) {
@@ -39,7 +39,7 @@ public class DemoSimpleJob implements SimpleJob {
Request request = new Request.Builder().url("http://localhost:8080/elasticjob-2.x-scenario/case/call").build();
Response response = null;
try {
- response = client.newCall(request).execute();
+ response = CLIENT.newCall(request).execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/RestHighLevelClientCase.java b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/RestHighLevelClientCase.java
index e4c7647..03f5b0b 100644
--- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/RestHighLevelClientCase.java
+++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/RestHighLevelClientCase.java
@@ -161,7 +161,7 @@ public class RestHighLevelClientCase {
request.settings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0));
CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT);
- if (createIndexResponse.isAcknowledged() == false) {
+ if (!createIndexResponse.isAcknowledged()) {
String message = "elasticsearch create index fail.";
LOGGER.error(message);
throw new RuntimeException(message);
diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
index 4a8dcc4..b37d8a8 100644
--- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
+++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
@@ -34,7 +34,7 @@ public class ElasticsearchConfig {
@Bean(destroyMethod = "close")
public RestHighLevelClient client() {
HttpHost[] httpHostArry = parseEsHost();
- RestHighLevelClient client = new RestHighLevelClient((RestClient.builder(httpHostArry)));
+ RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(httpHostArry));
return client;
}
diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java
index 727a3ed..6d2f165 100644
--- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java
+++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java
@@ -34,7 +34,7 @@ public class TransportClientConfig {
@Value("${elasticsearch.server}")
private String elasticsearchHost;
- public final static Integer PORT = 9300; //端口
+ public final static Integer PORT = 9300; //port
@Bean
public TransportClient getESClientConnection()
diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
index 4a8dcc4..b37d8a8 100644
--- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
+++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
@@ -34,7 +34,7 @@ public class ElasticsearchConfig {
@Bean(destroyMethod = "close")
public RestHighLevelClient client() {
HttpHost[] httpHostArry = parseEsHost();
- RestHighLevelClient client = new RestHighLevelClient((RestClient.builder(httpHostArry)));
+ RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(httpHostArry));
return client;
}
diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java
index 9f2aa19..c55f83c 100644
--- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java
+++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java
@@ -189,7 +189,7 @@ public class CaseController {
request.settings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0));
CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT);
- if (createIndexResponse.isAcknowledged() == false) {
+ if (!createIndexResponse.isAcknowledged()) {
String message = "elasticsearch create index fail.";
LOGGER.error(message);
throw new RuntimeException(message);
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/bin/startup.sh b/test/plugin/scenarios/exception-checker-spring-scenario/bin/startup.sh
index 660475a..9babb38 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/bin/startup.sh
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/bin/startup.sh
@@ -18,4 +18,4 @@
home="$(cd "$(dirname $0)"; pwd)"
-java -jar ${agent_opts} -Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.ignored_exceptions=test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException ${home}/../libs/exception-checker-spring-scenario.jar &
\ No newline at end of file
+java -jar ${agent_opts} -Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.ignored_exceptions=test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException ${home}/../libs/exception-checker-spring-scenario.jar &
\ No newline at end of file
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml b/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml
index c2fccb3..0700f14 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/config/expectedData.yaml
@@ -36,7 +36,7 @@ segmentItems:
- {key: http.method, value: HEAD}
- segmentId: not null
spans:
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testAnnotatedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testAnnotatedException
operationId: 0
parentSpanId: 0
spanId: 1
@@ -51,11 +51,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testListedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testListedException
operationId: 0
parentSpanId: 0
spanId: 2
@@ -70,11 +70,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testHierarchyListedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testHierarchyListedException
operationId: 0
parentSpanId: 0
spanId: 3
@@ -89,11 +89,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testException
operationId: 0
parentSpanId: 0
spanId: 4
@@ -108,11 +108,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testRecursiveException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testRecursiveException
operationId: 0
parentSpanId: 0
spanId: 5
@@ -127,8 +127,8 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
- - {key: message, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
+ - {key: message, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
- key: stack
value: not null
- operationName: /case/exceptionchecker
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/Application.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/Application.java
similarity index 94%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/Application.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/Application.java
index a9fec45..1cf6a26 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/Application.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker;
+package test.apache.skywalking.apm.testcase.exceptionchecker;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
similarity index 93%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
index cb6f3af..42fb099 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
@@ -16,14 +16,14 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.controller;
+package test.apache.skywalking.apm.testcase.exceptionchecker.controller;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService;
+import test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService;
@RestController
@RequestMapping("/case")
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
index 70def46..8302412 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
import org.apache.skywalking.apm.toolkit.trace.IgnoredException;
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
index 4118da2..8881214 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestException extends RuntimeException {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
index 6f6b55c..debe7ed 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestHierarchyListedException extends TestListedException {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
index 9095970..7fa480b 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestListedException extends RuntimeException {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
similarity index 74%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
rename to test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
index d8632dd..feff76f 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
+++ b/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.service;
+package test.apache.skywalking.apm.testcase.exceptionchecker.service;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException;
@Service
public class TestService {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml b/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml
index 890365b..ce3c3c6 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/config/expectedData.yaml
@@ -19,7 +19,7 @@ segmentItems:
segments:
- segmentId: not null
spans:
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testAnnotatedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testAnnotatedException
operationId: 0
parentSpanId: 0
spanId: 1
@@ -34,11 +34,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testListedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testListedException
operationId: 0
parentSpanId: 0
spanId: 2
@@ -53,11 +53,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testHierarchyListedException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testHierarchyListedException
operationId: 0
parentSpanId: 0
spanId: 3
@@ -72,11 +72,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testException
operationId: 0
parentSpanId: 0
spanId: 4
@@ -91,11 +91,11 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
- {key: message, value: ''}
- key: stack
value: not null
- - operationName: test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testRecursiveException
+ - operationName: test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService.testRecursiveException
operationId: 0
parentSpanId: 0
spanId: 5
@@ -110,8 +110,8 @@ segmentItems:
logs:
- logEvent:
- {key: event, value: error}
- - {key: error.kind, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
- - {key: message, value: test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
+ - {key: error.kind, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException}
+ - {key: message, value: test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException}
- key: stack
value: not null
- operationName: /case/exceptionchecker
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/configuration.yml b/test/plugin/scenarios/exception-checker-tomcat-scenario/configuration.yml
index 0a55c08..44a188d 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/configuration.yml
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/configuration.yml
@@ -20,4 +20,4 @@ healthCheck: http://localhost:8080/exception-checker-tomcat-scenario/case/health
runningMode: with_optional
withPlugins: apm-spring-annotation-plugin-*.jar
environment:
- - CATALINA_OPTS="-Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.ignored_exceptions=test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException"
+ - CATALINA_OPTS="-Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.max_recursive_depth=2 -Dskywalking.statuscheck.ignored_exceptions=test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException"
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
similarity index 93%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
index cb6f3af..42fb099 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
@@ -16,14 +16,14 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.controller;
+package test.apache.skywalking.apm.testcase.exceptionchecker.controller;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.service.TestService;
+import test.apache.skywalking.apm.testcase.exceptionchecker.service.TestService;
@RestController
@RequestMapping("/case")
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
index 70def46..8302412 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
import org.apache.skywalking.apm.toolkit.trace.IgnoredException;
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
index 4118da2..8881214 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestException extends RuntimeException {
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
index 6f6b55c..debe7ed 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestHierarchyListedException extends TestListedException {
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
index 9095970..7fa480b 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
public class TestListedException extends RuntimeException {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
similarity index 95%
rename from test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
index 3df6698..fa1dedb 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
@@ -16,9 +16,9 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.exception;
+package test.apache.skywalking.apm.testcase.exceptionchecker.exception;
-public class TestOtherClassLoaderException extends RuntimeException{
+public class TestOtherClassLoaderException extends RuntimeException {
public TestOtherClassLoaderException() {
}
diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
similarity index 74%
rename from test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
rename to test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
index d8632dd..e9f07ad 100644
--- a/test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.exceptionchecker.service;
+package test.apache.skywalking.apm.testcase.exceptionchecker.service;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException;
-import test.org.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestAnnotatedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestHierarchyListedException;
+import test.apache.skywalking.apm.testcase.exceptionchecker.exception.TestListedException;
@Service
public class TestService {
diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index 10222c8..b8a2885 100644
--- a/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -25,6 +25,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase"/>
<mvc:annotation-driven/>
</beans>
\ No newline at end of file
diff --git a/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java b/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java
index 2165e11..e238683 100644
--- a/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java
+++ b/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java
@@ -37,12 +37,12 @@ import org.springframework.web.util.UriComponentsBuilder;
@Controller
public class RestController {
- private static final Map<Integer, User> users = new ConcurrentHashMap<>();
+ private static final Map<Integer, User> USERS = new ConcurrentHashMap<>();
@GetMapping(value = "/get/{id}")
@ResponseBody
private ResponseEntity<User> getUser(@PathVariable("id") int id) throws InterruptedException {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
return ResponseEntity.ok(currentUser);
}
@@ -50,7 +50,7 @@ public class RestController {
@ResponseBody
public ResponseEntity<Void> createUser(@RequestBody User user,
UriComponentsBuilder ucBuilder) throws InterruptedException {
- users.put(user.getId(), user);
+ USERS.put(user.getId(), user);
HttpHeaders headers = new HttpHeaders();
headers.setLocation(ucBuilder.path("/user/{id}").buildAndExpand(user.getId()).toUri());
return new ResponseEntity<Void>(headers, HttpStatus.CREATED);
@@ -75,11 +75,11 @@ public class RestController {
@DeleteMapping(value = "/delete/{id}")
@ResponseBody
public ResponseEntity<User> deleteUser(@PathVariable("id") int id) throws InterruptedException {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
if (currentUser == null) {
return ResponseEntity.noContent().build();
}
- users.remove(id);
+ USERS.remove(id);
return ResponseEntity.noContent().build();
}
}
diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
index f1e40da..216d77f 100644
--- a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
+++ b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.apm.testcase.finagle;
-
import com.twitter.finagle.ListeningServer;
import com.twitter.finagle.Thrift;
import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService;
@@ -35,7 +34,6 @@ public class FinagleRpcApplication {
SpringApplication.run(FinagleRpcApplication.class, args);
}
-
@Configuration
public static class FinagleRpcConfiguration {
diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
index 026fc63..42fd48a 100644
--- a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
+++ b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-
@RestController
@RequestMapping("/case")
public class CaseController {
@@ -44,7 +43,7 @@ public class CaseController {
@RequestMapping("/finagle")
@ResponseBody
public String finagle() throws Exception {
- System.out.println(Await.result(finagleRpcDemoService.hello("finagle")));
+ Await.result(finagleRpcDemoService.hello("finagle"));
return SUCCESS;
}
}
diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
index 7845193..5b034ed 100644
--- a/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
+++ b/test/plugin/scenarios/finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.apm.testcase.finagle.service;
import com.twitter.util.Future;
import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService;
-
public class FinagleRpcDemoServiceImpl implements FinagleRpcDemoService.ServiceIface {
public Future<String> hello(String name) {
diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
index f1e40da..216d77f 100644
--- a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
+++ b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.apm.testcase.finagle;
-
import com.twitter.finagle.ListeningServer;
import com.twitter.finagle.Thrift;
import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService;
@@ -35,7 +34,6 @@ public class FinagleRpcApplication {
SpringApplication.run(FinagleRpcApplication.class, args);
}
-
@Configuration
public static class FinagleRpcConfiguration {
diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
index 026fc63..42fd48a 100644
--- a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
+++ b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-
@RestController
@RequestMapping("/case")
public class CaseController {
@@ -44,7 +43,7 @@ public class CaseController {
@RequestMapping("/finagle")
@ResponseBody
public String finagle() throws Exception {
- System.out.println(Await.result(finagleRpcDemoService.hello("finagle")));
+ Await.result(finagleRpcDemoService.hello("finagle"));
return SUCCESS;
}
}
diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
index 7845193..5b034ed 100644
--- a/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
+++ b/test/plugin/scenarios/finagle-6.44.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.apm.testcase.finagle.service;
import com.twitter.util.Future;
import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService;
-
public class FinagleRpcDemoServiceImpl implements FinagleRpcDemoService.ServiceIface {
public Future<String> hello(String name) {
diff --git a/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java b/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
index 5cf4b147..cb8b88e 100644
--- a/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
+++ b/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
@@ -25,7 +25,6 @@ public class TestController {
@RequestMapping("/provider/b/testcase")
public String testcase() {
- System.out.println(1);
return "1";
}
diff --git a/test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java b/test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
index 5cf4b147..cb8b88e 100644
--- a/test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
+++ b/test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
@@ -25,7 +25,6 @@ public class TestController {
@RequestMapping("/provider/b/testcase")
public String testcase() {
- System.out.println(1);
return "1";
}
diff --git a/test/plugin/scenarios/graphql-8.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java b/test/plugin/scenarios/graphql-8.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
index f960cd0..f00af26 100644
--- a/test/plugin/scenarios/graphql-8.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
+++ b/test/plugin/scenarios/graphql-8.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
@@ -50,13 +50,11 @@ public class GraphSchema {
.build()).build();
}
-
@Bean
public GraphQL graphQL() {
return new GraphQL(getSchema());
}
-
private void initOutputType() {
userType = newObject()
diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
index 5470e7c..e8a35d0 100644
--- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
+++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
@@ -36,16 +36,16 @@ public class ConsumerInterceptor implements ClientInterceptor {
private static final Logger LOGGER = LogManager.getLogger(ConsumerInterceptor.class);
@Override
- public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> descriptor,
- CallOptions options, Channel channel) {
+ public <REQ_T, RESP_T> ClientCall<REQ_T, RESP_T> interceptCall(MethodDescriptor<REQ_T, RESP_T> descriptor,
+ CallOptions options, Channel channel) {
LOGGER.info("start interceptor!");
LOGGER.info("method type: {}", descriptor.getType());
- return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(channel.newCall(descriptor, options)) {
+ return new ForwardingClientCall.SimpleForwardingClientCall<REQ_T, RESP_T>(channel.newCall(descriptor, options)) {
@Override
- public void start(Listener<RespT> responseListener, Metadata headers) {
+ public void start(Listener<RESP_T> responseListener, Metadata headers) {
LOGGER.info("Peer: {}", channel.authority());
LOGGER.info("Operation Name : {}", descriptor.getFullMethodName());
- Interceptor<RespT> tracingResponseListener = new Interceptor(responseListener);
+ Interceptor<RESP_T> tracingResponseListener = new Interceptor(responseListener);
tracingResponseListener.contextSnapshot = "contextSnapshot";
delegate().start(tracingResponseListener, headers);
}
@@ -63,19 +63,19 @@ public class ConsumerInterceptor implements ClientInterceptor {
}
@Override
- public void sendMessage(ReqT message) {
+ public void sendMessage(REQ_T message) {
LOGGER.info("sendMessage ....");
super.sendMessage(message);
}
};
}
- private static class Interceptor<RespT> extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT> {
+ private static class Interceptor<RESP_T> extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RESP_T> {
private static final Logger LOGGER = LogManager.getLogger(Interceptor.class);
private Object contextSnapshot;
- protected Interceptor(ClientCall.Listener<RespT> delegate) {
+ protected Interceptor(ClientCall.Listener<RESP_T> delegate) {
super(delegate);
}
@@ -89,7 +89,7 @@ public class ConsumerInterceptor implements ClientInterceptor {
}
@Override
- public void onMessage(RespT message) {
+ public void onMessage(RESP_T message) {
LOGGER.info("contextSnapshot: {}", contextSnapshot);
delegate().onMessage(message);
}
diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java
index 568ce72..398dbd3 100644
--- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java
+++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java
@@ -30,7 +30,11 @@ import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.skywalking.apm.testcase.grpc.consumr.ConsumerInterceptor;
-import org.apache.skywalking.apm.testcase.grpc.proto.*;
+import org.apache.skywalking.apm.testcase.grpc.proto.GreeterBlockingErrorGrpc;
+import org.apache.skywalking.apm.testcase.grpc.proto.GreeterBlockingGrpc;
+import org.apache.skywalking.apm.testcase.grpc.proto.GreeterGrpc;
+import org.apache.skywalking.apm.testcase.grpc.proto.HelloRequest;
+import org.apache.skywalking.apm.testcase.grpc.proto.HelloReply;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
index 66090da..26647b4 100644
--- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
+++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
@@ -24,8 +24,10 @@ import io.grpc.Metadata;
import io.grpc.ServerCall;
import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor;
+
import java.util.HashMap;
import java.util.Map;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -33,8 +35,8 @@ public class ProviderInterceptor implements ServerInterceptor {
private static final Logger LOGGER = LogManager.getLogger(ProviderInterceptor.class);
@Override
- public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata metadata,
- ServerCallHandler<ReqT, RespT> handler) {
+ public <REQ_T, RESQ_T> ServerCall.Listener<REQ_T> interceptCall(ServerCall<REQ_T, RESQ_T> call, Metadata metadata,
+ ServerCallHandler<REQ_T, RESQ_T> handler) {
Map<String, String> headerMap = new HashMap<String, String>();
for (String key : metadata.keys()) {
LOGGER.info("Receive key: {}", key);
@@ -45,7 +47,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
}
LOGGER.info("authority : {}", call.getAuthority());
- return new ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT>(handler.startCall(new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
+ return new ForwardingServerCallListener.SimpleForwardingServerCallListener<REQ_T>(handler.startCall(new ForwardingServerCall.SimpleForwardingServerCall<REQ_T, RESQ_T>(call) {
@Override
public void sendHeaders(Metadata responseHeaders) {
LOGGER.info("sendHeaders....");
@@ -55,7 +57,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
@Override
- public void sendMessage(RespT message) {
+ public void sendMessage(RESQ_T message) {
delegate().sendMessage(message);
}
@@ -85,7 +87,7 @@ public class ProviderInterceptor implements ServerInterceptor {
}
@Override
- public void onMessage(ReqT message) {
+ public void onMessage(REQ_T message) {
LOGGER.info("onMessage....");
delegate().onMessage(message);
}
diff --git a/test/plugin/scenarios/hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase/controller/HBaseController.java b/test/plugin/scenarios/hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase/controller/HBaseController.java
index a14072e..a4a67b8 100644
--- a/test/plugin/scenarios/hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase/controller/HBaseController.java
+++ b/test/plugin/scenarios/hbase-scenario/src/main/java/org/apache/skywalking/apm/testcase/hbase/controller/HBaseController.java
@@ -19,10 +19,25 @@
package org.apache.skywalking.apm.testcase.hbase.controller;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.*;
-import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.filter.PrefixFilter;
import org.apache.hadoop.hbase.util.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Controller;
@@ -41,6 +56,7 @@ public class HBaseController {
private String address;
private Table table;
+ private final static Logger LOGGER = LoggerFactory.getLogger(HBaseController.class);
@PostConstruct
public void init() {
@@ -71,7 +87,7 @@ public class HBaseController {
put.addColumn("family1".getBytes(), "qualifier1".getBytes(), "value1".getBytes());
table.put(put);
Scan s = new Scan();
- s.setFilter(new PrefixFilter(("rowkey").getBytes()));
+ s.setFilter(new PrefixFilter("rowkey".getBytes()));
s.setCaching(100);
ResultScanner results = table.getScanner(s);
for (Result result : results) {
@@ -80,7 +96,7 @@ public class HBaseController {
String family = Bytes.toString(CellUtil.cloneFamily(cell));
String colName = Bytes.toString(cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength());
String value = Bytes.toString(cell.getValueArray(), cell.getValueOffset(), cell.getValueLength());
- System.out.println("family: " + family + " colName:" + colName + " value:" + value);
+ LOGGER.debug("family: " + family + " colName:" + colName + " value:" + value);
}
}
}
@@ -89,7 +105,7 @@ public class HBaseController {
String family = Bytes.toString(CellUtil.cloneFamily(cell));
String colName = Bytes.toString(cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength());
String value = Bytes.toString(cell.getValueArray(), cell.getValueOffset(), cell.getValueLength());
- System.out.println("family: " + family + " colName:" + colName + " value:" + value);
+ LOGGER.debug("family: " + family + " colName:" + colName + " value:" + value);
}
table.delete(new Delete("rowkey1".getBytes()));
} catch (Exception e) {
diff --git a/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/controller/CaseController.java b/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/controller/CaseController.java
index ab9c43d..cbb4fb9 100644
--- a/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/controller/CaseController.java
+++ b/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/controller/CaseController.java
@@ -40,23 +40,23 @@ public class CaseController {
@RequestMapping("/influxdb-scenario")
@ResponseBody
- public String testcase(){
+ public String testcase() {
InfluxDBExecutor executor = new InfluxDBExecutor(serverURL);
// createDatabase
String db = "skywalking";
executor.createDatabase(db);
// createRetentionPolicy
String rp = "one_day";
- executor.createRetentionPolicyWithOneDay(db,rp);
+ executor.createRetentionPolicyWithOneDay(db, rp);
Point point = Point.measurement("heartbeat")
- .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
- .tag("host", "127.0.0.1")
- .addField("device_name", "sensor x")
- .build();
+ .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+ .tag("host", "127.0.0.1")
+ .addField("device_name", "sensor x")
+ .build();
// write
- executor.write(db,rp,point);
+ executor.write(db, rp, point);
// query
- executor.query(db,"SELECT * FROM heartbeat");
+ executor.query(db, "SELECT * FROM heartbeat");
return SUCCESS;
}
diff --git a/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/executor/InfluxDBExecutor.java b/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/executor/InfluxDBExecutor.java
index 857b606..3778daa 100644
--- a/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/executor/InfluxDBExecutor.java
+++ b/test/plugin/scenarios/influxdb-scenario/src/main/java/org/apache/skywalking/apm/testcase/influxdb/executor/InfluxDBExecutor.java
@@ -27,42 +27,42 @@ import org.influxdb.dto.QueryResult;
public class InfluxDBExecutor implements AutoCloseable {
- private final InfluxDB influxDB;
+ private final InfluxDB influxDB;
- public InfluxDBExecutor(String serverURL){
- influxDB = InfluxDBFactory.connect(serverURL,"admin",null);
- }
+ public InfluxDBExecutor(String serverURL) {
+ influxDB = InfluxDBFactory.connect(serverURL, "admin", null);
+ }
- public Pong ping(){
- return influxDB.ping();
- }
+ public Pong ping() {
+ return influxDB.ping();
+ }
- public QueryResult createDatabase(String databaseName){
- // Create a database...
- return influxDB.query(new Query("CREATE DATABASE " + databaseName, databaseName));
- }
+ public QueryResult createDatabase(String databaseName) {
+ // Create a database...
+ return influxDB.query(new Query("CREATE DATABASE " + databaseName, databaseName));
+ }
- public QueryResult createRetentionPolicyWithOneDay(String databaseName, String retentionPolicyName){
+ public QueryResult createRetentionPolicyWithOneDay(String databaseName, String retentionPolicyName) {
// influxDB.setDatabase(databaseName);
- // ... and a retention policy, if necessary.
- return influxDB.query(new Query("CREATE RETENTION POLICY " + retentionPolicyName + " ON " + databaseName + " DURATION 1d REPLICATION 1 DEFAULT", databaseName));
- }
+ // ... and a retention policy, if necessary.
+ return influxDB.query(new Query("CREATE RETENTION POLICY " + retentionPolicyName + " ON " + databaseName + " DURATION 1d REPLICATION 1 DEFAULT", databaseName));
+ }
- public void write(String databaseName, String retentionPolicyName,Point point){
- // Write points to InfluxDB.
- influxDB.write(databaseName, retentionPolicyName, point);
- }
+ public void write(String databaseName, String retentionPolicyName, Point point) {
+ // Write points to InfluxDB.
+ influxDB.write(databaseName, retentionPolicyName, point);
+ }
- public QueryResult query(String databaseName,String command){
- // Query your data using InfluxQL.
- return influxDB.query(new Query(command, databaseName));
- }
+ public QueryResult query(String databaseName, String command) {
+ // Query your data using InfluxQL.
+ return influxDB.query(new Query(command, databaseName));
+ }
- @Override
- public void close() throws Exception {
- if (influxDB != null){
- // Close it if your application is terminating or you are not using it anymore.
- influxDB.close();
+ @Override
+ public void close() throws Exception {
+ if (influxDB != null) {
+ // Close it if your application is terminating or you are not using it anymore.
+ influxDB.close();
+ }
}
- }
}
diff --git a/test/plugin/scenarios/jdk-threading-scenario/bin/startup.sh b/test/plugin/scenarios/jdk-threading-scenario/bin/startup.sh
index 98bfae7..051ed57 100644
--- a/test/plugin/scenarios/jdk-threading-scenario/bin/startup.sh
+++ b/test/plugin/scenarios/jdk-threading-scenario/bin/startup.sh
@@ -18,4 +18,4 @@
home="$(cd "$(dirname $0)"; pwd)"
-java -Dskywalking.plugin.jdkthreading.threading_class_prefixes=test.org.apache.skywalking. -jar ${agent_opts} ${home}/../libs/jdk-threading-scenario.jar &
\ No newline at end of file
+java -Dskywalking.plugin.jdkthreading.threading_class_prefixes=test.apache.skywalking. -jar ${agent_opts} ${home}/../libs/jdk-threading-scenario.jar &
\ No newline at end of file
diff --git a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml
index 57ef73f..48975dc 100644
--- a/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml
@@ -51,7 +51,7 @@ segmentItems:
- {key: url, value: 'https://github.com:-1/apache/skywalking'}
- {key: http.method, value: GET}
skipAnalysis: 'false'
- - operationName: Threading/test.org.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$1/run
+ - operationName: Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$1/run
operationId: 0
parentSpanId: -1
spanId: 0
@@ -84,7 +84,7 @@ segmentItems:
- {key: url, value: 'https://github.com:-1/apache/skywalking'}
- {key: http.method, value: GET}
skipAnalysis: 'false'
- - operationName: Threading/test.org.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$2/call
+ - operationName: Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$2/call
operationId: 0
parentSpanId: -1
spanId: 0
diff --git a/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java b/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/apache/skywalking/apm/testcase/jdk/threading/Application.java
similarity index 97%
rename from test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java
rename to test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/apache/skywalking/apm/testcase/jdk/threading/Application.java
index 42c7593..717d21b 100644
--- a/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java
+++ b/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/apache/skywalking/apm/testcase/jdk/threading/Application.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package test.org.apache.skywalking.apm.testcase.jdk.threading;
+package test.apache.skywalking.apm.testcase.jdk.threading;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/Application.java b/test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/Application.java
similarity index 95%
rename from test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/Application.java
rename to test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/Application.java
index 77fc5be..b6c7a16 100644
--- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/Application.java
+++ b/test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.toolkit;
+package test.apache.skywalking.apm.testcase.kafka;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java b/test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/controller/CaseController.java
similarity index 99%
rename from test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java
rename to test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/controller/CaseController.java
index 8f30787..f434fa4 100644
--- a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java
+++ b/test/plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.kafka.controller;
+package test.apache.skywalking.apm.testcase.kafka.controller;
import java.io.IOException;
import java.util.Arrays;
diff --git a/test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java b/test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
index 5eedee2..c39c43f 100644
--- a/test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
+++ b/test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/log4j")
public class CaseController {
- private static final Logger logger = LogManager.getLogger(CaseController.class);
+ private static final Logger LOGGER = LogManager.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
@Value("${logger.host:localhost:8080}")
private String loggerAddress;
@@ -38,14 +38,14 @@ public class CaseController {
@RequestMapping("/no-param")
@ResponseBody
public String noParam() {
- logger.error("no-param");
+ LOGGER.error("no-param");
return "no-param";
}
@RequestMapping("/one-param")
@ResponseBody
public String oneParam() {
- logger.error("throwable-param", new Exception());
+ LOGGER.error("throwable-param", new Exception());
return "one param";
}
diff --git a/test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java b/test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
index 7943fbd..33018b8 100644
--- a/test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
+++ b/test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/log4j2")
public class CaseController {
- private static final Logger logger = LogManager.getLogger(CaseController.class);
+ private static final Logger LOGGER = LogManager.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
@Value("${logger.host:localhost:8080}")
private String loggerAddress;
@@ -39,20 +39,21 @@ public class CaseController {
@RequestMapping("/no-param")
@ResponseBody
public String noParam() {
- logger.error("no-param");
+ LOGGER.error("no-param");
return "no-param";
}
@RequestMapping("/one-param")
@ResponseBody
public String oneParam() {
- logger.error("one param is {}", CaseController.class);
+ LOGGER.error("one param is {}", CaseController.class);
return "one param";
}
+
@RequestMapping("/marker")
@ResponseBody
public String testMarker() {
- logger.error(MarkerManager.getMarker("TEST"), "test marker");
+ LOGGER.error(MarkerManager.getMarker("TEST"), "test marker");
return "test marker";
}
diff --git a/test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java b/test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
index eccd91e..5d73fac 100644
--- a/test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
+++ b/test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/logback")
public class CaseController {
- private static final Logger logger = LoggerFactory.getLogger(CaseController.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
@Value("${logger.host:localhost:8080}")
private String loggerAddress;
@@ -39,21 +39,21 @@ public class CaseController {
@RequestMapping("/no-param")
@ResponseBody
public String noParam() {
- logger.error("no-param");
+ LOGGER.error("no-param");
return "no-param";
}
@RequestMapping("/one-param")
@ResponseBody
public String oneParam() {
- logger.error("one param is {}", CaseController.class);
+ LOGGER.error("one param is {}", CaseController.class);
return "one param";
}
@RequestMapping("/marker")
@ResponseBody
public String testMarker() {
- logger.error(MarkerFactory.getMarker("TEST"), "test marker");
+ LOGGER.error(MarkerFactory.getMarker("TEST"), "test marker");
return "test marker";
}
diff --git a/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/MariadbConfig.java b/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/MariadbConfig.java
index 83afc73..7eb8a6b 100644
--- a/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/MariadbConfig.java
+++ b/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/MariadbConfig.java
@@ -26,9 +26,9 @@ import org.apache.logging.log4j.Logger;
public class MariadbConfig {
private static final Logger LOGGER = LogManager.getLogger(MariadbConfig.class);
- private static String url;
- private static String userName;
- private static String password;
+ private static String URL;
+ private static String USER_NAME;
+ private static String PASSWORD;
static {
InputStream inputStream = MariadbConfig.class.getClassLoader().getResourceAsStream("/jdbc.properties");
@@ -39,20 +39,20 @@ public class MariadbConfig {
LOGGER.error("Failed to load config", e);
}
- url = properties.getProperty("mariadb.url");
- userName = properties.getProperty("mariadb.username");
- password = properties.getProperty("mariadb.password");
+ URL = properties.getProperty("mariadb.url");
+ USER_NAME = properties.getProperty("mariadb.username");
+ PASSWORD = properties.getProperty("mariadb.password");
}
public static String getUrl() {
- return url;
+ return URL;
}
public static String getUserName() {
- return userName;
+ return USER_NAME;
}
public static String getPassword() {
- return password;
+ return PASSWORD;
}
}
diff --git a/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/controller/CaseController.java b/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/controller/CaseController.java
index 1a39465..7f6638b 100644
--- a/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/controller/CaseController.java
+++ b/test/plugin/scenarios/mariadb-scenario/src/main/java/org/apache/skywalking/apm/testcase/mariadb/controller/CaseController.java
@@ -25,8 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import java.sql.SQLException;
-
@RestController
@RequestMapping("/case")
public class CaseController {
diff --git a/test/plugin/scenarios/mongodb-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java b/test/plugin/scenarios/mongodb-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java
index 298ac22..33dfea5 100644
--- a/test/plugin/scenarios/mongodb-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java
+++ b/test/plugin/scenarios/mongodb-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java
@@ -18,7 +18,11 @@
package org.apache.skywalking.apm.testcase.mongodb.controller;
-import com.mongodb.client.*;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.FindIterable;
import org.bson.BsonDocument;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Value;
diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java b/test/plugin/scenarios/mssql-jdbc-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
index fe08ca8..c8d9af4 100644
--- a/test/plugin/scenarios/mssql-jdbc-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
+++ b/test/plugin/scenarios/mssql-jdbc-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
@@ -26,9 +26,9 @@ import org.apache.logging.log4j.Logger;
public class MssqlConfig {
private static final Logger LOGGER = LogManager.getLogger(MssqlConfig.class);
- private static String url;
- private static String userName;
- private static String password;
+ private static String URL;
+ private static String USER_NAME;
+ private static String PASSWORD;
static {
InputStream inputStream = MssqlConfig.class.getClassLoader().getResourceAsStream("jdbc.properties");
@@ -39,20 +39,20 @@ public class MssqlConfig {
LOGGER.error("Failed to load config", e);
}
- url = properties.getProperty("mssql.url");
- userName = properties.getProperty("mssql.username");
- password = properties.getProperty("mssql.password");
+ URL = properties.getProperty("mssql.url");
+ USER_NAME = properties.getProperty("mssql.username");
+ PASSWORD = properties.getProperty("mssql.password");
}
public static String getUrl() {
- return url;
+ return URL;
}
public static String getUserName() {
- return userName;
+ return USER_NAME;
}
public static String getPassword() {
- return password;
+ return PASSWORD;
}
}
diff --git a/test/plugin/scenarios/mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java b/test/plugin/scenarios/mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
index fe08ca8..c8d9af4 100644
--- a/test/plugin/scenarios/mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
+++ b/test/plugin/scenarios/mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java
@@ -26,9 +26,9 @@ import org.apache.logging.log4j.Logger;
public class MssqlConfig {
private static final Logger LOGGER = LogManager.getLogger(MssqlConfig.class);
- private static String url;
- private static String userName;
- private static String password;
+ private static String URL;
+ private static String USER_NAME;
+ private static String PASSWORD;
static {
InputStream inputStream = MssqlConfig.class.getClassLoader().getResourceAsStream("jdbc.properties");
@@ -39,20 +39,20 @@ public class MssqlConfig {
LOGGER.error("Failed to load config", e);
}
- url = properties.getProperty("mssql.url");
- userName = properties.getProperty("mssql.username");
- password = properties.getProperty("mssql.password");
+ URL = properties.getProperty("mssql.url");
+ USER_NAME = properties.getProperty("mssql.username");
+ PASSWORD = properties.getProperty("mssql.password");
}
public static String getUrl() {
- return url;
+ return URL;
}
public static String getUserName() {
- return userName;
+ return USER_NAME;
}
public static String getPassword() {
- return password;
+ return PASSWORD;
}
}
diff --git a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/MysqlConfig.java b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/MysqlConfig.java
index aa3ad88..f30a6eb 100644
--- a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/MysqlConfig.java
+++ b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/MysqlConfig.java
@@ -26,9 +26,9 @@ import org.apache.logging.log4j.Logger;
public class MysqlConfig {
private static final Logger LOGGER = LogManager.getLogger(MysqlConfig.class);
- private static String url;
- private static String userName;
- private static String password;
+ private static String URL;
+ private static String USER_NAME;
+ private static String PASSWORD;
static {
InputStream inputStream = MysqlConfig.class.getClassLoader().getResourceAsStream("/jdbc.properties");
@@ -39,20 +39,20 @@ public class MysqlConfig {
LOGGER.error("Failed to load config", e);
}
- url = properties.getProperty("mysql.url");
- userName = properties.getProperty("mysql.username");
- password = properties.getProperty("mysql.password");
+ URL = properties.getProperty("mysql.url");
+ USER_NAME = properties.getProperty("mysql.username");
+ PASSWORD = properties.getProperty("mysql.password");
}
public static String getUrl() {
- return url;
+ return URL;
}
public static String getUserName() {
- return userName;
+ return USER_NAME;
}
public static String getPassword() {
- return password;
+ return PASSWORD;
}
}
diff --git a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java
index 1cae40e..626ef9a 100644
--- a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java
+++ b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java
@@ -25,8 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import java.sql.SQLException;
-
@RestController
@RequestMapping("/case")
public class CaseController {
diff --git a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/Application.java b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/Application.java
similarity index 91%
rename from test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/Application.java
rename to test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/Application.java
index 3262bb3..e8f5c76 100644
--- a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/Application.java
+++ b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.pulsar;
+package test.apache.skywalking.apm.testcase.pulsar;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.ComponentScan;
@EnableAutoConfiguration
@SpringBootApplication()
-@ComponentScan("test.org.apache.skywalking.apm.testcase.pulsar")
+@ComponentScan("test.apache.skywalking.apm.testcase.pulsar")
public class Application {
public static void main(String[] args) {
diff --git a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java
similarity index 98%
rename from test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java
rename to test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java
index 0442dfa..f25eb05 100644
--- a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java
+++ b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.pulsar.controller;
+package test.apache.skywalking.apm.testcase.pulsar.controller;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/DemoJob.java b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/DemoJob.java
index 699be8c..0ef9873 100644
--- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/DemoJob.java
+++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/DemoJob.java
@@ -30,7 +30,7 @@ import java.io.IOException;
@Slf4j
public class DemoJob implements Job {
- private static final OkHttpClient client = new OkHttpClient.Builder().build();
+ private static final OkHttpClient CLIENT = new OkHttpClient.Builder().build();
@Override
public void execute(JobExecutionContext jobExecutionContext) {
@@ -39,7 +39,7 @@ public class DemoJob implements Job {
Request request = new Request.Builder().url("http://localhost:8080/quartz-scheduler-2.x-scenario/case/call").build();
Response response = null;
try {
- response = client.newCall(request).execute();
+ response = CLIENT.newCall(request).execute();
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/QuartzConfig.java b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/QuartzConfig.java
index 4ca979e..eeef937 100644
--- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/QuartzConfig.java
+++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/QuartzConfig.java
@@ -18,8 +18,16 @@
package org.apache.skywalking.apm.testcase.quartzscheduler.job;
-import org.quartz.*;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SchedulerFactory;
import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.Trigger;
+import org.quartz.JobBuilder;
+import org.quartz.TriggerBuilder;
+import org.quartz.CronScheduleBuilder;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java b/test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/Application.java
similarity index 94%
rename from test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java
rename to test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/Application.java
index 3a1feec..14333db 100644
--- a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java
+++ b/test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.redisson;
+package test.apache.skywalking.apm.testcase.redisson;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java b/test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/controller/CaseController.java
similarity index 97%
rename from test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java
rename to test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/controller/CaseController.java
index 10825aa..e45d53e 100644
--- a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java
+++ b/test/plugin/scenarios/redisson-scenario/src/main/java/test/apache/skywalking/apm/testcase/redisson/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.redisson.controller;
+package test.apache.skywalking.apm.testcase.redisson.controller;
import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
diff --git a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/Application.java b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/Application.java
similarity index 95%
rename from test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/Application.java
rename to test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/Application.java
index c55539b..c2a2654 100644
--- a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/Application.java
+++ b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class;
+package org.apache.skywalking.apm.testcase.retransform;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
similarity index 86%
rename from test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java
rename to test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
index 8e9060b..4b95f10 100644
--- a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java
+++ b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class;
+package org.apache.skywalking.apm.testcase.retransform;
import net.bytebuddy.agent.ByteBuddyAgent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import test.org.apache.skywalking.apm.testcase.retransform_class.controller.CaseController;
+import org.apache.skywalking.apm.testcase.retransform.controller.CaseController;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
@@ -47,7 +47,7 @@ public class RetransformUtil {
int offset = indexOf(classfileBuffer, bytes);
if (offset != -1) {
byte[] replacingBytes = RETRANSFORM_VALUE.getBytes();
- System.arraycopy(replacingBytes,0, classfileBuffer, offset, replacingBytes.length);
+ System.arraycopy(replacingBytes, 0, classfileBuffer, offset, replacingBytes.length);
}
return classfileBuffer;
}
@@ -71,10 +71,10 @@ public class RetransformUtil {
}
private static int indexOf(byte[] outerArray, byte[] smallerArray) {
- for(int i = 0; i < outerArray.length - smallerArray.length+1; ++i) {
+ for (int i = 0; i < outerArray.length - smallerArray.length + 1; ++i) {
boolean found = true;
- for(int j = 0; j < smallerArray.length; ++j) {
- if (outerArray[i+j] != smallerArray[j]) {
+ for (int j = 0; j < smallerArray.length; ++j) {
+ if (outerArray[i + j] != smallerArray[j]) {
found = false;
break;
}
diff --git a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/controller/CaseController.java b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/controller/CaseController.java
similarity index 92%
rename from test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/controller/CaseController.java
rename to test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/controller/CaseController.java
index e28ab72..c348e0c 100644
--- a/test/plugin/scenarios/retransform-class-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/controller/CaseController.java
+++ b/test/plugin/scenarios/retransform-class-scenario/src/main/java/org/apache/skywalking/apm/testcase/retransform/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class.controller;
+package org.apache.skywalking.apm.testcase.retransform.controller;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.HttpStatusCodeException;
-import test.org.apache.skywalking.apm.testcase.retransform_class.RetransformUtil;
+import org.apache.skywalking.apm.testcase.retransform.RetransformUtil;
@Controller
@RequestMapping("/case")
@@ -53,7 +53,4 @@ public class CaseController {
// your codes
return SUCCESS;
}
-
-
-
}
diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/CaseController.java b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/CaseController.java
similarity index 90%
rename from test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/CaseController.java
rename to test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/CaseController.java
index 33c5158..59d9f07 100644
--- a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/CaseController.java
+++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class;
+package test.apache.skywalking.apm.testcase.retransform;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -35,10 +35,8 @@ public class CaseController {
@ResponseBody
public ResponseEntity testcase() throws HttpStatusCodeException {
if (RetransformUtil.RETRANSFORMING_TAG.equals(RetransformUtil.RETRANSFORM_VALUE)) {
- System.out.println("retransform check success.");
return ResponseEntity.ok("retransform success");
} else {
- System.out.println("retransform check failure.");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("retransform failure");
}
}
@@ -49,7 +47,4 @@ public class CaseController {
// your codes
return SUCCESS;
}
-
-
-
}
diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
similarity index 84%
rename from test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java
rename to test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
index 89360b1..1acde89 100644
--- a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/RetransformUtil.java
+++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/RetransformUtil.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class;
+package test.apache.skywalking.apm.testcase.retransform;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -43,7 +43,7 @@ public class RetransformUtil {
int offset = indexOf(classfileBuffer, bytes);
if (offset != -1) {
byte[] replacingBytes = RETRANSFORM_VALUE.getBytes();
- System.arraycopy(replacingBytes,0, classfileBuffer, offset, replacingBytes.length);
+ System.arraycopy(replacingBytes, 0, classfileBuffer, offset, replacingBytes.length);
}
return classfileBuffer;
}
@@ -55,9 +55,7 @@ public class RetransformUtil {
instrumentation.addTransformer(transformer, true);
try {
instrumentation.retransformClasses(CaseController.class);
- System.out.println("retransform classes success");
} catch (Throwable e) {
- System.out.println("retransform classes failure");
e.printStackTrace(System.out);
}
@@ -68,10 +66,10 @@ public class RetransformUtil {
}
private static int indexOf(byte[] outerArray, byte[] smallerArray) {
- for(int i = 0; i < outerArray.length - smallerArray.length+1; ++i) {
+ for (int i = 0; i < outerArray.length - smallerArray.length + 1; ++i) {
boolean found = true;
- for(int j = 0; j < smallerArray.length; ++j) {
- if (outerArray[i+j] != smallerArray[j]) {
+ for (int j = 0; j < smallerArray.length; ++j) {
+ if (outerArray[i + j] != smallerArray[j]) {
found = false;
break;
}
diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/StartupListener.java b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/StartupListener.java
similarity index 94%
rename from test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/StartupListener.java
rename to test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/StartupListener.java
index bddc1dd..c79f709 100644
--- a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/retransform_class/StartupListener.java
+++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/apache/skywalking/apm/testcase/retransform/StartupListener.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.retransform_class;
+package test.apache.skywalking.apm.testcase.retransform;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index 10222c8..b8a2885 100644
--- a/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -25,6 +25,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase"/>
<mvc:annotation-driven/>
</beans>
\ No newline at end of file
diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index 5dd465c..9094a7a 100644
--- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -34,7 +34,7 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.
public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration {
- private static DataSource dataSource;
+ private static DataSource DATA_SOURCE;
@Override
public DataSource createDataSource() throws SQLException {
@@ -46,13 +46,13 @@ public final class ShardingDatabasesAndTablesConfigurationPrecise implements Exa
shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm()));
Properties properties = new Properties();
properties.setProperty("max.connections.size.per.query", "16");
- dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), properties);
- return dataSource;
+ DATA_SOURCE = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), properties);
+ return DATA_SOURCE;
}
@Override
public DataSource getDataSource() {
- return dataSource;
+ return DATA_SOURCE;
}
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 688ce00..5a2bfa5 100644
--- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -30,18 +30,18 @@ public class DataSourceUtil {
private static final String DEFAULT_SCHEMA = "";
- private static final Map<String, DataSource> datasourceMap = new HashMap<>();
+ private static final Map<String, DataSource> DATA_SOURCE_MAP = new HashMap<>();
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
result.setUser("sa");
result.setPassword("");
- datasourceMap.put(dataSourceName, result);
+ DATA_SOURCE_MAP.put(dataSourceName, result);
}
public static DataSource getDataSource(final String dataSourceName) {
- return datasourceMap.get(dataSourceName);
+ return DATA_SOURCE_MAP.get(dataSourceName);
}
public static void createSchema(final String dataSourceName) {
diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index 29c0593..ae1f44d 100644
--- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -36,7 +36,7 @@ import java.util.Properties;
public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration {
- private static DataSource dataSource;
+ private static DataSource DATA_SOURCE;
@Override
public DataSource createDataSource() throws SQLException {
@@ -48,13 +48,13 @@ public final class ShardingDatabasesAndTablesConfigurationPrecise implements Exa
shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm()));
Properties properties = new Properties();
properties.setProperty("max.connections.size.per.query", "16");
- dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
- return dataSource;
+ DATA_SOURCE = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
+ return DATA_SOURCE;
}
@Override
public DataSource getDataSource() {
- return dataSource;
+ return DATA_SOURCE;
}
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
index 7be2702..b8de670 100644
--- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
+++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
@@ -22,7 +22,11 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Orde
import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository;
import javax.sql.DataSource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.LinkedList;
import java.util.List;
diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 3836314..0b77234 100644
--- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -31,18 +31,18 @@ public class DataSourceUtil {
private static final String DEFAULT_SCHEMA = "";
- private static final Map<String, DataSource> datasourceMap = new HashMap<>();
+ private static final Map<String, DataSource> DATA_SOURCE_MAP = new HashMap<>();
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
result.setUser("sa");
result.setPassword("");
- datasourceMap.put(dataSourceName, result);
+ DATA_SOURCE_MAP.put(dataSourceName, result);
}
public static DataSource getDataSource(final String dataSourceName) {
- return datasourceMap.get(dataSourceName);
+ return DATA_SOURCE_MAP.get(dataSourceName);
}
public static void createSchema(final String dataSourceName) {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
index 213696a..59ca239 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
@@ -18,13 +18,6 @@
package org.apache.skywalking.apm.testcase.shardingsphere;
-import javax.sql.DataSource;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.support.SpringBootServletInitializer;
@@ -34,7 +27,7 @@ public class Application extends SpringBootServletInitializer {
public static void main(String[] args) {
try {
-
+
SpringApplication.run(Application.class, args);
} catch (Exception e) {
// Never do this
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index bfcc6d8..0c5de3b 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -35,7 +35,7 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.
public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration {
- private static DataSource dataSource;
+ private static DataSource DATA_SOURCE;
@Override
public DataSource createDataSource() throws SQLException {
@@ -47,13 +47,13 @@ public final class ShardingDatabasesAndTablesConfigurationPrecise implements Exa
shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm()));
Properties properties = new Properties();
properties.setProperty("max.connections.size.per.query", "16");
- dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
- return dataSource;
+ DATA_SOURCE = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
+ return DATA_SOURCE;
}
@Override
public DataSource getDataSource() {
- return dataSource;
+ return DATA_SOURCE;
}
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 688ce00..5a2bfa5 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -30,18 +30,18 @@ public class DataSourceUtil {
private static final String DEFAULT_SCHEMA = "";
- private static final Map<String, DataSource> datasourceMap = new HashMap<>();
+ private static final Map<String, DataSource> DATA_SOURCE_MAP = new HashMap<>();
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
result.setUser("sa");
result.setPassword("");
- datasourceMap.put(dataSourceName, result);
+ DATA_SOURCE_MAP.put(dataSourceName, result);
}
public static DataSource getDataSource(final String dataSourceName) {
- return datasourceMap.get(dataSourceName);
+ return DATA_SOURCE_MAP.get(dataSourceName);
}
public static void createSchema(final String dataSourceName) {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
index 213696a..96dbecc 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
@@ -18,13 +18,6 @@
package org.apache.skywalking.apm.testcase.shardingsphere;
-import javax.sql.DataSource;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.support.SpringBootServletInitializer;
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index bfcc6d8..0c5de3b 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -35,7 +35,7 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.
public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration {
- private static DataSource dataSource;
+ private static DataSource DATA_SOURCE;
@Override
public DataSource createDataSource() throws SQLException {
@@ -47,13 +47,13 @@ public final class ShardingDatabasesAndTablesConfigurationPrecise implements Exa
shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm()));
Properties properties = new Properties();
properties.setProperty("max.connections.size.per.query", "16");
- dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
- return dataSource;
+ DATA_SOURCE = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
+ return DATA_SOURCE;
}
@Override
public DataSource getDataSource() {
- return dataSource;
+ return DATA_SOURCE;
}
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 688ce00..5a2bfa5 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -30,18 +30,18 @@ public class DataSourceUtil {
private static final String DEFAULT_SCHEMA = "";
- private static final Map<String, DataSource> datasourceMap = new HashMap<>();
+ private static final Map<String, DataSource> DATA_SOURCE_MAP = new HashMap<>();
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
result.setUser("sa");
result.setPassword("");
- datasourceMap.put(dataSourceName, result);
+ DATA_SOURCE_MAP.put(dataSourceName, result);
}
public static DataSource getDataSource(final String dataSourceName) {
- return datasourceMap.get(dataSourceName);
+ return DATA_SOURCE_MAP.get(dataSourceName);
}
public static void createSchema(final String dataSourceName) {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
index f8b63de..f6244fa 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
@@ -18,13 +18,6 @@
package org.apache.skywalking.apm.testcase.shardingsphere;
-import javax.sql.DataSource;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService;
-import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.support.SpringBootServletInitializer;
diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index b0d4e2c..4fa3134 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -35,7 +35,7 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.
public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration {
- private static DataSource dataSource;
+ private static DataSource DATA_SOURCE;
@Override
public DataSource createDataSource() throws SQLException {
@@ -47,13 +47,13 @@ public final class ShardingDatabasesAndTablesConfigurationPrecise implements Exa
shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm()));
Properties properties = new Properties();
properties.setProperty("max.connections.size.per.query", "16");
- dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
- return dataSource;
+ DATA_SOURCE = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties);
+ return DATA_SOURCE;
}
@Override
public DataSource getDataSource() {
- return dataSource;
+ return DATA_SOURCE;
}
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 688ce00..5a2bfa5 100644
--- a/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -30,18 +30,18 @@ public class DataSourceUtil {
private static final String DEFAULT_SCHEMA = "";
- private static final Map<String, DataSource> datasourceMap = new HashMap<>();
+ private static final Map<String, DataSource> DATA_SOURCE_MAP = new HashMap<>();
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
result.setUser("sa");
result.setPassword("");
- datasourceMap.put(dataSourceName, result);
+ DATA_SOURCE_MAP.put(dataSourceName, result);
}
public static DataSource getDataSource(final String dataSourceName) {
- return datasourceMap.get(dataSourceName);
+ return DATA_SOURCE_MAP.get(dataSourceName);
}
public static void createSchema(final String dataSourceName) {
diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java
index fadbe50..ca93200 100644
--- a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java
+++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java
@@ -44,7 +44,7 @@ public class CaseController {
@ResponseBody
public String sofarpc() {
SofaRpcDemoService service = consumerConfig.refer();
- System.out.println(service.hello("sofarpc"));
+ service.hello("sofarpc");
return SUCCESS;
}
}
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
index 37407a4..53c13d0 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
@@ -36,15 +36,15 @@ segmentItems:
skipAnalysis: 'false'
- segmentId: not null
spans:
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
similarity index 91%
rename from test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
rename to test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
index 92d2306..487bff7 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3;
+package test.apache.skywalking.apm.testcase.spring3;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
+import test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
@Controller
public class CaseController {
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
similarity index 93%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
rename to test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
index b3d9b37..274aaf4 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.component;
+package test.apache.skywalking.apm.testcase.spring3.component;
import org.springframework.stereotype.Component;
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
similarity index 94%
copy from test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
copy to test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
index c2f7004..84f871e 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.dao;
+package test.apache.skywalking.apm.testcase.spring3.dao;
import org.springframework.stereotype.Repository;
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
similarity index 84%
rename from test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
rename to test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
index 1b6abac..811fe11 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.service;
+package test.apache.skywalking.apm.testcase.spring3.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
-import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
@Service
public class TestServiceBean {
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index 830528d..51c5549 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -20,7 +20,7 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase.spring3"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase.spring3"/>
<context:annotation-config/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/jsp/"/>
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
index 13cddd7..b6d866d 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
@@ -36,15 +36,15 @@ segmentItems:
skipAnalysis: 'false'
- segmentId: not null
spans:
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
similarity index 95%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
index 2a310e7..e7fb187 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.entity;
+package test.apache.skywalking.apm.testcase.entity;
public class User {
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
similarity index 90%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
index a455a18..ab18e86 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.restapi;
+package test.apache.skywalking.apm.testcase.restapi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -30,12 +30,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.util.UriComponentsBuilder;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@Controller
public class RestCaseController {
- private static final Map<Integer, User> users = new ConcurrentHashMap<Integer, User>();
+ private static final Map<Integer, User> USERS = new ConcurrentHashMap<Integer, User>();
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ResponseBody
@@ -48,7 +48,7 @@ public class RestCaseController {
@ResponseStatus(HttpStatus.CREATED)
public void createUser(@RequestBody User user, HttpServletResponse response,
UriComponentsBuilder ucBuilder) throws InterruptedException {
- users.put(user.getId(), user);
+ USERS.put(user.getId(), user);
response.setHeader("Location", ucBuilder.path("/get/{id}")
.buildAndExpand(user.getId())
.toUri()
@@ -65,10 +65,10 @@ public class RestCaseController {
@ResponseBody
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteUser(@PathVariable("id") int id) throws InterruptedException {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
if (currentUser == null) {
return;
}
- users.remove(id);
+ USERS.remove(id);
}
}
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
similarity index 81%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
index 19b0161..d1e32ad 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.resttemplate;
+package test.apache.skywalking.apm.testcase.resttemplate;
import java.io.IOException;
import okhttp3.OkHttpClient;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@Controller
public class RestTemplateController {
@@ -38,28 +38,28 @@ public class RestTemplateController {
private static final Logger LOGGER = LogManager.getLogger(RestTemplateController.class);
- private static final String url = "http://localhost:8080/spring-3.1.x-scenario";
+ private static final String URL = "http://localhost:8080/spring-3.1.x-scenario";
@RequestMapping("/case/resttemplate")
@ResponseBody
public String restTemplate() throws IOException {
- Request request = new Request.Builder().url(url + "/case/spring3/").build();
+ Request request = new Request.Builder().url(URL + "/case/spring3/").build();
Response response = new OkHttpClient().newCall(request).execute();
LOGGER.info(response.toString());
// Create user
HttpEntity<User> userEntity = new HttpEntity<>(new User(1, "a"));
- new RestTemplate().postForEntity(url + "/create/", userEntity, Void.class);
+ new RestTemplate().postForEntity(URL + "/create/", userEntity, Void.class);
// Find User
- new RestTemplate().getForEntity(url + "/get/{id}", User.class, 1);
+ new RestTemplate().getForEntity(URL + "/get/{id}", User.class, 1);
//Modify user
HttpEntity<User> updateUserEntity = new HttpEntity<>(new User(1, "b"));
- new RestTemplate().put(url + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
+ new RestTemplate().put(URL + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
//Delete user
- new RestTemplate().delete(url + "/delete/{id}", 1);
+ new RestTemplate().delete(URL + "/delete/{id}", 1);
return SUCCESS;
}
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
similarity index 90%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
index 183e509..501c691 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3;
+package test.apache.skywalking.apm.testcase.spring3;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
+import test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
@Controller
public class CaseController {
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
similarity index 93%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
index b3d9b37..274aaf4 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.component;
+package test.apache.skywalking.apm.testcase.spring3.component;
import org.springframework.stereotype.Component;
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
similarity index 94%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
index c2f7004..84f871e 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.dao;
+package test.apache.skywalking.apm.testcase.spring3.dao;
import org.springframework.stereotype.Repository;
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
similarity index 84%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
rename to test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
index 1b6abac..c940d54 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.service;
+package test.apache.skywalking.apm.testcase.spring3.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
-import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
+import test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
@Service
public class TestServiceBean {
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index f437336..6fb2e72 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase"/>
<context:annotation-config/>
<mvc:annotation-driven/>
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
index 38ead27..b4314fb 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
@@ -36,15 +36,15 @@ segmentItems:
skipAnalysis: 'false'
- segmentId: not null
spans:
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
similarity index 95%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
index 2a310e7..e7fb187 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.entity;
+package test.apache.skywalking.apm.testcase.entity;
public class User {
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
similarity index 90%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
index a455a18..ab18e86 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.restapi;
+package test.apache.skywalking.apm.testcase.restapi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -30,12 +30,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.util.UriComponentsBuilder;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@Controller
public class RestCaseController {
- private static final Map<Integer, User> users = new ConcurrentHashMap<Integer, User>();
+ private static final Map<Integer, User> USERS = new ConcurrentHashMap<Integer, User>();
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ResponseBody
@@ -48,7 +48,7 @@ public class RestCaseController {
@ResponseStatus(HttpStatus.CREATED)
public void createUser(@RequestBody User user, HttpServletResponse response,
UriComponentsBuilder ucBuilder) throws InterruptedException {
- users.put(user.getId(), user);
+ USERS.put(user.getId(), user);
response.setHeader("Location", ucBuilder.path("/get/{id}")
.buildAndExpand(user.getId())
.toUri()
@@ -65,10 +65,10 @@ public class RestCaseController {
@ResponseBody
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteUser(@PathVariable("id") int id) throws InterruptedException {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
if (currentUser == null) {
return;
}
- users.remove(id);
+ USERS.remove(id);
}
}
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
similarity index 81%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
index d8c475e..0178598 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.resttemplate;
+package test.apache.skywalking.apm.testcase.resttemplate;
import java.io.IOException;
import okhttp3.OkHttpClient;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@Controller
public class RestTemplateController {
@@ -38,28 +38,28 @@ public class RestTemplateController {
private static final Logger LOGGER = LogManager.getLogger(RestTemplateController.class);
- private static final String url = "http://localhost:8080/spring-4.1.x-scenario";
+ private static final String URL = "http://localhost:8080/spring-4.1.x-scenario";
@RequestMapping("/case/resttemplate")
@ResponseBody
public String restTemplate() throws IOException {
- Request request = new Request.Builder().url(url + "/case/spring3/").build();
+ Request request = new Request.Builder().url(URL + "/case/spring3/").build();
Response response = new OkHttpClient().newCall(request).execute();
LOGGER.info(response.toString());
// Create user
HttpEntity<User> userEntity = new HttpEntity<>(new User(1, "a"));
- new RestTemplate().postForEntity(url + "/create/", userEntity, Void.class);
+ new RestTemplate().postForEntity(URL + "/create/", userEntity, Void.class);
// Find User
- new RestTemplate().getForEntity(url + "/get/{id}", User.class, 1);
+ new RestTemplate().getForEntity(URL + "/get/{id}", User.class, 1);
//Modify user
HttpEntity<User> updateUserEntity = new HttpEntity<>(new User(1, "b"));
- new RestTemplate().put(url + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
+ new RestTemplate().put(URL + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
//Delete user
- new RestTemplate().delete(url + "/delete/{id}", 1);
+ new RestTemplate().delete(URL + "/delete/{id}", 1);
return SUCCESS;
}
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
similarity index 90%
rename from test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
index 183e509..501c691 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3;
+package test.apache.skywalking.apm.testcase.spring3;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
+import test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
@Controller
public class CaseController {
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
similarity index 93%
rename from test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
index b3d9b37..274aaf4 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.component;
+package test.apache.skywalking.apm.testcase.spring3.component;
import org.springframework.stereotype.Component;
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
similarity index 94%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
index c2f7004..84f871e 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.dao;
+package test.apache.skywalking.apm.testcase.spring3.dao;
import org.springframework.stereotype.Repository;
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
similarity index 84%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
rename to test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
index 1b6abac..c940d54 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.service;
+package test.apache.skywalking.apm.testcase.spring3.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
-import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
+import test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
@Service
public class TestServiceBean {
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index f437336..6fb2e72 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase"/>
<context:annotation-config/>
<mvc:annotation-driven/>
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
index 474d9cf..2509ebb 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
@@ -36,15 +36,15 @@ segmentItems:
skipAnalysis: 'false'
- segmentId: not null
spans:
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- - {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
+ - {operationName: test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
similarity index 95%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
index 2a310e7..e7fb187 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/entity/User.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/entity/User.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.entity;
+package test.apache.skywalking.apm.testcase.entity;
public class User {
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
similarity index 65%
copy from test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
copy to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
index 561954d..7a95a93 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
@@ -15,16 +15,21 @@
* limitations under the License.
*
*/
-package org.apache.skywalking.apm.testcase.vertxeventbus.controller;
-import io.vertx.core.AbstractVerticle;
-import org.apache.skywalking.apm.testcase.vertxeventbus.util.CustomMessage;
+package test.apache.skywalking.apm.testcase.implinterface;
-public class LocalReceiver extends AbstractVerticle {
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestCaseController implements TestCaseInterface {
+
+ @Override
+ public String implRequestMappingAnnotationTestCase() {
+ return "implRequestMappingAnnotationTestCase";
+ }
@Override
- public void start() {
- vertx.eventBus().consumer("local-message-receiver",
- message -> message.reply(new CustomMessage("local-message-receiver reply")));
+ public String implRestAnnotationTestCase() {
+ return "implRestAnnotationTestCase";
}
}
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
similarity index 67%
copy from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
copy to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
index 67bde16..cdafc05 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
@@ -16,21 +16,15 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.service;
+package test.apache.skywalking.apm.testcase.implinterface;
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
-public class TestService2 {
+public interface TestCaseInterface {
+ @RequestMapping("/impl/requestmapping")
+ String implRequestMappingAnnotationTestCase();
- public static void staticMethod(String str0, int count) {
-
- }
-
- public void method(Object[] objects) {
-
- }
-
- public void method(List str0, int count) {
-
- }
+ @GetMapping("/impl/restmapping")
+ String implRestAnnotationTestCase();
}
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java
similarity index 73%
rename from test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java
index c2f7004..27ddf54 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java
@@ -16,14 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.dao;
+package test.apache.skywalking.apm.testcase.inherit;
-import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-@Repository
-public class TestRepositoryBean {
+@RestController
+@RequestMapping("/inherit/child")
+public class ChildController extends ParentController {
- public String doSomeStuff(String name) {
- return name + "-dealWithRepository";
- }
}
diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java
similarity index 69%
rename from test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java
index 67bde16..16b9281 100644
--- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java
@@ -16,21 +16,17 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.customize.service;
+package test.apache.skywalking.apm.testcase.inherit;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-public class TestService2 {
-
- public static void staticMethod(String str0, int count) {
-
- }
-
- public void method(Object[] objects) {
-
- }
-
- public void method(List str0, int count) {
+@RestController
+@RequestMapping("/inherit/parent")
+public class ParentController {
+ @RequestMapping("test")
+ public String test(Integer param) {
+ return "parent-a" + param;
}
}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
similarity index 91%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
index 2c759d5..84b80bd 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/restapi/RestCaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.restapi;
+package test.apache.skywalking.apm.testcase.restapi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -32,12 +32,12 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.UriComponentsBuilder;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@RestController
public class RestCaseController {
- private static final Map<Integer, User> users = new ConcurrentHashMap<Integer, User>();
+ private static final Map<Integer, User> USERS = new ConcurrentHashMap<Integer, User>();
@GetMapping(value = "/get/{id}")
@ResponseBody
@@ -50,7 +50,7 @@ public class RestCaseController {
@ResponseBody
public ResponseEntity<Void> createUser(@RequestBody User user,
UriComponentsBuilder ucBuilder) throws InterruptedException {
- users.put(user.getId(), user);
+ USERS.put(user.getId(), user);
HttpHeaders headers = new HttpHeaders();
headers.setLocation(ucBuilder.path("/get/{id}").buildAndExpand(user.getId()).toUri());
return new ResponseEntity<Void>(headers, HttpStatus.CREATED);
@@ -67,11 +67,11 @@ public class RestCaseController {
@DeleteMapping(value = "/delete/{id}")
@ResponseBody
public ResponseEntity<Void> deleteUser(@PathVariable("id") int id) throws InterruptedException {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
if (currentUser == null) {
return ResponseEntity.noContent().build();
}
- users.remove(id);
+ USERS.remove(id);
return ResponseEntity.noContent().build();
}
}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
similarity index 81%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
index ea3dc65..50a1fe0 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.resttemplate;
+package test.apache.skywalking.apm.testcase.resttemplate;
import java.io.IOException;
import okhttp3.OkHttpClient;
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
-import test.org.apache.skywalking.apm.testcase.entity.User;
+import test.apache.skywalking.apm.testcase.entity.User;
@RestController
public class RestTemplateController {
@@ -38,38 +38,38 @@ public class RestTemplateController {
private static final Logger LOGGER = LogManager.getLogger(RestTemplateController.class);
- private static final String url = "http://localhost:8080/spring-4.3.x-scenario";
+ private static final String URL = "http://localhost:8080/spring-4.3.x-scenario";
@RequestMapping("/case/resttemplate")
@ResponseBody
public String restTemplate() throws IOException {
- Request request = new Request.Builder().header("mock_header", "mock_value").url(url + "/case/spring3/").build();
+ Request request = new Request.Builder().header("mock_header", "mock_value").url(URL + "/case/spring3/").build();
Response response = new OkHttpClient().newCall(request).execute();
LOGGER.info(response.toString());
// Create user
HttpEntity<User> userEntity = new HttpEntity<>(new User(1, "a"));
- new RestTemplate().postForEntity(url + "/create/", userEntity, Void.class);
+ new RestTemplate().postForEntity(URL + "/create/", userEntity, Void.class);
// Find User
- new RestTemplate().getForEntity(url + "/get/{id}", User.class, 1);
+ new RestTemplate().getForEntity(URL + "/get/{id}", User.class, 1);
//Modify user
HttpEntity<User> updateUserEntity = new HttpEntity<>(new User(1, "b"));
- new RestTemplate().put(url + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
+ new RestTemplate().put(URL + "/update/{id}", updateUserEntity, userEntity.getBody().getId(), 1);
//Delete user
- new RestTemplate().delete(url + "/delete/{id}", 1);
+ new RestTemplate().delete(URL + "/delete/{id}", 1);
- Request inheritRequest = new Request.Builder().url(url + "/inherit/child/test").build();
+ Request inheritRequest = new Request.Builder().url(URL + "/inherit/child/test").build();
response = new OkHttpClient().newCall(inheritRequest).execute();
LOGGER.info(response.toString());
- Request implRequestMappingRequest = new Request.Builder().url(url + "/impl/requestmapping").build();
+ Request implRequestMappingRequest = new Request.Builder().url(URL + "/impl/requestmapping").build();
response = new OkHttpClient().newCall(implRequestMappingRequest).execute();
LOGGER.info(response.toString());
- Request implRestMappingRequest = new Request.Builder().url(url + "/impl/restmapping").build();
+ Request implRestMappingRequest = new Request.Builder().url(URL + "/impl/restmapping").build();
response = new OkHttpClient().newCall(implRestMappingRequest).execute();
LOGGER.info(response.toString());
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
similarity index 90%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
index 183e509..501c691 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/CaseController.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3;
+package test.apache.skywalking.apm.testcase.spring3;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
+import test.apache.skywalking.apm.testcase.spring3.service.TestServiceBean;
@Controller
public class CaseController {
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
similarity index 93%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
index b3d9b37..274aaf4 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.component;
+package test.apache.skywalking.apm.testcase.spring3.component;
import org.springframework.stereotype.Component;
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
similarity index 94%
rename from test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
index c2f7004..84f871e 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.dao;
+package test.apache.skywalking.apm.testcase.spring3.dao;
import org.springframework.stereotype.Repository;
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
similarity index 84%
rename from test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
rename to test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
index 1b6abac..811fe11 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring3.service;
+package test.apache.skywalking.apm.testcase.spring3.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
-import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
+import test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
@Service
public class TestServiceBean {
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
deleted file mode 100644
index ca9b709..0000000
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
+++ /dev/null
@@ -1,36 +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 test.org.apache.skywalking.apm.testcase.implinterface;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestCaseController implements TestCaseInterface {
-
- @Override
- public String implRequestMappingAnnotationTestCase() {
- return "implRequestMappingAnnotationTestCase";
- }
-
- @Override
- public String implRestAnnotationTestCase() {
- return "implRestAnnotationTestCase";
- }
-}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
deleted file mode 100644
index 937659a..0000000
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.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 test.org.apache.skywalking.apm.testcase.implinterface;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-public interface TestCaseInterface {
- @RequestMapping("/impl/requestmapping")
- String implRequestMappingAnnotationTestCase();
-
- @GetMapping("/impl/restmapping")
- String implRestAnnotationTestCase();
-}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ChildController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ChildController.java
deleted file mode 100644
index 264d955..0000000
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ChildController.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 test.org.apache.skywalking.apm.testcase.inherit;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/inherit/child")
-public class ChildController extends ParentController {
-
-}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ParentController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ParentController.java
deleted file mode 100644
index c4e3d7b..0000000
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ParentController.java
+++ /dev/null
@@ -1,33 +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 test.org.apache.skywalking.apm.testcase.inherit;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/inherit/parent")
-public class ParentController {
-
- @RequestMapping("test")
- public String test(Integer param) {
- return "parent-a" + param;
- }
-}
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
index 10222c8..b8a2885 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
@@ -25,6 +25,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
- <context:component-scan base-package="test.org.apache.skywalking.apm.testcase"/>
+ <context:component-scan base-package="test.apache.skywalking.apm.testcase"/>
<mvc:annotation-driven/>
</beans>
\ No newline at end of file
diff --git a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/BackController.java b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/BackController.java
index a7ecdfa..da42d41 100644
--- a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/BackController.java
+++ b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/BackController.java
@@ -22,7 +22,13 @@ import org.apache.skywalking.apm.testcase.feign.entity.User;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.UriComponentsBuilder;
import java.util.Map;
@@ -31,17 +37,17 @@ import java.util.concurrent.ConcurrentHashMap;
@RestController
public class BackController {
- private static final Map<Integer, User> users = new ConcurrentHashMap<>();
+ private static final Map<Integer, User> USERS = new ConcurrentHashMap<>();
@GetMapping("/get/{id}")
public ResponseEntity<User> getUser(@PathVariable("id") int id) {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
return ResponseEntity.ok(currentUser);
}
@PostMapping(value = "/create/")
public ResponseEntity<Void> createUser(@RequestBody User user, UriComponentsBuilder ucBuilder) {
- users.put(user.getId(), user);
+ USERS.put(user.getId(), user);
HttpHeaders headers = new HttpHeaders();
headers.setLocation(ucBuilder.path("/user/{id}").buildAndExpand(user.getId()).toUri());
return new ResponseEntity<>(headers, HttpStatus.CREATED);
@@ -55,11 +61,11 @@ public class BackController {
@DeleteMapping(value = "/delete/{id}")
public ResponseEntity<User> deleteUser(@PathVariable("id") int id) {
- User currentUser = users.get(id);
+ User currentUser = USERS.get(id);
if (currentUser == null) {
return ResponseEntity.noContent().build();
}
- users.remove(id);
+ USERS.remove(id);
return ResponseEntity.noContent().build();
}
}
diff --git a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
similarity index 85%
rename from test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
rename to test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
index b35127e..f49bf25 100644
--- a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
+++ b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
@@ -16,14 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka;
+package test.apache.skywalking.apm.testcase.spring.kafka;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class Application {
public static void main(String[] args) {
diff --git a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
similarity index 98%
rename from test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
rename to test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
index d2569e7..7c3b320 100644
--- a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
+++ b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka.controller;
+package test.apache.skywalking.apm.testcase.spring.kafka.controller;
import okhttp3.OkHttpClient;
import okhttp3.Request;
diff --git a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
similarity index 85%
rename from test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
rename to test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
index b35127e..f49bf25 100644
--- a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
+++ b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
@@ -16,14 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka;
+package test.apache.skywalking.apm.testcase.spring.kafka;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class Application {
public static void main(String[] args) {
diff --git a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
similarity index 98%
rename from test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
rename to test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
index 126fc5b..a36c34c 100644
--- a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
+++ b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka.controller;
+package test.apache.skywalking.apm.testcase.spring.kafka.controller;
import okhttp3.OkHttpClient;
import okhttp3.Request;
diff --git a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
similarity index 94%
rename from test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
rename to test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
index afefaed..56eb4f0 100644
--- a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java
+++ b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka;
+package test.apache.skywalking.apm.testcase.spring.kafka;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
similarity index 98%
rename from test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
rename to test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
index 03c7f1e..0bbae64 100644
--- a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
+++ b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.kafka.controller;
+package test.apache.skywalking.apm.testcase.spring.kafka.controller;
import okhttp3.OkHttpClient;
import okhttp3.Request;
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java b/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
index 48f90ac..41dd892 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
+++ b/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequestMapping("/case")
public class CaseController {
- private static final Logger logger = LogManager.getLogger(CaseController.class);
+ private static final Logger LOGGER = LogManager.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java b/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
index 25b022f..dc36b16 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
+++ b/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
@@ -33,16 +33,16 @@ import java.io.IOException;
@EnableScheduling
public class SchedulingJob {
- private static final Logger logger = LogManager.getLogger(SchedulingJob.class);
+ private static final Logger LOGGER = LogManager.getLogger(SchedulingJob.class);
- private static final OkHttpClient client = new OkHttpClient.Builder().build();
+ private static final OkHttpClient CLIENT = new OkHttpClient.Builder().build();
@Scheduled(fixedDelay = 5000)
public void work() throws IOException {
- logger.info("work job running!");
+ LOGGER.info("work job running!");
Request request = new Request.Builder().url("http://localhost:8080/spring-scheduled-scenario/case/call").build();
- Response response = client.newCall(request).execute();
+ Response response = CLIENT.newCall(request).execute();
response.body().close();
}
}
diff --git a/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml
index bfc3813..aaaba88 100644
--- a/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml
@@ -19,7 +19,7 @@ segmentItems:
segments:
- segmentId: not null
spans:
- - operationName: TX/get/t.o.a.s.a.t.s.t.s.i.DemoServiceImpl.doBiz
+ - operationName: TX/get/t.a.s.a.t.s.t.s.i.DemoServiceImpl.doBiz
operationId: 0
parentSpanId: 0
spanId: 1
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/Application.java
similarity index 94%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/Application.java
index 3d424d8..3175e33 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/Application.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction;
+package test.apache.skywalking.apm.testcase.spring.transaction;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
similarity index 95%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
index a9c8ba4..d0aea76 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.config;
+package test.apache.skywalking.apm.testcase.spring.transaction.config;
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Value;
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
similarity index 94%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
index e7e3bdb..72cd5a8 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.config;
+package test.apache.skywalking.apm.testcase.spring.transaction.config;
import javax.sql.DataSource;
import org.springframework.context.annotation.Bean;
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
similarity index 93%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
index f4d9932..7f8e421 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.controller;
+package test.apache.skywalking.apm.testcase.spring.transaction.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -25,7 +25,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import test.org.apache.skywalking.apm.testcase.spring.transaction.service.DemoService;
+import test.apache.skywalking.apm.testcase.spring.transaction.service.DemoService;
@Controller
@RequestMapping("/case")
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java
similarity index 92%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java
index 2fb6c5e..247423d 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.dao;
+package test.apache.skywalking.apm.testcase.spring.transaction.dao;
public interface DemoDao {
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
similarity index 88%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
index d368c54..d18a9a4 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
@@ -16,12 +16,12 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.dao.impl;
+package test.apache.skywalking.apm.testcase.spring.transaction.dao.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Repository;
-import test.org.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao;
+import test.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao;
@Repository
public class DemoDaoImpl implements DemoDao {
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
similarity index 91%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
index 98fb78a..3b212dc 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.service;
+package test.apache.skywalking.apm.testcase.spring.transaction.service;
public interface DemoService {
diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
similarity index 83%
rename from test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
rename to test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
index 6421e2c..ceee5e6 100644
--- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
+++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
@@ -16,13 +16,13 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.spring.transaction.service.impl;
+package test.apache.skywalking.apm.testcase.spring.transaction.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import test.org.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao;
-import test.org.apache.skywalking.apm.testcase.spring.transaction.service.DemoService;
+import test.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao;
+import test.apache.skywalking.apm.testcase.spring.transaction.service.DemoService;
@Service
public class DemoServiceImpl implements DemoService {
diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/Application.java b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/Application.java
index 3171570..38fc1b7 100644
--- a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/Application.java
+++ b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/Application.java
@@ -1,4 +1,4 @@
-package org.apache.skywalking.apm.testcase.thrift.client;/*
+/*
* 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.
@@ -16,6 +16,8 @@ package org.apache.skywalking.apm.testcase.thrift.client;/*
*
*/
+package org.apache.skywalking.apm.testcase.thrift.client;
+
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/controller/CaseController.java b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/controller/CaseController.java
index a187e44..b94c97c 100644
--- a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/controller/CaseController.java
+++ b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/controller/CaseController.java
@@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/case")
public class CaseController {
- private static final Logger logger = LogManager.getLogger(CaseController.class);
+ private static final Logger LOGGER = LogManager.getLogger(CaseController.class);
private static final String SUCCESS = "Success";
private IClient async;
diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/AsyncClient.java b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/AsyncClient.java
index e7262e0..3680408 100644
--- a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/AsyncClient.java
+++ b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/AsyncClient.java
@@ -33,7 +33,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
public class AsyncClient implements IClient {
- private static final Logger logger = LogManager.getLogger(AsyncClient.class);
+ private static final Logger LOGGER = LogManager.getLogger(AsyncClient.class);
private final TNonblockingSocket transport;
private final GreeterService.AsyncClient client;
@@ -67,13 +67,13 @@ public class AsyncClient implements IClient {
@Override
public void onError(final Exception exception) {
latch.countDown();
- logger.error("", exception);
+ LOGGER.error("", exception);
}
});
try {
latch.await();
} catch (InterruptedException e) {
- logger.error("", e);
+ LOGGER.error("", e);
}
return resp.get();
}
diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/HttpClient.java b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/HttpClient.java
index 936638f..b9e85c0 100644
--- a/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/HttpClient.java
+++ b/test/plugin/scenarios/thrift-scenario/thrift-client/src/main/java/org/apache/skywalking/apm/testcase/thrift/client/service/HttpClient.java
@@ -43,7 +43,6 @@ public class HttpClient implements IClient {
transport.close();
}
-
@Override
public String echo(String message) throws TException {
return client.echo(message);
diff --git a/test/plugin/scenarios/thrift-scenario/thrift-server/src/main/java/org/apache/skywalking/apm/testcase/thrift/server/service/IServer.java b/test/plugin/scenarios/thrift-scenario/thrift-server/src/main/java/org/apache/skywalking/apm/testcase/thrift/server/service/IServer.java
index 10fab29..f5769b3 100644
--- a/test/plugin/scenarios/thrift-scenario/thrift-server/src/main/java/org/apache/skywalking/apm/testcase/thrift/server/service/IServer.java
+++ b/test/plugin/scenarios/thrift-scenario/thrift-server/src/main/java/org/apache/skywalking/apm/testcase/thrift/server/service/IServer.java
@@ -27,7 +27,6 @@ public interface IServer {
void close() throws Exception;
-
final class AsyncHandler implements GreeterService.AsyncIface {
@Override
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/Application.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/Application.java
index fbfb84c..867b907 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/Application.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/Application.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus;
import io.vertx.core.Vertx;
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/ClusterReceiver.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/ClusterReceiver.java
index 1a2a2a6..7ddb2c1 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/ClusterReceiver.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/ClusterReceiver.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus.controller;
import io.vertx.core.AbstractVerticle;
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
index 561954d..64eb415 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus.controller;
import io.vertx.core.AbstractVerticle;
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/VertxEventbusController.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/VertxEventbusController.java
index 70f71a7..b588142 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/VertxEventbusController.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/VertxEventbusController.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus.controller;
import io.vertx.core.AbstractVerticle;
@@ -51,7 +52,7 @@ public class VertxEventbusController extends AbstractVerticle {
vertx.eventBus().send("local-message-receiver", localMessage, reply -> {
if (reply.succeeded()) {
CustomMessage replyMessage = (CustomMessage) reply.result().body();
- System.out.println("Received local reply: " + replyMessage.getMessage());
+ replyMessage.getMessage();
localMessageFuture.complete();
} else {
localMessageFuture.fail(reply.cause());
@@ -63,7 +64,7 @@ public class VertxEventbusController extends AbstractVerticle {
vertx.eventBus().send("cluster-message-receiver", clusterWideMessage, reply -> {
if (reply.succeeded()) {
CustomMessage replyMessage = (CustomMessage) reply.result().body();
- System.out.println("Received cluster reply: " + replyMessage.getMessage());
+ replyMessage.getMessage();
clusterMessageFuture.complete();
} else {
clusterMessageFuture.fail(reply.cause());
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessage.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessage.java
index df22264..8110210 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessage.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessage.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus.util;
public class CustomMessage {
diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessageCodec.java b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessageCodec.java
index 84b3c17..4f1d526 100644
--- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessageCodec.java
+++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/util/CustomMessageCodec.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxeventbus.util;
import io.vertx.core.buffer.Buffer;
diff --git a/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java b/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
index 71cdfa4..105a7ea 100644
--- a/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
+++ b/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxweb;
import io.vertx.core.Vertx;
diff --git a/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java b/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
index 204ceb0..e03f797 100644
--- a/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
+++ b/test/plugin/scenarios/vertx-web-3.54minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxweb.controller;
import io.vertx.core.AbstractVerticle;
diff --git a/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java b/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
index 71cdfa4..105a7ea 100644
--- a/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
+++ b/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxweb;
import io.vertx.core.Vertx;
diff --git a/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java b/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
index 8180a07..cae5f77 100644
--- a/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
+++ b/test/plugin/scenarios/vertx-web-3.6plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.testcase.vertxweb.controller;
import io.vertx.core.AbstractVerticle;
diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java
index 293dc90..b391f40 100644
--- a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java
+++ b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java
@@ -44,9 +44,9 @@ public class TestAnnotationController {
}
return "1";
}
-
+
@RequestMapping("/testcase/webclient/server")
- public String webclientServer(){
+ public String webclientServer() {
return "success";
}
diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java
index 78a7cfc..06b5928 100644
--- a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java
+++ b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java
@@ -28,7 +28,7 @@ import reactor.core.publisher.Mono;
public class TestHandler {
public Mono<ServerResponse> test(ServerRequest request) {
- System.out.println(request.path());
+ request.path();
if (request.path().contains("error")) {
throw new RuntimeException("test_error");
}
diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml
index 61de47b..88ef2ed 100644
--- a/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml
@@ -35,7 +35,7 @@ segmentItems:
- {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'}
- {key: http.method, value: GET}
refs:
- - {parentEndpoint: xxl-job/SimpleJob/test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null}
+ - {parentEndpoint: xxl-job/SimpleJob/test.apache.skywalking.apm.testcase.xxljob.job.BeanJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null}
- segmentId: not null
spans:
- operationName: /xxl-job-2.x-scenario/case/simpleJob
@@ -53,7 +53,7 @@ segmentItems:
tags:
- {key: http.method, value: GET}
- {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'}
- - operationName: xxl-job/SimpleJob/test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob
+ - operationName: xxl-job/SimpleJob/test.apache.skywalking.apm.testcase.xxljob.job.BeanJob
operationId: 0
parentSpanId: -1
spanId: 0
diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java
index 2eb322d..c00b203 100644
--- a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java
+++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob;
+import test.apache.skywalking.apm.testcase.xxljob.job.BeanJob;
@Slf4j
@Configuration
diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
similarity index 96%
rename from test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
rename to test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
index e8a1ca0..1daca75 100644
--- a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
+++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
@@ -16,7 +16,7 @@
*
*/
-package test.org.apache.skywalking.apm.testcase.xxljob.job;
+package test.apache.skywalking.apm.testcase.xxljob.job;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;