[SCB-2549] enable checkstyle WhitespaceAfter check (#3040)
diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml
index 21eaa55..c7ce946 100644
--- a/ci/checkstyle/checkstyle.xml
+++ b/ci/checkstyle/checkstyle.xml
@@ -30,6 +30,15 @@
</module>
<module name="TreeWalker">
<module name="AvoidStarImport"/>
+ <module name="NoWhitespaceAfter">
+ <!-- Checks that there is no whitespace after various unary operators.
+ Linebreaks are allowed.
+ -->
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+ UNARY_PLUS"/>
+ <property name="allowLineBreaks" value="true"/>
+ <property name="severity" value="error"/>
+ </module>
<module name="RedundantImport"/>
<module name="RedundantModifier">
<property name="tokens" value="METHOD_DEF, VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/>
@@ -37,5 +46,11 @@
<module name="UnusedImports">
<property name="processJavadoc" value="true"/>
</module>
+ <module name="WhitespaceAfter">
+ <!-- Checks that commas, semicolons and typecasts are followed by
+ whitespace.
+ -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+ </module>
</module>
</module>
diff --git a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/EdgeConst.java b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/EdgeConst.java
index dc5b3f2..7439ec6 100644
--- a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/EdgeConst.java
+++ b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/EdgeConst.java
@@ -1,4 +1,4 @@
-package org.apache.servicecomb.demo.edge.service;/*
+/*
* 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.
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+package org.apache.servicecomb.demo.edge.service;
+
public interface EdgeConst {
String ENCRYPT_CONTEXT = "encryptContext";
}
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 68e4f3e..984e49f 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
@@ -44,7 +44,7 @@
//and make sure the address is 127.0.0.1:8848
//nacosClient.refreshNacosConfig();
Map<String, Object> originMap = Deencapsulation.getField(nacosClient, "originalConfigMap");
- originMap.put("nacos","12345");
+ originMap.put("nacos", "12345");
Assertions.assertEquals(1, originMap.size());
}
diff --git a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeInvocation.java b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeInvocation.java
index 9c502fb..d2eda26 100644
--- a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeInvocation.java
+++ b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeInvocation.java
@@ -44,9 +44,7 @@
protected MicroserviceReferenceConfig microserviceReferenceConfig;
- protected ReferenceConfig referenceConfig;
-
- protected String versionRule = null;//DefinitionConst.VERSION_RULE_ALL;
+ protected String versionRule = null;
protected RoutingContext routingContext;
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 ac55db2..be7d539 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
@@ -63,7 +63,7 @@
@Before
public void setup() throws IOException {
- context.setOwner((VertxInternal)vertx);
+ context.setOwner((VertxInternal) vertx);
inputStream.reset();
}
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 0f39c04..2f8785d 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
@@ -439,7 +439,7 @@
Assertions.assertEquals(1, value);
Assertions.assertSame(is1, request.getInputStream());
- request.setBodyBuffer(Buffer.buffer().appendByte((byte)2));
+ request.setBodyBuffer(Buffer.buffer().appendByte((byte) 2));
ServletInputStream is2 = request.getInputStream();
Assertions.assertNotSame(is1, is2);
}
diff --git a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java
index e43c5c4..6924149 100644
--- a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java
+++ b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java
@@ -18,5 +18,7 @@
package org.apache.servicecomb.it.schema.objectparams;
public enum Color {
- RED,BLUE,GREEN
+ RED,
+ BLUE,
+ GREEN
}
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java
index 1ed20e7..d9e6f67 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java
@@ -54,7 +54,7 @@
intf = ITInvoker.createProxy(producerName, schemaId, transport, intfCls);
scbRestTemplate = new ITSCBRestTemplate(schemaId).init();
edgeRestTemplate = GateRestTemplate.createEdgeRestTemplate(schemaId).init();
- zuulRestTemplate = null;// GateRestTemplate.createZuulRestTemplate(schemaId).init();
+ zuulRestTemplate = null;
this.cseAsyncRestTemplate = new ITSCBAsyncRestTemplate(schemaId).init();
}
diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/EdgeConst.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/EdgeConst.java
index a8d1b52..319ac05 100644
--- a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/EdgeConst.java
+++ b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/EdgeConst.java
@@ -1,4 +1,4 @@
-package org.apache.servicecomb.it.edge;/*
+/*
* 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.
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+package org.apache.servicecomb.it.edge;
+
public interface EdgeConst {
String ENCRYPT_CONTEXT = "encryptContext";
}
diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/handler/ExceptionConvertHandler.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/handler/ExceptionConvertHandler.java
index bc9ac39..1b3d0e3 100644
--- a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/handler/ExceptionConvertHandler.java
+++ b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/handler/ExceptionConvertHandler.java
@@ -31,7 +31,7 @@
invocation.next(response -> {
if (response.isFailed()) {
Throwable e = response.getResult();
- if (e instanceof InvocationException && ((InvocationException)e).getStatusCode() == 408) {
+ if (e instanceof InvocationException && ((InvocationException) e).getStatusCode() == 408) {
CustomException customException = new CustomException("change the response", 777);
InvocationException stt = new InvocationException(Status.EXPECTATION_FAILED, customException);
response.setResult(stt);
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 e566d64..94bfef6 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
@@ -412,11 +412,11 @@
}
// swagger 2.0 do not support NotBlank and NotEmpty annotations, fix it
- if (((JavaType)type).getBindings().getTypeParameters().isEmpty()){
- convertAnnotationProperty(((JavaType)type).getRawClass());
+ if (((JavaType) type).getBindings().getTypeParameters().isEmpty()) {
+ convertAnnotationProperty(((JavaType) type).getRawClass());
} else {
- ((JavaType)type).getBindings().getTypeParameters().stream().
- forEach(javaType -> convertAnnotationProperty(javaType.getRawClass()));
+ ((JavaType) type).getBindings().getTypeParameters().
+ forEach(javaType -> convertAnnotationProperty(javaType.getRawClass()));
}
mergeBodyParameter((BodyParameter) parameter, newBodyParameter);
@@ -429,7 +429,7 @@
}
Field[] fields = beanClass.getDeclaredFields();
Model model = definitions.get(beanClass.getSimpleName());
- if (fields == null || model == null) {
+ if (model == null) {
return;
}
Map<String, Property> properties = model.getProperties();
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 ea1fec0..e26d3b9 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
@@ -117,7 +117,7 @@
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
Assertions.assertEquals(1, result.size());
- result = (Map<String, Object>)result.get("addBody");
+ result = (Map<String, Object>) result.get("addBody");
Assertions.assertEquals(2, result.size());
Assertions.assertEquals(1, (int) result.get("x"));
Assertions.assertEquals(2, (int) result.get("y"));
