[SCB-2558] enable checkstyle ModifierOrder (#3055)
diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml
index 1d3953d..10a7490 100644
--- a/ci/checkstyle/checkstyle.xml
+++ b/ci/checkstyle/checkstyle.xml
@@ -34,6 +34,7 @@
<module name="TreeWalker">
<module name="AvoidStarImport"/>
<module name="EmptyStatement"/>
+ <module name="ModifierOrder"/>
<module name="NoWhitespaceAfter">
<!-- Checks that there is no whitespace after various unary operators.
Linebreaks are allowed.
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
index 6222199..9ed9daa 100644
--- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
+++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -87,7 +87,7 @@
private static final Object initializationLock = new Object();
- private volatile static SCBEngine INSTANCE;
+ private static volatile SCBEngine INSTANCE;
private ApplicationContext applicationContext;
diff --git a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/CustomResponseMetaMapper.java b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/CustomResponseMetaMapper.java
index eca6158..7aa294c 100644
--- a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/CustomResponseMetaMapper.java
+++ b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/CustomResponseMetaMapper.java
@@ -26,7 +26,7 @@
import com.fasterxml.jackson.databind.type.SimpleType;
public class CustomResponseMetaMapper implements ResponseMetaMapper {
- private final static Map<Integer, JavaType> CODES = new HashMap<>(1);
+ private static final Map<Integer, JavaType> CODES = new HashMap<>(1);
static {
CODES.put(500, SimpleType.constructUnsafe(IllegalStateErrorData.class));
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/AbstractRestObjectMapper.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/AbstractRestObjectMapper.java
index 43f1062..5069e6a 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/AbstractRestObjectMapper.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/AbstractRestObjectMapper.java
@@ -30,5 +30,5 @@
super(src);
}
- abstract public String convertToString(Object value) throws Exception;
+ public abstract String convertToString(Object value) throws Exception;
}
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RSAUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RSAUtils.java
index 6922c76..5923f9b 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RSAUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/RSAUtils.java
@@ -36,13 +36,13 @@
public class RSAUtils {
- private final static Logger LOGGER = LoggerFactory.getLogger(RSAUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RSAUtils.class);
- private final static String RSA_ALG = "RSA";
+ private static final String RSA_ALG = "RSA";
- private final static String SIGN_ALG = "SHA256withRSA";
+ private static final String SIGN_ALG = "SHA256withRSA";
- private final static int KEY_SIZE = 2048;
+ private static final int KEY_SIZE = 2048;
private static final Base64.Encoder encoder = Base64.getEncoder();
diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/deserializer/scalar/AbstractScalarReadSchemas.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/deserializer/scalar/AbstractScalarReadSchemas.java
index a1f8e06..345fd47 100644
--- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/deserializer/scalar/AbstractScalarReadSchemas.java
+++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/deserializer/scalar/AbstractScalarReadSchemas.java
@@ -23,7 +23,7 @@
import io.protostuff.runtime.FieldSchema;
public class AbstractScalarReadSchemas {
- static abstract class AbstractIntSchema<T> extends FieldSchema<T> {
+ abstract static class AbstractIntSchema<T> extends FieldSchema<T> {
protected final Setter<T, Object> setter;
public AbstractIntSchema(Field protoField, PropertyDescriptor propertyDescriptor) {
@@ -32,7 +32,7 @@
}
}
- static abstract class AbstractLongSchema<T> extends FieldSchema<T> {
+ abstract static class AbstractLongSchema<T> extends FieldSchema<T> {
protected final Setter<T, Object> setter;
public AbstractLongSchema(Field protoField, PropertyDescriptor propertyDescriptor) {
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/config/AbstractPropertiesLoader.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/config/AbstractPropertiesLoader.java
index 1944063..723ec0a 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/config/AbstractPropertiesLoader.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/config/AbstractPropertiesLoader.java
@@ -40,9 +40,9 @@
return propertiesMap;
}
- abstract protected Map<String, String> readProperties(Configuration configuration);
+ protected abstract Map<String, String> readProperties(Configuration configuration);
- abstract protected String readPropertiesExtendedClass(Configuration configuration);
+ protected abstract String readPropertiesExtendedClass(Configuration configuration);
private void loadPropertiesFromConfigMap(Configuration configuration, Map<String, String> propertiesMap) {
propertiesMap.putAll(readProperties(configuration));
diff --git a/governance/src/main/java/org/apache/servicecomb/governance/handler/AbstractGovernanceHandler.java b/governance/src/main/java/org/apache/servicecomb/governance/handler/AbstractGovernanceHandler.java
index 4f5e027..9e4c02d 100644
--- a/governance/src/main/java/org/apache/servicecomb/governance/handler/AbstractGovernanceHandler.java
+++ b/governance/src/main/java/org/apache/servicecomb/governance/handler/AbstractGovernanceHandler.java
@@ -65,11 +65,11 @@
return processor;
}
- abstract protected String createKey(GovernanceRequest governanceRequest, POLICY policy);
+ protected abstract String createKey(GovernanceRequest governanceRequest, POLICY policy);
- abstract protected POLICY matchPolicy(GovernanceRequest governanceRequest);
+ protected abstract POLICY matchPolicy(GovernanceRequest governanceRequest);
- abstract protected PROCESSOR createProcessor(GovernanceRequest governanceRequest, POLICY policy);
+ protected abstract PROCESSOR createProcessor(GovernanceRequest governanceRequest, POLICY policy);
protected void onConfigurationChanged(String key) {
processors.remove(key);
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
index 5537460..fac9ba1 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
@@ -41,7 +41,7 @@
* Add special stats that com.netflix.loadbalancer.LoadBalancerStats not provided
*/
public class ServiceCombLoadBalancerStats {
- private final static Logger LOGGER = LoggerFactory.getLogger(ServiceCombLoadBalancerStats.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServiceCombLoadBalancerStats.class);
private final Map<ServiceCombServer, ServiceCombServerStats> pingView = new ConcurrentHashMap<>();
diff --git a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/RSAAuthenticationToken.java b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/RSAAuthenticationToken.java
index 01db32f..9351149 100644
--- a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/RSAAuthenticationToken.java
+++ b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/RSAAuthenticationToken.java
@@ -24,7 +24,7 @@
*/
public class RSAAuthenticationToken {
- public final static long TOKEN_ACTIVE_TIME = 24 * 60 * 60 * 1000;
+ public static final long TOKEN_ACTIVE_TIME = 24 * 60 * 60 * 1000;
private final String instanceId;
diff --git a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/RSAProviderTokenManager.java b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/RSAProviderTokenManager.java
index bfb9ede..76b2e3b 100644
--- a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/RSAProviderTokenManager.java
+++ b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/RSAProviderTokenManager.java
@@ -36,7 +36,7 @@
public class RSAProviderTokenManager {
- private final static Logger LOGGER = LoggerFactory.getLogger(RSAProviderTokenManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RSAProviderTokenManager.class);
private final Cache<RSAAuthenticationToken, Boolean> validatedToken = CacheBuilder.newBuilder()
.expireAfterAccess(getExpiredTime(), TimeUnit.MILLISECONDS)
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
index 1c8624f..4e28eca 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
@@ -52,7 +52,7 @@
final BootEvent event = new BootEvent();
final ProducerMeta producerMeta = new ProducerMeta();
final SCBEngine scbEngine = new SCBEngine() {
- final public ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
+ public final ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
@Override
public void addProducerMeta(String schemaId, Object instance) {
@@ -83,7 +83,7 @@
final List<ProducerMeta> producerMetas = new ArrayList<>();
final BootEvent event = new BootEvent();
final SCBEngine scbEngine = new SCBEngine() {
- final public ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
+ public final ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
@Override
public void addProducerMeta(String schemaId, Object instance) {
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMetricsBootListener.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMetricsBootListener.java
index 302f5cc..4b462dd 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMetricsBootListener.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMetricsBootListener.java
@@ -50,7 +50,7 @@
final BootEvent event = new BootEvent();
final ProducerMeta producerMeta = new ProducerMeta();
final SCBEngine scbEngine = new SCBEngine() {
- final public ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
+ public final ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
@Override
public void addProducerMeta(String schemaId, Object instance) {
@@ -81,7 +81,7 @@
final List<ProducerMeta> producerMetas = new ArrayList<>();
final BootEvent event = new BootEvent();
final SCBEngine scbEngine = new SCBEngine() {
- final public ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
+ public final ProducerProviderManager producerProviderManager = new ProducerProviderManager(this) {
@Override
public void addProducerMeta(String schemaId, Object instance) {
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/AbstractTask.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/AbstractTask.java
index c9d8915..f015cb3 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/AbstractTask.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/AbstractTask.java
@@ -59,7 +59,7 @@
return this.taskStatus;
}
- abstract protected void doRun();
+ protected abstract void doRun();
protected boolean isSameMicroservice(Microservice otherMicroservice) {
return microservice.getServiceName().equals(otherMicroservice.getServiceName());
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
index 71f796e..b6c1d75 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
@@ -148,7 +148,7 @@
ArchaiusUtils.resetConfig();
}
- static abstract class RegisterSchemaTester {
+ abstract static class RegisterSchemaTester {
void run() {
Logger rootLogger = Logger.getRootLogger();
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/InvalidType.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/InvalidType.java
index b8d2223..9b4bf52 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/InvalidType.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/InvalidType.java
@@ -25,7 +25,7 @@
}
- public static abstract class InvalidClass {
+ public abstract static class InvalidClass {
}
