protected field/method in final class (#2762)
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
index 242ae89..4a1943a 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestPath.java
@@ -129,7 +129,7 @@
};
new MockUp<QueryVarParamWriter>() {
@Mock
- protected Object getParamValue(Object[] args) {
+ private Object getParamValue(Object[] args) {
return args[0];
}
};
diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
index 0c0a573..70f9ad2 100644
--- a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerBootListener.java
@@ -108,12 +108,12 @@
}
for (OperationMeta operationMeta : microserviceMeta.getOperations()) {
- if (ExecutorService.class.isInstance(operationMeta.getExecutor())) {
+ if (operationMeta.getExecutor() instanceof ExecutorService) {
((ExecutorService) operationMeta.getExecutor()).shutdown();
continue;
}
- if (Closeable.class.isInstance(operationMeta.getExecutor())) {
+ if (operationMeta.getExecutor() instanceof Closeable) {
IOUtils.closeQuietly((Closeable) operationMeta.getExecutor());
continue;
}
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
index a63a9ab..32ba590 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
@@ -83,7 +83,7 @@
private LambdaMetafactoryUtils() {
}
- protected static Method findAbstractMethod(Class<?> functionalInterface) {
+ private static Method findAbstractMethod(Class<?> functionalInterface) {
for (Method method : functionalInterface.getMethods()) {
if ((method.getModifiers() & Modifier.ABSTRACT) != 0) {
return method;
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
index 953f989..3dbc323 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
@@ -136,7 +136,7 @@
/**
* 配置vertx的文件缓存功能，默认关闭
*/
- protected static void configureVertxFileCaching(VertxOptions vertxOptions) {
+ private static void configureVertxFileCaching(VertxOptions vertxOptions) {
boolean disableFileCPResolving = DynamicPropertyFactory.getInstance()
.getBooleanProperty(FileResolver.DISABLE_CP_RESOLVING_PROP_NAME, true).get();
vertxOptions.getFileSystemOptions().setClassPathResolvingEnabled(!disableFileCPResolving);
@@ -145,7 +145,7 @@
// try to reference byte[]
// otherwise copy byte[]
public static byte[] getBytesFast(InputStream inputStream) throws IOException {
- if (BufferInputStream.class.isInstance(inputStream)) {
+ if (inputStream instanceof BufferInputStream) {
return getBytesFast(((BufferInputStream) inputStream).getByteBuf());
}
diff --git a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestConsumerQpsFlowControlHandler.java b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestConsumerQpsFlowControlHandler.java
index 1043d58..e346c86 100644
--- a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestConsumerQpsFlowControlHandler.java
+++ b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestConsumerQpsFlowControlHandler.java
@@ -98,7 +98,7 @@
new MockUp<QpsControllerManager>() {
@Mock
- protected QpsStrategy create(String qualifiedNameKey) {
+ private QpsStrategy create(String qualifiedNameKey) {
return qpsStrategy;
}
};
@@ -135,7 +135,7 @@
new MockUp<QpsControllerManager>() {
@Mock
- protected QpsStrategy create(String qualifiedNameKey) {
+ private QpsStrategy create(String qualifiedNameKey) {
return qpsStrategy;
}
};
diff --git a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestProviderQpsFlowControlHandler.java b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestProviderQpsFlowControlHandler.java
index d1fb48e..0328d54 100644
--- a/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestProviderQpsFlowControlHandler.java
+++ b/handlers/handler-flowcontrol-qps/src/test/java/org/apache/servicecomb/qps/TestProviderQpsFlowControlHandler.java
@@ -145,7 +145,7 @@
new MockUp<QpsControllerManager>() {
@Mock
- protected QpsStrategy create(String qualifiedNameKey) {
+ private QpsStrategy create(String qualifiedNameKey) {
AbstractQpsStrategy strategy = new FixedWindowStrategy();
strategy.setKey(qualifiedNameKey);
strategy.setQpsLimit(1L);
@@ -175,7 +175,7 @@
new MockUp<QpsControllerManager>() {
@Mock
- protected QpsStrategy create(String qualifiedNameKey) {
+ private QpsStrategy create(String qualifiedNameKey) {
AbstractQpsStrategy strategy = new FixedWindowStrategy();
strategy.setKey(qualifiedNameKey);
strategy.setQpsLimit(1L);
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
index c94af37..999235b 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
@@ -133,8 +133,8 @@
@VisibleForTesting
@SuppressWarnings("unchecked")
- protected <T> Handler<RestResponse> syncHandler(CountDownLatch countDownLatch, Class<T> cls,
- Holder<T> holder) {
+ public <T> Handler<RestResponse> syncHandler(CountDownLatch countDownLatch, Class<T> cls,
+ Holder<T> holder) {
return restResponse -> {
RequestContext requestContext = restResponse.getRequestContext();
HttpClientResponse response = restResponse.getResponse();
diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentSame.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentSame.java
index 549ba6a..2768590 100644
--- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentSame.java
+++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentSame.java
@@ -22,9 +22,9 @@
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
public final class ConsumerArgumentSame extends ConsumerArgumentMapper {
- protected String invocationArgumentName;
+ private final String invocationArgumentName;
- protected String swaggerArgumentName;
+ private final String swaggerArgumentName;
public ConsumerArgumentSame(String invocationArgumentName, String swaggerArgumentName) {
this.invocationArgumentName = invocationArgumentName;
diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerBeanParamMapper.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerBeanParamMapper.java
index d012faa..d374a32 100644
--- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerBeanParamMapper.java
+++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerBeanParamMapper.java
@@ -46,9 +46,9 @@
}
}
- protected String invocationArgumentName;
+ private final String invocationArgumentName;
- private List<FieldMeta> fields = new ArrayList<>();
+ private final List<FieldMeta> fields = new ArrayList<>();
public ConsumerBeanParamMapper(String invocationArgumentName) {
this.invocationArgumentName = invocationArgumentName;
diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
index 3fcc2a9..2ceea45 100644
--- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
+++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
@@ -71,13 +71,13 @@
return create(PRODUCER_INNER_STATUS, errorData);
}
- protected static InvocationException doCreate(StatusType status,
- Object errorData) {
+ private static InvocationException doCreate(StatusType status,
+ Object errorData) {
return new InvocationException(status, errorData);
}
- protected static InvocationException doCreate(int statusCode, String reasonPhrase, CommonExceptionData data,
- Throwable e) {
+ private static InvocationException doCreate(int statusCode, String reasonPhrase, CommonExceptionData data,
+ Throwable e) {
return new InvocationException(statusCode, reasonPhrase, data, e);
}
@@ -112,11 +112,11 @@
// 如果e中取不出可以直接返回的InvocationException
// 则需要创建新的InvocationException实例，此时不允许使用e.getMessage，因为可能会涉及关键信息被传给远端
// 新创建的InvocationException，会使用errorMsg来构建CommonExceptionData
- protected static InvocationException convertException(int statusCode, String reasonPhrase, Throwable e,
- String errorMsg) {
+ private static InvocationException convertException(int statusCode, String reasonPhrase, Throwable e,
+ String errorMsg) {
e = unwrap(e);
- if (InvocationException.class.isInstance(e)) {
+ if (e instanceof InvocationException) {
return (InvocationException) e;
}
