You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/05/23 02:05:31 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2530] Enable checkstyle import check (#2996)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new f1880b0b9 [SCB-2530] Enable checkstyle import check (#2996)
f1880b0b9 is described below
commit f1880b0b9d74e89a7e1f2cbf952994fce56746d4
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Mon May 23 10:05:26 2022 +0800
[SCB-2530] Enable checkstyle import check (#2996)
---
.github/workflows/checkstyle.yml | 2 +-
.../checkstyle/checkstyle.xml | 24 +++--
.../center/client/ServiceCenterClientTest.java | 2 +-
.../core/element/impl/CookieAccessItem.java | 1 -
.../protostuff/runtime/model/ModelProtostuff.java | 1 -
.../rest/codec/param/PathProcessorCreator.java | 1 -
.../common/rest/TestAbstractRestInvocation.java | 1 -
.../servicecomb/common/rest/TestDefPath.java | 2 +-
.../common/rest/TestRestEngineSchemaListener.java | 1 -
.../common/rest/TestRestProducerInvocation.java | 1 -
.../common/rest/codec/TestRestCodec.java | 6 +-
.../common/rest/codec/fix/TestDoSFix.java | 1 -
.../common/rest/codec/param/TestPathProcessor.java | 4 +-
.../codec/param/TestQueryProcessorCreator.java | 6 +-
.../common/rest/filter/TestHttpServerFilter.java | 1 -
...HttpServerFilterBeforeSendResponseExecutor.java | 1 -
.../common/rest/locator/TestMicroservicePaths.java | 1 -
.../org/apache/servicecomb/core/TestConfig.java | 12 +--
.../core/executor/TestGroupExecutor.java | 4 +-
.../servicecomb/samples/ConsumerApplication.java | 1 -
.../servicecomb/samples/ConsumerController.java | 1 -
.../servicecomb/samples/ProviderApplication.java | 1 -
.../servicecomb/samples/ProviderApplication.java | 1 -
.../servicecomb/samples/ConsumerApplication.java | 1 -
.../servicecomb/samples/ProviderApplication.java | 1 -
.../demo/localRegistryClient/LocalRegistryIT.java | 1 -
.../servicecomb/demo/pojo/client/PojoClient.java | 4 +-
.../org/apache/servicecomb/demo/DemoSSLCustom.java | 1 -
.../demo/pojo/client/PojoClientTest.java | 2 +-
.../springmvc/handler/ProviderTestHandler.java | 3 -
.../demo/springmvc/server/ControllerImpl.java | 2 -
.../demo/springmvc/server/WeakSpringmvc.java | 4 -
.../ConfigCenterDefaultDeploymentProvider.java | 2 -
.../config/nacos/client/NacosClientTest.java | 1 -
etc/checkstyle-eclipse.xml | 104 ---------------------
etc/checkstyle.xml | 100 --------------------
.../common/config/PaaSResourceUtils.java | 1 -
.../foundation/common/event/TestEventManager.java | 2 +-
.../foundation/common/utils/TestFortifyUtils.java | 2 +-
.../apache/servicecomb/config/TestConfigUtil.java | 1 -
.../TestCompatibilityOfImplementations.java | 3 +-
.../servicecomb/registry/RegistrationManager.java | 1 -
.../api/registry/MicroserviceInstance.java | 1 -
.../servicecomb/registry/version/TestVersion.java | 6 +-
.../servicecomb/foundation/ssl/SSLManagerTest.java | 4 +-
.../foundation/ssl/TestSSLOptionFactory.java | 2 +-
.../foundation/ssl/TrustManagerExtTest.java | 2 +-
.../vertx/http/StandardHttpServletRequestEx.java | 2 +-
.../vertx/stream/InputStreamToReadStream.java | 1 -
.../foundation/vertx/http/TestReadStreamPart.java | 2 +-
...TestVertxServerRequestToHttpServletRequest.java | 1 -
.../vertx/stream/TestBufferInputStream.java | 4 +-
.../servicecomb/router/RouterDistributorTest.java | 6 +-
.../servicecomb/faultinjection/DelayFaultTest.java | 1 -
.../qps/ConsumerQpsFlowControlHandler.java | 2 -
.../servicecomb/qps/QpsControllerManagerTest.java | 2 +-
.../loadbalance/TestLoadBalanceHandler2.java | 12 +--
.../loadbalance/TestServiceCombServer.java | 6 +-
.../servicestage/AKSKAuthHeaderProvider.java | 1 -
.../src/test/resources/config/log4j.z.properties | 2 +-
.../servicecomb/it/testcase/TestDefaultValue.java | 6 +-
.../schema/AnnotatedAttributeSpringmvcSchema.java | 6 --
.../src/test/resources/config/log4j.z.properties | 2 +-
.../tests/SpringMvcIntegrationTestBase.java | 2 +-
pom.xml | 4 +-
.../reference/TestCommonToHttpServletRequest.java | 8 +-
.../schemadiscovery/SchemaDiscoveryService.java | 1 -
.../serviceregistry/ServiceRegistry.java | 1 -
.../diagnosis/instance/InstanceCacheCheckTask.java | 2 -
.../serviceregistry/refresh/AddressManager.java | 1 -
.../api/registry/TestMicroserviceFactory.java | 1 -
.../api/response/TestRegisterInstanceResponse.java | 1 -
.../client/LocalServiceRegistryClientImplTest.java | 1 -
.../TestInstanceCacheCheckerWithoutMock.java | 1 -
.../registry/TestLocalServiceRegistry.java | 1 -
.../cache/RefreshableMicroserviceCacheTest.java | 1 -
.../cache/RefreshableServiceRegistryCacheTest.java | 1 -
.../serviceregistry/swagger/TestSwaggerLoader.java | 1 -
.../task/TestAbstractRegisterTask.java | 4 +-
.../task/TestMicroserviceInstanceRegisterTask.java | 1 -
.../task/TestMicroserviceRegisterTask.java | 5 +-
.../task/TestServiceCenterTask.java | 1 -
.../generator/core/AbstractOperationGenerator.java | 64 +++++++------
.../servicecomb/swagger/TestSwaggerUtils.java | 1 -
.../swagger/generator/core/TestApiOperation.java | 11 +--
.../swagger/generator/core/TestApiResponse.java | 1 -
.../swagger/generator/core/TestArrayType.java | 1 -
.../swagger/generator/core/TestClassUtils.java | 1 -
.../generator/core/TestOperationGenerator.java | 1 -
.../generator/core/TestSwaggerDefinition.java | 1 -
.../generator/core/TestSwaggerGenerator.java | 1 -
.../swagger/generator/core/TestSwaggerUtils.java | 1 -
.../annotation/ApiOperationProcessorTest.java | 1 -
.../processor/annotation/ApiProcessorTest.java | 1 -
.../utils/methodUtilsModel/ServiceInterface.java | 3 -
.../creator/MultipartFilePropertyCreatorTest.java | 1 -
.../org/apache/servicecomb/core/TestException.java | 1 -
.../org/apache/servicecomb/core/TestResponse.java | 1 -
.../swagger/engine/TestSwaggerEnvironment.java | 1 -
.../arguments/consumer/TestJaxrsV1V1.java | 2 -
.../arguments/consumer/TestJaxrsV1V2.java | 4 +-
.../arguments/consumer/TestJaxrsV2V1.java | 1 -
.../arguments/consumer/TestJaxrsV2V2.java | 1 -
.../arguments/consumer/TestPojoV2V2.java | 2 -
.../arguments/consumer/TestSpringmvcV1V1.java | 1 -
.../arguments/consumer/TestSpringmvcV1V2.java | 9 +-
.../arguments/consumer/TestSpringmvcV2V1.java | 2 -
.../invocation/arguments/producer/TestPojo.java | 1 -
.../TestExceptionToProducerResponseConverters.java | 1 -
.../TestJaxrsProducerResponseMapperFactory.java | 1 -
.../converter/TestPartToMultipartFile.java | 1 -
.../transport/highway/TestHighwayConfig.java | 2 +-
.../rest/client/HttpClientRequestFactory.java | 1 -
.../rest/client/RestClientCodecFilterTest.java | 14 ---
.../rest/client/RestClientDecoderTest.java | 14 ---
.../rest/client/RestClientEncoderTest.java | 18 ----
.../transport/rest/client/RestClientTestBase.java | 28 ------
.../RestClientTransportContextFactoryTest.java | 10 --
.../rest/servlet/TestRestServletInjector.java | 2 +-
119 files changed, 129 insertions(+), 499 deletions(-)
diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
index 229ddb2eb..4815c5a0c 100644
--- a/.github/workflows/checkstyle.yml
+++ b/.github/workflows/checkstyle.yml
@@ -35,4 +35,4 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: checkstyle
- run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:checkstyle
+ run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:check
diff --git a/etc/checkstyle-suppressions.xml b/ci/checkstyle/checkstyle.xml
similarity index 61%
rename from etc/checkstyle-suppressions.xml
rename to ci/checkstyle/checkstyle.xml
index 802285ff8..963b85364 100644
--- a/etc/checkstyle-suppressions.xml
+++ b/ci/checkstyle/checkstyle.xml
@@ -16,9 +16,21 @@
~ limitations under the License.
-->
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-<suppressions>
- <suppress checks="." files=".*[\\/]src[\\/]test[\\/]"/>
-</suppressions>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: paas
+ Description: none
+-->
+<module name="Checker">
+ <module name="TreeWalker">
+ <module name="AvoidStarImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports">
+ <property name="processJavadoc" value="true"/>
+ </module>
+ </module>
+</module>
diff --git a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
index 1cb30a1ab..e31c625fd 100755
--- a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
+++ b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
@@ -488,6 +488,6 @@ public class ServiceCenterClientTest {
.updateServiceSchemaContext("111", new SchemaInfo());
Assertions.assertNotNull(result);
- Assertions.assertEquals(true, result);
+ Assertions.assertTrue(result);
}
}
diff --git a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieAccessItem.java b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieAccessItem.java
index 8499ed496..37f7dc556 100644
--- a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieAccessItem.java
+++ b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/CookieAccessItem.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.common.accessLog.core.element.impl;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
diff --git a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtostuff.java b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtostuff.java
index ec4efd654..c9f41070f 100644
--- a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtostuff.java
+++ b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtostuff.java
@@ -24,7 +24,6 @@ import io.protostuff.Tag;
public class ModelProtostuff {
- //CHECKSTYLE:OFF: magicnumber
@Tag(1)
private String destMicroservice;
diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java
index cffb1f470..71d585eb0 100644
--- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java
+++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.common.rest.codec.param;
import java.lang.reflect.Type;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Map;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
index 39e7893e4..d9b3ee4f7 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
@@ -74,7 +74,6 @@ import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
index bb270c055..39aa648fc 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestDefPath.java
@@ -33,6 +33,6 @@ public class TestDefPath {
Assertions.assertEquals(1, oSecondPathRegExp.getGroupWithRegExpCount());
Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test/"));
Assertions.assertEquals("test/", PathRegExp.ensureEndWithSlash("test"));
- Assertions.assertEquals(null, oSecondPathRegExp.match("{test/test}", null));
+ Assertions.assertNull(oSecondPathRegExp.match("{test/test}", null));
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
index 807f1fe72..d8df2e71c 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestEngineSchemaListener.java
@@ -26,7 +26,6 @@ import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
index c8d88f7ac..3facfc7eb 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java
@@ -41,7 +41,6 @@ import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.AfterClass;
-import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
index b6a0932f3..41dbf4502 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java
@@ -90,7 +90,7 @@ public class TestRestCodec {
Assertions.assertEquals("abc", header.get("header"));
} catch (Exception e) {
e.printStackTrace();
- Assertions.assertTrue(false);
+ Assertions.fail();
}
}
@@ -145,7 +145,7 @@ public class TestRestCodec {
Assertions.assertEquals(400, e.getStatusCode());
Assertions.assertTrue(((CommonExceptionData) e.getErrorData()).getMessage().contains("Parameter is not valid"));
}
- Assertions.assertEquals(success, false);
+ Assertions.assertFalse(success);
}
@Test
@@ -174,6 +174,6 @@ public class TestRestCodec {
} catch (InvocationException e) {
Assertions.assertEquals(e.getStatusCode(), Status.BAD_REQUEST.getStatusCode());
}
- Assertions.assertEquals(success, false);
+ Assertions.assertFalse(success);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index 46a2a26cc..4e3abaafa 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.core.exc.InputCoercionException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
import com.google.common.base.Strings;
public class TestDoSFix {
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
index 670f165cb..ab34668fe 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java
@@ -58,14 +58,14 @@ public class TestPathProcessor {
public void testGetValueNoPathVars() throws Exception {
createProcessor("name", String.class);
- Assertions.assertEquals(null, processor.getValue(request));
+ Assertions.assertNull(processor.getValue(request));
}
@Test
public void testGetValuePathNotFound() throws Exception {
prepareGetValue("name", String.class);
- Assertions.assertEquals(null, processor.getValue(request));
+ Assertions.assertNull(processor.getValue(request));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
index 1cb5d46e4..10fb73d5b 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
@@ -49,7 +49,7 @@ public class TestQueryProcessorCreator {
Assertions.assertEquals("", result);
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
- Assertions.assertEquals(null, result);
+ Assertions.assertNull(result);
}
@SuppressWarnings("UnusedAssignment")
@@ -72,11 +72,11 @@ public class TestQueryProcessorCreator {
Mockito.when(request.getParameter("query")).thenReturn("");
result = (String) processor.getValue(request);
- Assertions.assertEquals(null, result);
+ Assertions.assertNull(result);
Mockito.when(request.getParameter("query")).thenReturn(null);
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
result = (String) processor.getValue(request);
- Assertions.assertEquals(null, result);
+ Assertions.assertNull(result);
}
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
index f945d73e6..3976843b8 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilter.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ExecutionException;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
-import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
index 1a45c4289..80f424081 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/TestHttpServerFilterBeforeSendResponseExecutor.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ExecutionException;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
-import org.junit.jupiter.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
index d1be85e94..70aeabf27 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestMicroservicePaths.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.junit.AfterClass;
-import org.junit.jupiter.api.Assertions;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/core/src/test/java/org/apache/servicecomb/core/TestConfig.java b/core/src/test/java/org/apache/servicecomb/core/TestConfig.java
index dafb46c76..81a050ecc 100644
--- a/core/src/test/java/org/apache/servicecomb/core/TestConfig.java
+++ b/core/src/test/java/org/apache/servicecomb/core/TestConfig.java
@@ -47,19 +47,19 @@ public class TestConfig {
String objectString = new String("Unit Testing");
Response oResponse = Response.success(objectString, Status.OK);
- Assertions.assertEquals(true, oResponse.isSucceed());
+ Assertions.assertTrue(oResponse.isSucceed());
oResponse = Response.succResp(objectString);
- Assertions.assertEquals(true, oResponse.isSucceed());
+ Assertions.assertTrue(oResponse.isSucceed());
Assertions.assertEquals(200, oResponse.getStatusCode());
Throwable oThrowable = new Throwable("Error");
oResponse = Response.consumerFailResp(oThrowable);
- Assertions.assertEquals(true, oResponse.isFailed());
+ Assertions.assertTrue(oResponse.isFailed());
oResponse = Response.providerFailResp(oThrowable);
- Assertions.assertEquals(true, oResponse.isFailed());
+ Assertions.assertTrue(oResponse.isFailed());
}
@Test
@@ -99,14 +99,14 @@ public class TestConfig {
Assertions.assertEquals(invocation, ContextUtils.getInvocationContext());
ContextUtils.removeInvocationContext();
- Assertions.assertEquals(null, ContextUtils.getInvocationContext());
+ Assertions.assertNull(ContextUtils.getInvocationContext());
}
@Test
public void testResponse() {
Response response = Response.create(400, "test", null);
InvocationException exception = response.getResult();
- Assertions.assertEquals(null, exception.getErrorData());
+ Assertions.assertNull(exception.getErrorData());
response = Response.create(400, "test", "errorData");
exception = response.getResult();
diff --git a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
index 597ba7b65..dcb9ff822 100644
--- a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
+++ b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
@@ -123,10 +123,10 @@ public class TestGroupExecutor {
groupExecutor.execute(() -> {
});
Map<Long, Executor> threadExecutorMap = Deencapsulation.getField(groupExecutor, "threadExecutorMap");
- Assertions.assertEquals(true, (threadExecutorMap.size() > 0));
+ Assertions.assertTrue((threadExecutorMap.size() > 0));
List<Executor> executorList = Deencapsulation.getField(groupExecutor, "executorList");
- Assertions.assertEquals(true, (executorList.size() > 1));
+ Assertions.assertTrue((executorList.size() > 1));
ReactiveExecutor oReactiveExecutor = new ReactiveExecutor();
oReactiveExecutor.execute(() -> strThreadTest = "thread Ran");
diff --git a/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java b/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
index 0010f13c8..f9fb01f8f 100644
--- a/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
+++ b/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.samples;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java b/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
index 940a79bb8..dc3ead65d 100644
--- a/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
+++ b/demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.samples;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
diff --git a/demo/demo-cse-v1/provider-canary/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java b/demo/demo-cse-v1/provider-canary/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
index 6542bcedf..021cece7d 100644
--- a/demo/demo-cse-v1/provider-canary/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
+++ b/demo/demo-cse-v1/provider-canary/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.samples;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java b/demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
index 6542bcedf..021cece7d 100644
--- a/demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
+++ b/demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.samples;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java b/demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
index 0010f13c8..f9fb01f8f 100644
--- a/demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
+++ b/demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.samples;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java b/demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
index 6542bcedf..021cece7d 100644
--- a/demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
+++ b/demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.samples;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
index 81b247ef8..d1798355e 100644
--- a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.demo.localRegistryClient;
import static org.hamcrest.core.Is.is;
import org.apache.servicecomb.demo.TestMgr;
-import org.apache.servicecomb.demo.localRegistryClient.Application;
import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
diff --git a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
index 3b69ad036..ec94a0f6f 100644
--- a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
+++ b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java
@@ -26,8 +26,6 @@ import java.util.Set;
import java.util.concurrent.ForkJoinPool;
import java.util.stream.IntStream;
-import javax.inject.Inject;
-
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.provider.consumer.InvokerUtils;
import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
@@ -55,7 +53,7 @@ import org.springframework.stereotype.Component;
public class PojoClient {
private static final Logger LOGGER = LoggerFactory.getLogger(PojoClient.class);
- public static final byte buffer[] = new byte[1024];
+ public static final byte[] buffer = new byte[1024];
// reference a not exist a microservice, and never use it
// this should not cause problems
diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/DemoSSLCustom.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/DemoSSLCustom.java
index 42601cc16..ee8e5fd91 100644
--- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/DemoSSLCustom.java
+++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/DemoSSLCustom.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.demo;
import java.io.File;
-import java.net.URL;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java
index a67bfa6e4..b0abd546a 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java
@@ -42,7 +42,7 @@ public class PojoClientTest {
public static Test testFromXml;
- public static final byte buffer[] = new byte[1024];
+ public static final byte[] buffer = new byte[1024];
public static final String SPLITPARAM_RESPONSE_USER_SUFFIX = "(modified by MyHandler)";
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/handler/ProviderTestHandler.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/handler/ProviderTestHandler.java
index e83f1c9c8..51162feb1 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/handler/ProviderTestHandler.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/handler/ProviderTestHandler.java
@@ -20,9 +20,6 @@ package org.apache.servicecomb.demo.springmvc.handler;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
-import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
-import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java
index 8d7dfb33c..f3a65fb18 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java
@@ -37,8 +37,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import io.swagger.annotations.ApiOperation;
-
// This class tests "contract first", the controller.yaml will override annotations defined in class.
@RestSchema(schemaId = "controller")
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/WeakSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/WeakSpringmvc.java
index 35ee2dcf9..834072175 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/WeakSpringmvc.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/WeakSpringmvc.java
@@ -19,18 +19,14 @@ package org.apache.servicecomb.demo.springmvc.server;
import java.util.List;
-import javax.servlet.ServletContext;
-
import org.apache.servicecomb.demo.model.SpecialNameModel;
import org.apache.servicecomb.demo.server.GenericsModel;
import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.apache.servicecomb.swagger.invocation.context.ContextUtils;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.context.ContextLoader;
import io.swagger.annotations.ApiOperation;
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/collect/ConfigCenterDefaultDeploymentProvider.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/collect/ConfigCenterDefaultDeploymentProvider.java
index 287f1ac7f..34cfa7332 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/collect/ConfigCenterDefaultDeploymentProvider.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/collect/ConfigCenterDefaultDeploymentProvider.java
@@ -17,11 +17,9 @@
package org.apache.servicecomb.config.collect;
-import java.util.Arrays;
import java.util.List;
import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.deployment.DeploymentProvider;
import org.apache.servicecomb.deployment.SystemBootstrapInfo;
diff --git a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
index 40c52b70a..68e4f3e82 100644
--- a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
+++ b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.config.nacos.client;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.config.nacos.archaius.sources.NacosConfigurationSourceImpl;
diff --git a/etc/checkstyle-eclipse.xml b/etc/checkstyle-eclipse.xml
deleted file mode 100644
index 956816ecd..000000000
--- a/etc/checkstyle-eclipse.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
- This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
- Checkstyle-Configuration: checkstyle for eclipse
- Description: none
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <property name="fileExtensions" value="java, properties, xml"/>
- <module name="TreeWalker">
- <module name="FileContentsHolder"/>
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports">
- <property name="processJavadoc" value="false"/>
- </module>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
- <module name="EmptyForIteratorPad"/>
- <module name="GenericWhitespace"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber">
- <property name="constantWaiverParentToken" value="TYPECAST,METHOD_CALL,EXPR,ARRAY_INIT,UNARY_MINUS,UNARY_PLUS,ELIST,STAR,ASSIGN,PLUS,MINUS,DIV,LITERAL_NEW"/>
- </module>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier">
- <property name="protectedAllowed" value="true"/>
- <property name="allowPublicFinalFields" value="true"/>
- </module>
- <module name="ArrayTypeStyle"/>
- <module name="TodoComment">
- <property name="severity" value="ignore"/>
- <property name="format" value="TODO: "/>
- <message key="todo.match" value="TODO: ''{0}'' 。"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="UpperEll"/>
- </module>
- <module name="SuppressionCommentFilter"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
- <module name="FileLength"/>
- <module name="FileTabCharacter"/>
- <module name="SuppressionFilter">
- <property name="file" value="${config_loc}\checkstyle-suppressions.xml"/>
- </module>
-</module>
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
deleted file mode 100644
index 08d5b8e3a..000000000
--- a/etc/checkstyle.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
- This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
- Checkstyle-Configuration: paas
- Description: none
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <property name="fileExtensions" value="java, properties, xml"/>
- <module name="TreeWalker">
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports">
- <property name="processJavadoc" value="false"/>
- </module>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
- <module name="EmptyForIteratorPad"/>
- <module name="GenericWhitespace"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber">
- <property name="constantWaiverParentToken" value="TYPECAST,METHOD_CALL,EXPR,ARRAY_INIT,UNARY_MINUS,UNARY_PLUS,ELIST,STAR,ASSIGN,PLUS,MINUS,DIV,LITERAL_NEW"/>
- </module>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier">
- <property name="protectedAllowed" value="true"/>
- <property name="allowPublicFinalFields" value="true"/>
- </module>
- <module name="ArrayTypeStyle"/>
- <module name="TodoComment">
- <property name="severity" value="ignore"/>
- <property name="format" value="TODO: "/>
- <message key="todo.match" value="TODO: ''{0}'' 。"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="SuppressionCommentFilter"/>
- <module name="UpperEll"/>
- </module>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
- <module name="FileLength"/>
- <module name="FileTabCharacter"/>
-</module>
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
index cf31892bc..77270ec2d 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.foundation.common.config;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.Properties;
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
index c1fbf71d5..6b6b1caac 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
@@ -97,7 +97,7 @@ public class TestEventManager {
}
// ensure logs: "LOGGER.warn("Failed to create lambda for method: {}, fallback to reflect.", method, throwable);"
- Assertions.assertTrue(!collector.getEvents().isEmpty());
+ Assertions.assertFalse(collector.getEvents().isEmpty());
collector.teardown();
}
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFortifyUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFortifyUtils.java
index 4af04181d..5ca8147e1 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFortifyUtils.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFortifyUtils.java
@@ -54,7 +54,7 @@ public class TestFortifyUtils {
Assertions.assertNotNull(FortifyUtils.getSecurityXmlDocumentFactory());
} catch (Exception e) {
/* Do not Worry */
- Assertions.assertTrue(false);
+ Assertions.fail();
}
}
diff --git a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
index 8df5fa0e3..ba0b018b1 100644
--- a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
+++ b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
@@ -39,7 +39,6 @@ import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/compatibility/TestCompatibilityOfImplementations.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/compatibility/TestCompatibilityOfImplementations.java
index f5100648f..460842fc6 100644
--- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/compatibility/TestCompatibilityOfImplementations.java
+++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/compatibility/TestCompatibilityOfImplementations.java
@@ -54,8 +54,7 @@ public class TestCompatibilityOfImplementations {
values = scbWeak.serialize(root);
Assertions.assertEquals(values.length, 0);
Map<String, Object> newRootMap = (Map<String, Object>) scbWeak.deserialize(values);
- Assertions.assertEquals(null,
- newRootMap.get("fixed32sNotPacked")); // This is different , because depends on default model initializer
+ Assertions.assertNull(newRootMap.get("fixed32sNotPacked")); // This is different , because depends on default model initializer
List<Integer> iValues = new ArrayList<>();
iValues.add(30);
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
index cf817a868..19687128c 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
@@ -54,7 +54,6 @@ import com.google.common.eventbus.Subscribe;
import com.netflix.config.DynamicPropertyFactory;
import io.vertx.core.json.jackson.JacksonFactory;
-import io.vertx.core.spi.json.JsonCodec;
public class RegistrationManager {
private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationManager.class);
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
index 47fbd9624..316221d8a 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.lang.StringUtils;
import org.apache.servicecomb.config.BootStrapProperties;
import org.apache.servicecomb.registry.config.InstancePropertiesLoader;
import org.apache.servicecomb.registry.definition.DefinitionConst;
diff --git a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/version/TestVersion.java b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/version/TestVersion.java
index 8cea823c3..32e546fdc 100644
--- a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/version/TestVersion.java
+++ b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/version/TestVersion.java
@@ -175,9 +175,9 @@ public class TestVersion {
public void testEquals() {
version = new Version(s1, s1, s1, s1);
- Assertions.assertTrue(version.equals(version));
- Assertions.assertTrue(version.equals(new Version(s1, s1, s1, s1)));
- Assertions.assertFalse(version.equals(null));
+ Assertions.assertEquals(version, version);
+ Assertions.assertEquals(version, new Version(s1, s1, s1, s1));
+ Assertions.assertNotEquals(null, version);
}
@Test
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLManagerTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLManagerTest.java
index 6aa67c1ef..4ab4d9ed6 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLManagerTest.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLManagerTest.java
@@ -132,7 +132,7 @@ public class SSLManagerTest {
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA"
.split(",");
Assertions.assertArrayEquals(ciphers, ciphersExpected);
- Assertions.assertEquals(serverSocket.getNeedClientAuth(), true);
+ Assertions.assertTrue(serverSocket.getNeedClientAuth());
SSLOption clientoption = SSLOption.build(DIR + "/client.ssl.properties");
SSLSocket clientsocket = SSLManager.createSSLSocket(clientoption, custom);
@@ -146,7 +146,7 @@ public class SSLManagerTest {
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA"
.split(",");
Assertions.assertArrayEquals(clientciphers, clientciphersExpected);
- Assertions.assertEquals(clientsocket.getNeedClientAuth(), false);
+ Assertions.assertFalse(clientsocket.getNeedClientAuth());
boolean validAssert = true;
try {
clientsocket.connect(new InetSocketAddress("127.0.0.1", 8886));
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
index 184763ca5..3ee54ccab 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
@@ -32,7 +32,7 @@ public class TestSSLOptionFactory {
@Test
public void testSSLOptionFactory() {
SSLOptionFactory factory = SSLOptionFactory.createSSLOptionFactory("cc", null);
- Assertions.assertEquals(factory, null);
+ Assertions.assertNull(factory);
}
@Test
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
index 5391a646c..a9a5bce39 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
@@ -392,7 +392,7 @@ public class TrustManagerExtTest {
new MockUp<InputStreamReader>() {
@Mock
- public int read(char cbuf[]) throws IOException {
+ public int read(char[] cbuf) throws IOException {
throw new IOException();
}
};
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
index 742567439..c2d179b84 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java
@@ -76,7 +76,7 @@ public class StandardHttpServletRequestEx extends HttpServletRequestWrapper impl
public ServletInputStream getInputStream() throws IOException {
if (this.inputStream == null) {
if (cacheRequest) {
- byte inputBytes[] = IOUtils.toByteArray(getRequest().getInputStream());
+ byte[] inputBytes = IOUtils.toByteArray(getRequest().getInputStream());
ByteBuf byteBuf = Unpooled.wrappedBuffer(inputBytes);
this.inputStream = new BufferInputStream(byteBuf);
setBodyBuffer(Buffer.buffer(Unpooled.wrappedBuffer(byteBuf)));
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java
index 1466b889d..8ca0a6a4e 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
import io.netty.buffer.Unpooled;
import io.vertx.core.AsyncResult;
import io.vertx.core.Context;
-import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Promise;
import io.vertx.core.buffer.Buffer;
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java
index 8f2a23f03..47c66a533 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java
@@ -152,7 +152,7 @@ public class TestReadStreamPart {
RuntimeException error = new RuntimeExceptionWithoutStackTrace();
new MockUp<InputStream>(inputStream) {
@Mock
- int read(byte b[]) throws IOException {
+ int read(byte[] b) throws IOException {
throw error;
}
};
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java
index 184d12074..0f39c04fd 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java
index fe7d10c82..a821ecfb0 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java
@@ -103,7 +103,7 @@ public class TestBufferInputStream {
try {
instance.close();
} catch (Exception e) {
- Assertions.assertTrue(false); // This assertion is made to fail the test case in case the close() throws exception
+ Assertions.fail(); // This assertion is made to fail the test case in case the close() throws exception
}
}
@@ -114,7 +114,7 @@ public class TestBufferInputStream {
@Test
public void testReadBoolean() {
- Assertions.assertEquals(false, instance.readBoolean());
+ Assertions.assertFalse(instance.readBoolean());
}
@Test
diff --git a/governance/src/test/java/org/apache/servicecomb/router/RouterDistributorTest.java b/governance/src/test/java/org/apache/servicecomb/router/RouterDistributorTest.java
index 5a2856c30..f082c2041 100644
--- a/governance/src/test/java/org/apache/servicecomb/router/RouterDistributorTest.java
+++ b/governance/src/test/java/org/apache/servicecomb/router/RouterDistributorTest.java
@@ -31,7 +31,11 @@ import org.springframework.core.env.Environment;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RunWith(SpringRunner.class)
@ContextConfiguration(locations = "classpath:META-INF/spring/*.xml", initializers = ConfigDataApplicationContextInitializer.class)
diff --git a/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/DelayFaultTest.java b/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/DelayFaultTest.java
index f7b356cf8..e2039cd56 100644
--- a/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/DelayFaultTest.java
+++ b/handlers/handler-fault-injection/src/test/java/org/apache/servicecomb/faultinjection/DelayFaultTest.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerQpsFlowControlHandler.java b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerQpsFlowControlHandler.java
index e3e200c2c..de1e317a8 100644
--- a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerQpsFlowControlHandler.java
+++ b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerQpsFlowControlHandler.java
@@ -22,8 +22,6 @@ import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* For qps flow control on consumer side.
diff --git a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
index cb940e206..3405e7f92 100644
--- a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
+++ b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/QpsControllerManagerTest.java
@@ -230,7 +230,7 @@ public class QpsControllerManagerTest {
};
qpsStrategy = testQpsControllerManager.getOrCreate("pojo", invocation);
Assertions.assertEquals("pojo", ((AbstractQpsStrategy) qpsStrategy).getKey());
- Assertions.assertTrue(100 == ((AbstractQpsStrategy) qpsStrategy).getQpsLimit());
+ Assertions.assertEquals(100, (long) ((AbstractQpsStrategy) qpsStrategy).getQpsLimit());
new Expectations() {
{
invocation.getOperationMeta();
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
index ae086ee62..dc1ee6248 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
@@ -66,10 +66,6 @@ import com.google.common.eventbus.Subscribe;
import mockit.Mock;
import mockit.MockUp;
-/**
- *
- *
- */
public class TestLoadBalanceHandler2 {
private Holder<Long> mockTimeMillis;
@@ -186,7 +182,7 @@ public class TestLoadBalanceHandler2 {
handler = new LoadbalanceHandler();
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
server = loadBalancer.chooseServer(invocation);
- Assertions.assertEquals(null, server);
+ Assertions.assertNull(server);
data.put("noneMatchInstance", noneMatchInstance);
parent.cacheVersion(1);
@@ -420,7 +416,7 @@ public class TestLoadBalanceHandler2 {
handler = new LoadbalanceHandler();
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
server = loadBalancer.chooseServer(invocation);
- Assertions.assertEquals(null, server);
+ Assertions.assertNull(server);
data.put("noneMatchInstance", noneMatchInstance);
parent.cacheVersion(1);
@@ -549,7 +545,7 @@ public class TestLoadBalanceHandler2 {
handler = new LoadbalanceHandler(discoveryTree);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
server = loadBalancer.chooseServer(invocation);
- Assertions.assertEquals(null, server);
+ Assertions.assertNull(server);
data.put("noneMatchInstance", noneMatchInstance);
parent.cacheVersion(1);
@@ -690,7 +686,7 @@ public class TestLoadBalanceHandler2 {
handler = new LoadbalanceHandler(discoveryTree);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
server = loadBalancer.chooseServer(invocation);
- Assertions.assertEquals(null, server);
+ Assertions.assertNull(server);
data.put("noneMatchInstance", noneMatchInstance);
parent.cacheVersion(1);
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombServer.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombServer.java
index 3cb885d81..f16516b98 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombServer.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombServer.java
@@ -55,17 +55,17 @@ public class TestServiceCombServer {
@Test
public void testEqualsMethod() {
- Assertions.assertFalse(cs.equals((Object) "abcd"));
+ Assertions.assertNotEquals(cs, (Object) "abcd");
MicroserviceInstance instance1 = new MicroserviceInstance();
instance1.setInstanceId("1234");
ServiceCombServer other = new ServiceCombServer(null, transport, new CacheEndpoint("1234", instance1));
- Assertions.assertFalse(cs.equals(other));
+ Assertions.assertNotEquals(cs, other);
MicroserviceInstance instance2 = new MicroserviceInstance();
instance2.setInstanceId("123456");
other = new ServiceCombServer(null, transport, new CacheEndpoint("abcd", instance2));
- Assertions.assertTrue(cs.equals(other));
+ Assertions.assertEquals(cs, other);
}
@Test
diff --git a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
index f09fa0472..f29100029 100644
--- a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
+++ b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
@@ -35,7 +35,6 @@ import org.apache.servicecomb.foundation.auth.AuthHeaderProvider;
import org.apache.servicecomb.foundation.auth.Cipher;
import org.apache.servicecomb.foundation.auth.DefaultCipher;
import org.apache.servicecomb.foundation.auth.ShaAKSKCipher;
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/integration-tests/dynamic-config-tests/src/test/resources/config/log4j.z.properties b/integration-tests/dynamic-config-tests/src/test/resources/config/log4j.z.properties
index 5520c4668..cffdf89f9 100644
--- a/integration-tests/dynamic-config-tests/src/test/resources/config/log4j.z.properties
+++ b/integration-tests/dynamic-config-tests/src/test/resources/config/log4j.z.properties
@@ -15,4 +15,4 @@
# limitations under the License.
#
log4j.logger.runLogger=WARN
-log4j.rootLogger=WARN,paas,stdout
\ No newline at end of file
+log4j.rootLogger=WARN,paas,stdout
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
index 8bde317fe..b21a8acbc 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
@@ -226,7 +226,7 @@ public class TestDefaultValue {
Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (InvocationException e) {
Assertions.assertEquals(400, e.getStatusCode());
- Assertions.assertEquals(true, e.getMessage().contains("Parameter is not valid"));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is not valid"));
}
}
@@ -269,7 +269,7 @@ public class TestDefaultValue {
Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (InvocationException e) {
Assertions.assertEquals(400, e.getStatusCode());
- Assertions.assertEquals(true, e.getMessage().contains("Parameter is not valid"));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is not valid"));
}
}
@@ -313,7 +313,7 @@ public class TestDefaultValue {
Assertions.assertEquals("required is true, throw exception", "not throw exception");
} catch (InvocationException e) {
Assertions.assertEquals(400, e.getStatusCode());
- Assertions.assertEquals(true, e.getMessage().contains("Parameter is not valid"));
+ Assertions.assertTrue(e.getMessage().contains("Parameter is not valid"));
}
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/AnnotatedAttributeSpringmvcSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/AnnotatedAttributeSpringmvcSchema.java
index a79ddfdd2..ab9dee886 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/AnnotatedAttributeSpringmvcSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/AnnotatedAttributeSpringmvcSchema.java
@@ -66,12 +66,6 @@ public class AnnotatedAttributeSpringmvcSchema {
return inputs + "," + inputs2 + "," + inputs3;
}
-// @PostMapping("fromPart")
-// public String fromPart(@RequestPart("input") String inputs, @RequestPart(value = "input2") String inputs2,
-// @RequestPart(name = "input3") String inputs3) {
-// return inputs + "," + inputs2 + "," + inputs3;
-// }
-
@PostMapping("fromAttribute")
public String fromAttribute(@RequestAttribute("input") String inputs,
@RequestAttribute(value = "input2") String inputs2, @RequestAttribute(name = "input3") String inputs3) {
diff --git a/integration-tests/jaxrs-tests/src/test/resources/config/log4j.z.properties b/integration-tests/jaxrs-tests/src/test/resources/config/log4j.z.properties
index 5520c4668..cffdf89f9 100644
--- a/integration-tests/jaxrs-tests/src/test/resources/config/log4j.z.properties
+++ b/integration-tests/jaxrs-tests/src/test/resources/config/log4j.z.properties
@@ -15,4 +15,4 @@
# limitations under the License.
#
log4j.logger.runLogger=WARN
-log4j.rootLogger=WARN,paas,stdout
\ No newline at end of file
+log4j.rootLogger=WARN,paas,stdout
diff --git a/integration-tests/springmvc-tests/common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java b/integration-tests/springmvc-tests/common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
index 7310a67a3..e61433390 100644
--- a/integration-tests/springmvc-tests/common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
+++ b/integration-tests/springmvc-tests/common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
@@ -631,7 +631,7 @@ public class SpringMvcIntegrationTestBase {
try {
restTemplate
.getForEntity(controllerUrl + "sayhi?name=throwexception", String.class);
- Assertions.assertFalse(true);
+ Assertions.fail();
} catch (HttpServerErrorException e) {
MatcherAssert.assertThat(e.getRawStatusCode(), is(500));
MatcherAssert.assertThat(e.getResponseBodyAsString(),
diff --git a/pom.xml b/pom.xml
index 60dfb6ab3..85f58b436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,8 +174,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>../etc/checkstyle.xml</configLocation>
- <excludes>**/demo/**</excludes>
+ <configLocation>ci/checkstyle/checkstyle.xml</configLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
<plugin>
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
index ab9bf59ee..8fb53f824 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java
@@ -101,7 +101,7 @@ public class TestCommonToHttpServletRequest {
queryParams.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assertions.assertEquals(null, request.getParameter("name"));
+ Assertions.assertNull(request.getParameter("name"));
}
@Test
@@ -109,7 +109,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> queryParams = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, queryParams, null, null, false);
- Assertions.assertEquals(null, request.getParameter("name"));
+ Assertions.assertNull(request.getParameter("name"));
}
@Test
@@ -153,7 +153,7 @@ public class TestCommonToHttpServletRequest {
httpHeaders.put("name", Arrays.asList());
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assertions.assertEquals(null, request.getHeader("name"));
+ Assertions.assertNull(request.getHeader("name"));
}
@Test
@@ -178,7 +178,7 @@ public class TestCommonToHttpServletRequest {
Map<String, List<String>> httpHeaders = new HashMap<>();
HttpServletRequest request = new CommonToHttpServletRequest(null, null, httpHeaders, null, false);
- Assertions.assertEquals(null, request.getHeader("name"));
+ Assertions.assertNull(request.getHeader("name"));
}
@Test
diff --git a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryService.java b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryService.java
index ea634e5ac..7795c9941 100644
--- a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryService.java
+++ b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryService.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.schemadiscovery;
import org.apache.servicecomb.core.Endpoint;
-import org.apache.servicecomb.swagger.invocation.context.InvocationContext;
public interface SchemaDiscoveryService {
String SCHEMA_ID = "SchemaDiscoveryEndpoint";
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
index 643cacd9e..45c66ee91 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
@@ -18,7 +18,6 @@ package org.apache.servicecomb.serviceregistry;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.regex.Pattern;
import org.apache.servicecomb.registry.api.registry.Microservice;
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheCheckTask.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheCheckTask.java
index 36b9ab94c..769c620de 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheCheckTask.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheCheckTask.java
@@ -31,8 +31,6 @@ import com.netflix.config.DynamicIntProperty;
import com.netflix.config.DynamicPropertyFactory;
import com.netflix.config.DynamicStringProperty;
-import io.vertx.core.json.Json;
-
public class InstanceCacheCheckTask implements ServiceRegistryTaskInitializer {
private static final Logger LOGGER = LoggerFactory.getLogger(InstanceCacheCheckTask.class);
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/refresh/AddressManager.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/refresh/AddressManager.java
index e782e0549..b09b928e7 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/refresh/AddressManager.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/refresh/AddressManager.java
@@ -23,7 +23,6 @@ import java.net.Socket;
import java.net.URI;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.http.client.common.AbstractAddressManager;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
index 471b0afe7..5774f8aff 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
@@ -24,7 +24,6 @@ import org.apache.servicecomb.config.BootStrapProperties;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceFactory;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
index 6ef00c6c2..b1aa759c6 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.serviceregistry.api.response;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
index fea0f34c2..0d96b6c15 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
@@ -31,7 +31,6 @@ import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
index ee8f02c8b..a99f849e0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.serviceregistry.ServiceRegistry;
import org.apache.servicecomb.serviceregistry.diagnosis.Status;
import org.apache.servicecomb.serviceregistry.registry.LocalServiceRegistryFactory;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
index 65440d071..c9ee3a0ed 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.serviceregistry.ServiceRegistry;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
index 24d2ec978..3de3c30ec 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
import org.apache.servicecomb.registry.consumer.MicroserviceInstancePing;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache.MicroserviceCacheStatus;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
index e88ec045c..0c49a0851 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
@@ -27,7 +27,6 @@ import org.apache.servicecomb.registry.api.registry.FindInstancesResponse;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache.MicroserviceCacheStatus;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
index 4718e9389..20c5a0eb1 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
@@ -41,7 +41,6 @@ import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.serviceregistry.TestRegistryBase;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
index dccacec18..17469c9db 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
@@ -68,9 +68,9 @@ public class TestAbstractRegisterTask {
new MicroserviceInstanceHeartbeatTask(eventBus, srClient, microservice);
ReflectUtils.setField(heartbeatTask, "heartbeatResult", HeartbeatResult.INSTANCE_NOT_REGISTERED);
- Assertions.assertEquals(true, registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isRegistered());
eventBus.post(heartbeatTask);
- Assertions.assertEquals(false, registerTask.isRegistered());
+ Assertions.assertFalse(registerTask.isRegistered());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
index 63f484bb5..e7f1963b0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
index eb40e383f..9d62237f4 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.client.http.Holder;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -156,8 +155,8 @@ public class TestMicroserviceRegisterTask {
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assertions.assertEquals(false, registerTask.isRegistered());
- Assertions.assertEquals(false, registerTask.isSchemaIdSetMatch());
+ Assertions.assertFalse(registerTask.isRegistered());
+ Assertions.assertFalse(registerTask.isSchemaIdSetMatch());
Assertions.assertEquals("serviceId", microservice.getServiceId());
Assertions.assertEquals("serviceId", microservice.getInstance().getServiceId());
Assertions.assertEquals(1, taskList.size());
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
index d30053dc9..97ddb4b9c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.serviceregistry.task;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
index c4c215cee..e566d6409 100644
--- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
@@ -16,41 +16,11 @@
*/
package org.apache.servicecomb.swagger.generator.core;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.collectAnnotations;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findMethodAnnotationProcessor;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findParameterProcessors;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findResponseTypeProcessor;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.isContextParameter;
-import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.postProcessOperation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.Map.Entry;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.servicecomb.config.inject.PlaceholderResolver;
-import org.apache.servicecomb.swagger.SwaggerUtils;
-import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor;
-import org.apache.servicecomb.swagger.generator.OperationGenerator;
-import org.apache.servicecomb.swagger.generator.ParameterGenerator;
-import org.apache.servicecomb.swagger.generator.ParameterProcessor;
-import org.apache.servicecomb.swagger.generator.ResponseTypeProcessor;
-import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType;
-import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils;
-
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.google.common.reflect.TypeToken;
-
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiParam;
@@ -74,6 +44,40 @@ import io.swagger.models.properties.Property;
import io.swagger.models.properties.StringProperty;
import io.swagger.util.Json;
import io.swagger.util.ReflectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.servicecomb.config.inject.PlaceholderResolver;
+import org.apache.servicecomb.swagger.SwaggerUtils;
+import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor;
+import org.apache.servicecomb.swagger.generator.OperationGenerator;
+import org.apache.servicecomb.swagger.generator.ParameterGenerator;
+import org.apache.servicecomb.swagger.generator.ParameterProcessor;
+import org.apache.servicecomb.swagger.generator.ResponseTypeProcessor;
+import org.apache.servicecomb.swagger.generator.SwaggerConst;
+import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType;
+import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MediaType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.collectAnnotations;
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findMethodAnnotationProcessor;
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findParameterProcessors;
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.findResponseTypeProcessor;
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.isContextParameter;
+import static org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.postProcessOperation;
public abstract class AbstractOperationGenerator implements OperationGenerator {
protected AbstractSwaggerGenerator swaggerGenerator;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
index dc3320e19..a4a639662 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
@@ -24,7 +24,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
index ef72d3b9a..686a52f4c 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
@@ -28,7 +28,6 @@ import org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUti
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.ApiOperation;
@@ -121,14 +120,14 @@ public class TestApiOperation {
Operation operation = path.getPost();
Model result200 = operation.getResponses().get("200").getResponseSchema();
Assertions.assertEquals(ArrayModel.class, result200.getClass());
- Assertions.assertEquals(null, ((ArrayModel) result200).getUniqueItems());
+ Assertions.assertNull(((ArrayModel) result200).getUniqueItems());
}
private void testMap(Path path) {
Operation operation = path.getPost();
Model result200 = operation.getResponses().get("200").getResponseSchema();
Assertions.assertEquals(ModelImpl.class, result200.getClass());
- Assertions.assertTrue(((ModelImpl) result200).getAdditionalProperties() != null);
+ Assertions.assertNotNull(((ModelImpl) result200).getAdditionalProperties());
}
private void testPrimitive(Path path) {
@@ -142,7 +141,7 @@ public class TestApiOperation {
ModelImpl result202 = (ModelImpl) operation.getResponses().get("202").getResponseSchema();
Assertions.assertEquals("string", result202.getType());
- Assertions.assertEquals(null, result202.getFormat());
+ Assertions.assertNull(result202.getFormat());
}
private void testBase(Path path) {
@@ -162,11 +161,11 @@ public class TestApiOperation {
Response response = responseMap.get(SwaggerConst.SUCCESS_KEY);
Assertions.assertNotNull(response);
- Assertions.assertEquals(null, response.getResponseSchema());
+ Assertions.assertNull(response.getResponseSchema());
response = responseMap.get("202");
Assertions.assertNotNull(response);
- Assertions.assertEquals(null, response.getResponseSchema());
+ Assertions.assertNull(response.getResponseSchema());
Assertions.assertEquals(1, response.getHeaders().size());
Assertions.assertEquals("integer", response.getHeaders().get("h1").getType());
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
index 1387d692c..c83764320 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.swagger.generator.core;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.ApiResponse;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
index 3973244ff..92d2113a3 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
@@ -20,7 +20,6 @@ import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.core.schema.ArrayType;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.ModelImpl;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
index e6945379e..b88738650 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -24,7 +24,6 @@ import javax.ws.rs.Path;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.SwaggerDefinition;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
index 2b5731984..fa81441e3 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.Api;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
index 10ef36359..c4fa31010 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.Contact;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index 09912adde..db67900e0 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -23,7 +23,6 @@ import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGenerator;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
index 77d781808..439cc5af7 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
@@ -40,7 +40,6 @@ import org.apache.servicecomb.swagger.generator.core.schema.RepeatOperation;
import org.apache.servicecomb.swagger.generator.core.schema.Schema;
import org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
index c634eb48b..b2bde1c3a 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.ApiOperation;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
index 6484ce597..4319d5eff 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
@@ -26,7 +26,6 @@ import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.annotations.Api;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/methodUtilsModel/ServiceInterface.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/methodUtilsModel/ServiceInterface.java
index 2ec156f14..5145876fd 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/methodUtilsModel/ServiceInterface.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/utils/methodUtilsModel/ServiceInterface.java
@@ -17,9 +17,6 @@
package org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel;
-import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.BaseInterface;
-import org.apache.servicecomb.swagger.generator.core.utils.methodUtilsModel.HelloBean;
-
public interface ServiceInterface extends BaseInterface<HelloBean> {
HelloBean getBase(HelloBean param);
}
diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreatorTest.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreatorTest.java
index 4e581cde7..70277360e 100644
--- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreatorTest.java
+++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreatorTest.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.swagger.generator.springmvc.property.creator;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
import org.springframework.web.multipart.MultipartFile;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
index c3d4f072c..c58491385 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java
@@ -23,7 +23,6 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
index f558e4bc5..d06d3be35 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
index fe030c1d5..b3d23237f 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerEnvironment.java
@@ -24,7 +24,6 @@ import static org.hamcrest.core.IsNull.nullValue;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.apache.servicecomb.swagger.invocation.models.ProducerImpl;
import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
index 9b2a1cd41..ea1fec0cb 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V1.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.arguments.consumer;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.engine.SwaggerConsumer;
@@ -31,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBeanParamV1;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
index 5c00b0937..653cd5864 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV1V2.java
@@ -119,7 +119,7 @@ public class TestJaxrsV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -139,7 +139,7 @@ public class TestJaxrsV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
index 9fa3a9dff..d85b8b2b2 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V1.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBeanParamV1;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
index 63df2df08..8e11a7a40 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestJaxrsV2V2.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBeanParamV2;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.JaxrsAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
index 41f74947c..a24a636a0 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoV2V2.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.arguments.consumer;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.engine.SwaggerConsumer;
@@ -30,7 +29,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.ConsumerAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
index c6cde13b3..0642f0827 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V1.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddWrapperV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
index 3fc226731..e2173ca89 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV1V2.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddBodyV2;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddV2;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddWrapperV2;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
@@ -77,7 +76,7 @@ public class TestSpringmvcV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -100,7 +99,7 @@ public class TestSpringmvcV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -120,7 +119,7 @@ public class TestSpringmvcV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
@@ -140,7 +139,7 @@ public class TestSpringmvcV1V2 {
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
- Assertions.assertEquals(null, result.get("x-z"));
+ Assertions.assertNull(result.get("x-z"));
}
@Test
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
index aefb79612..3979024f3 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestSpringmvcV2V1.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.swagger.invocation.arguments.consumer;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.engine.SwaggerConsumer;
@@ -31,7 +30,6 @@ import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.SpringmvcAddWrapperV1;
import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2;
-import org.junit.Assert;
import org.junit.Test;
import io.swagger.models.Swagger;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
index 23c17d455..a42a58c83 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/TestPojo.java
@@ -25,7 +25,6 @@ import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddBodyV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddV1;
import org.apache.servicecomb.swagger.invocation.schemas.PojoAddWithContextV1;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
index dbf391926..fe8eaf069 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
@@ -24,7 +24,6 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-import org.junit.Assert;
import org.junit.Test;
import mockit.Expectations;
diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
index c68b97f13..304cc3963 100644
--- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
+++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java
@@ -20,7 +20,6 @@ import javax.ws.rs.core.Response;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
index 05fb158cf..114e0fb93 100644
--- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
+++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import javax.servlet.http.Part;
import org.apache.servicecomb.foundation.common.Holder;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
index 89bdd2397..90fb5fd60 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayConfig.java
@@ -48,6 +48,6 @@ public class TestHighwayConfig {
@Test
public void getAddress() {
- Assertions.assertEquals(HighwayConfig.getAddress(), null);
+ Assertions.assertNull(HighwayConfig.getAddress());
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java
index eddb2debc..cf01542a0 100644
--- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java
+++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java
@@ -21,7 +21,6 @@ import org.apache.servicecomb.core.Invocation;
import io.vertx.core.Future;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpClientRequest;
-import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.RequestOptions;
/**
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java
index 29f52917d..625c7111c 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java
@@ -17,20 +17,6 @@
package org.apache.servicecomb.transport.rest.client;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import java.util.concurrent.CompletableFuture;
-
-import javax.ws.rs.core.Response.Status;
-
-import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.core.filter.FilterNode;
-import org.apache.servicecomb.foundation.common.utils.AsyncUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
-import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.jupiter.api.Test;
-
// TODO: vert.x 4 changed HttpClientRequest creation behavior, and will
// connect to server and when successfully HttpClientRequest will created. So tests case will fail.
// These unit tests is hard to modify, will change it to integration test or think another method
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java
index d63019c20..84c6adbc2 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java
@@ -17,20 +17,6 @@
package org.apache.servicecomb.transport.rest.client;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData;
-import org.junit.jupiter.api.Test;
-
-import io.vertx.core.buffer.Buffer;
-import io.vertx.core.json.Json;
-
// TODO: vert.x 4 changed HttpClientRequest creation behavior, and will
// connect to server and when successfully HttpClientRequest will created. So tests case will fail.
// These unit tests is hard to modify, will change it to integration test or think another method
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java
index 616a636d4..b133d7537 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java
@@ -17,24 +17,6 @@
package org.apache.servicecomb.transport.rest.client;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.Part;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.servicecomb.foundation.common.part.FilePart;
-import org.junit.jupiter.api.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
// TODO: vert.x 4 changed HttpClientRequest creation behavior, and will
// connect to server and when successfully HttpClientRequest will created. So tests case will fail.
// These unit tests is hard to modify, will change it to integration test or think another method
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
index 39adbb770..70f956ad6 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTestBase.java
@@ -16,34 +16,6 @@
*/
package org.apache.servicecomb.transport.rest.client;
-import static org.apache.servicecomb.transport.rest.client.RestFeatureController.SCHEMA_ID;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.apache.servicecomb.common.rest.definition.RestMetaUtils;
-import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
-import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter;
-import org.apache.servicecomb.config.ConfigUtil;
-import org.apache.servicecomb.core.Const;
-import org.apache.servicecomb.core.Endpoint;
-import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.core.SCBEngine;
-import org.apache.servicecomb.core.Transport;
-import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
-import org.apache.servicecomb.core.definition.OperationMeta;
-import org.apache.servicecomb.core.filter.impl.ProducerOperationFilter;
-import org.apache.servicecomb.core.filter.impl.ScheduleFilter;
-import org.apache.servicecomb.core.filter.impl.SimpleLoadBalanceFilter;
-import org.apache.servicecomb.core.invocation.InvocationFactory;
-import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
-import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.apache.servicecomb.foundation.vertx.client.http.HttpClients;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
-import io.vertx.core.http.HttpClientRequest;
-
// TODO: vert.x 4 changed HttpClientRequest creation behavior, and will
// connect to server and when successfully HttpClientRequest will created. So tests case will fail.
// These unit tests is hard to modify, will change it to integration test or think another method
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java
index 33a3d2027..c89163681 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java
@@ -17,16 +17,6 @@
package org.apache.servicecomb.transport.rest.client;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import com.google.common.collect.ImmutableMap;
-
// TODO: vert.x 4 changed HttpClientRequest creation behavior, and will
// connect to server and when successfully HttpClientRequest will created. So tests case will fail.
// These unit tests is hard to modify, will change it to integration test or think another method
diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
index 8c3b5505b..a3826a2b6 100644
--- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
+++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java
@@ -41,7 +41,7 @@ public class TestRestServletInjector {
}
};
- Assertions.assertEquals(null, RestServletInjector.defaultInject(servletContext));
+ Assertions.assertNull(RestServletInjector.defaultInject(servletContext));
}
@Test