This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 0eb0e01b39 Modifier optimization, add 'final' modifier. (#11503)
0eb0e01b39 is described below

commit 0eb0e01b39d425b2e0546c6dd46a851fa3026439
Author: Mengyang Tang <[email protected]>
AuthorDate: Fri Feb 10 15:31:32 2023 +0800

    Modifier optimization, add 'final' modifier. (#11503)
---
 .../src/main/java/org/apache/dubbo/rpc/AdaptiveMetrics.java    |  2 +-
 .../src/main/java/org/apache/dubbo/rpc/AppResponse.java        |  2 +-
 .../src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java     |  2 +-
 .../src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java |  2 +-
 .../src/main/java/org/apache/dubbo/rpc/FutureContext.java      |  2 +-
 .../main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java |  2 +-
 .../org/apache/dubbo/rpc/filter/AdaptiveLoadBalanceFilter.java |  2 +-
 .../java/org/apache/dubbo/rpc/filter/CompatibleFilter.java     |  2 +-
 .../main/java/org/apache/dubbo/rpc/filter/ContextFilter.java   |  2 +-
 .../dubbo/rpc/protocol/ProtocolSerializationWrapper.java       |  2 +-
 .../org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java     |  2 +-
 .../main/java/org/apache/dubbo/rpc/support/AccessLogData.java  |  2 +-
 .../dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java      | 10 +++++-----
 .../apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java   | 10 +++++-----
 .../java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java   |  4 ++--
 .../org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java   |  4 +---
 .../apache/dubbo/rpc/protocol/dubbo/DubboProtocolServer.java   |  4 ++--
 17 files changed, 27 insertions(+), 29 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AdaptiveMetrics.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AdaptiveMetrics.java
index 9fd3052b2c..e48c591b05 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AdaptiveMetrics.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AdaptiveMetrics.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class AdaptiveMetrics {
 
-    private ConcurrentMap<String, AdaptiveMetrics> metricsStatistics = new 
ConcurrentHashMap<>();
+    private final ConcurrentMap<String, AdaptiveMetrics> metricsStatistics = 
new ConcurrentHashMap<>();
 
     private long currentProviderTime = 0;
     private double providerCPULoad = 0;
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java
index 3bcc4ae7b7..700d49b2f7 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java
@@ -56,7 +56,7 @@ public class AppResponse implements Result {
 
     private Map<String, Object> attachments = new HashMap<>();
 
-    private Map<String, Object> attributes = new HashMap<>();
+    private final Map<String, Object> attributes = new HashMap<>();
 
     public AppResponse() {
     }
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
index 4814ce0acc..d0e59d8554 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
@@ -61,7 +61,7 @@ public class AsyncRpcResult implements Result {
 
     private Executor executor;
 
-    private Invocation invocation;
+    private final Invocation invocation;
     private final boolean async;
 
     private CompletableFuture<AppResponse> responseFuture;
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
index 44b36cb797..c1b136321b 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
@@ -26,7 +26,7 @@ import java.util.Map;
 public class AttachmentsAdapter {
 
     public static class ObjectToStringMap extends HashMap<String, String> {
-        private Map<String, Object> attachments;
+        private final Map<String, Object> attachments;
 
         public ObjectToStringMap(Map<String, Object> attachments) {
             for (Entry<String, Object> entry : attachments.entrySet()) {
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/FutureContext.java 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/FutureContext.java
index d16dfa8f42..d17a244b15 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/FutureContext.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/FutureContext.java
@@ -31,7 +31,7 @@ import java.util.concurrent.CompletableFuture;
  */
 public class FutureContext {
 
-    private static InternalThreadLocal<FutureContext> futureTL = new 
InternalThreadLocal<FutureContext>() {
+    private static final InternalThreadLocal<FutureContext> futureTL = new 
InternalThreadLocal<FutureContext>() {
         @Override
         protected FutureContext initialValue() {
             return new FutureContext();
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
index f692e6d87c..ffcf65b3d8 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
@@ -81,7 +81,7 @@ public class AccessLogFilter implements Filter {
 
     private final ConcurrentMap<String, Queue<AccessLogData>> logEntries = new 
ConcurrentHashMap<>();
 
-    private AtomicBoolean scheduled = new AtomicBoolean();
+    private final AtomicBoolean scheduled = new AtomicBoolean();
 
     private static final String LINE_SEPARATOR = "line.separator";
 
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AdaptiveLoadBalanceFilter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AdaptiveLoadBalanceFilter.java
index 0ec2327cbc..b41e72e391 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AdaptiveLoadBalanceFilter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AdaptiveLoadBalanceFilter.java
@@ -53,7 +53,7 @@ public class AdaptiveLoadBalanceFilter implements Filter, 
Filter.Listener {
      */
     private volatile ThreadPoolExecutor executor = null;
 
-    private AdaptiveMetrics adaptiveMetrics;
+    private final AdaptiveMetrics adaptiveMetrics;
 
     public AdaptiveLoadBalanceFilter(ApplicationModel scopeModel) {
         adaptiveMetrics = 
scopeModel.getBeanFactory().getBean(AdaptiveMetrics.class);
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
index cf47119a66..87031617d9 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
@@ -47,7 +47,7 @@ import static 
org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FILTE
  */
 public class CompatibleFilter implements Filter, Filter.Listener {
 
-    private static ErrorTypeAwareLogger logger = 
LoggerFactory.getErrorTypeAwareLogger(CompatibleFilter.class);
+    private static final ErrorTypeAwareLogger logger = 
LoggerFactory.getErrorTypeAwareLogger(CompatibleFilter.class);
 
     @Override
     public Result invoke(Invoker<?> invoker, Invocation invocation) throws 
RpcException {
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
index 88ef7d6ede..5320b1894e 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
@@ -62,7 +62,7 @@ import static org.apache.dubbo.rpc.Constants.TOKEN_KEY;
  */
 @Activate(group = PROVIDER, order = Integer.MIN_VALUE)
 public class ContextFilter implements Filter, Filter.Listener {
-    private Set<PenetrateAttachmentSelector> supportedSelectors;
+    private final Set<PenetrateAttachmentSelector> supportedSelectors;
 
     public ContextFilter(ApplicationModel applicationModel) {
         ExtensionLoader<PenetrateAttachmentSelector> selectorExtensionLoader = 
applicationModel.getExtensionLoader(PenetrateAttachmentSelector.class);
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
index 6f6b2b50a1..6507d6a84e 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolSerializationWrapper.java
@@ -30,7 +30,7 @@ import static 
org.apache.dubbo.rpc.model.ScopeModelUtil.getFrameworkModel;
 
 @Activate
 public class ProtocolSerializationWrapper implements Protocol {
-    private Protocol protocol;
+    private final Protocol protocol;
 
     public ProtocolSerializationWrapper(Protocol protocol) {
         this.protocol = protocol;
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
index 2dcebda937..33332406da 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException;
  */
 public class FutureAdapter<V> extends CompletableFuture<V> {
 
-    private CompletableFuture<AppResponse> appResponseFuture;
+    private final CompletableFuture<AppResponse> appResponseFuture;
 
     public FutureAdapter(CompletableFuture<AppResponse> future) {
         this.appResponseFuture = future;
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/AccessLogData.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/AccessLogData.java
index f231ae9a2e..f8d6472bab 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/AccessLogData.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/AccessLogData.java
@@ -56,7 +56,7 @@ public final class AccessLogData {
     /**
      * This is used to store log data in key val format.
      */
-    private Map<String, Object> data;
+    private final Map<String, Object> data;
 
     /**
      * Default constructor.
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
index f75c9366eb..c133913f9b 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
@@ -62,19 +62,19 @@ public class DecodeableRpcInvocation extends RpcInvocation 
implements Codec, Dec
 
     private static final ErrorTypeAwareLogger log = 
LoggerFactory.getErrorTypeAwareLogger(DecodeableRpcInvocation.class);
 
-    private Channel channel;
+    private final Channel channel;
 
-    private byte serializationType;
+    private final byte serializationType;
 
-    private InputStream inputStream;
+    private final InputStream inputStream;
 
-    private Request request;
+    private final Request request;
 
     private volatile boolean hasDecoded;
 
     protected final FrameworkModel frameworkModel;
 
-    private Supplier<CallbackServiceCodec> callbackServiceCodecFactory;
+    private final Supplier<CallbackServiceCodec> callbackServiceCodecFactory;
 
     public DecodeableRpcInvocation(FrameworkModel frameworkModel, Channel 
channel, Request request, InputStream is, byte id) {
         this.frameworkModel = frameworkModel;
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
index b70e9c1a4e..90b32cdf87 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
@@ -47,15 +47,15 @@ public class DecodeableRpcResult extends AppResponse 
implements Codec, Decodeabl
 
     private static final ErrorTypeAwareLogger log = 
LoggerFactory.getErrorTypeAwareLogger(DecodeableRpcResult.class);
 
-    private Channel channel;
+    private final Channel channel;
 
-    private byte serializationType;
+    private final byte serializationType;
 
-    private InputStream inputStream;
+    private final InputStream inputStream;
 
-    private Response response;
+    private final Response response;
 
-    private Invocation invocation;
+    private final Invocation invocation;
 
     private volatile boolean hasDecoded;
 
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
index efb7dc4969..28b1453588 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
@@ -69,8 +69,8 @@ public class DubboCodec extends ExchangeCodec {
     private static final ErrorTypeAwareLogger log = 
LoggerFactory.getErrorTypeAwareLogger(DubboCodec.class);
 
     private static final AtomicBoolean decodeInUserThreadLogged = new 
AtomicBoolean(false);
-    private CallbackServiceCodec callbackServiceCodec;
-    private FrameworkModel frameworkModel;
+    private final CallbackServiceCodec callbackServiceCodec;
+    private final FrameworkModel frameworkModel;
 
     public DubboCodec(FrameworkModel frameworkModel) {
         this.frameworkModel = frameworkModel;
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java
index bc57ef829c..b37ab75df0 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java
@@ -34,11 +34,9 @@ import static org.apache.dubbo.rpc.Constants.OUTPUT_KEY;
 
 public final class DubboCountCodec implements Codec2 {
 
-    private DubboCodec codec;
-    private FrameworkModel frameworkModel;
+    private final DubboCodec codec;
 
     public DubboCountCodec(FrameworkModel frameworkModel) {
-        this.frameworkModel = frameworkModel;
         codec = new DubboCodec(frameworkModel);
     }
 
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolServer.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolServer.java
index 2cbe12a495..46a5b4c55a 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolServer.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolServer.java
@@ -26,9 +26,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class DubboProtocolServer implements ProtocolServer {
 
-    private RemotingServer server;
+    private final RemotingServer server;
     private String address;
-    private Map<String, Object> attributes = new ConcurrentHashMap<>();
+    private final Map<String, Object> attributes = new ConcurrentHashMap<>();
 
     public DubboProtocolServer(RemotingServer server) {
         this.server = server;

Reply via email to