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 db5147f97 [SCB-2668] migrate mark field final in 
handler-flowcontrol-qps (#3281)
db5147f97 is described below

commit db5147f97eda5c7988019d38c7a0469de6244f54
Author: TingTing Wang <[email protected]>
AuthorDate: Sun Aug 14 18:02:40 2022 +0800

    [SCB-2668] migrate mark field final in handler-flowcontrol-qps (#3281)
---
 .../apache/servicecomb/qps/TestConsumerQpsFlowControlHandler.java   | 6 +++---
 .../apache/servicecomb/qps/TestProviderQpsFlowControlHandler.java   | 4 ++--
 .../apache/servicecomb/authentication/RSAAuthenticationToken.java   | 5 +----
 .../authentication/provider/TestRSAProviderTokenManager.java        | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

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 64331fe67..cea2f0029 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
@@ -38,11 +38,11 @@ public class TestConsumerQpsFlowControlHandler {
 
   ConsumerQpsFlowControlHandler handler;
 
-  Invocation invocation = Mockito.mock(Invocation.class);
+  final Invocation invocation = Mockito.mock(Invocation.class);
 
-  AsyncResponse asyncResp = Mockito.mock(AsyncResponse.class);
+  final AsyncResponse asyncResp = Mockito.mock(AsyncResponse.class);
 
-  OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
+  final OperationMeta operationMeta = Mockito.mock(OperationMeta.class);
 
   @BeforeEach
   public void setUP() {
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 26fa9be9b..75c8997c2 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
@@ -36,9 +36,9 @@ import org.mockito.Mockito;
 public class TestProviderQpsFlowControlHandler {
   ProviderQpsFlowControlHandler handler;
 
-  Invocation invocation = Mockito.mock(Invocation.class);
+  final Invocation invocation = Mockito.mock(Invocation.class);
 
-  AsyncResponse asyncResp = Mockito.mock(AsyncResponse.class);
+  final AsyncResponse asyncResp = Mockito.mock(AsyncResponse.class);
 
   @BeforeEach
   public void setUP() {
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 935114909..aa88091b7 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
@@ -101,10 +101,7 @@ public class RSAAuthenticationToken {
     if (!token.plainToken().equals(this.plainToken())) {
       return false;
     }
-    if (!token.getSign().equals(this.sign)) {
-      return false;
-    }
-    return true;
+    return token.getSign().equals(this.sign);
   }
 
   public int hashCode() {
diff --git 
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestRSAProviderTokenManager.java
 
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestRSAProviderTokenManager.java
index b43b228c2..7e41e60e7 100644
--- 
a/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestRSAProviderTokenManager.java
+++ 
b/handlers/handler-publickey-auth/src/test/java/org/apache/servicecomb/authentication/provider/TestRSAProviderTokenManager.java
@@ -120,7 +120,7 @@ public class TestRSAProviderTokenManager {
     Assertions.assertNotNull(token);
     // use cache token
     Assertions.assertEquals(token, rsaConsumerTokenManager.getToken());
-    try (MockedStatic<MicroserviceInstanceCache> 
microserviceInstanceCacheMockedStatic = 
Mockito.mockStatic(MicroserviceInstanceCache.class);) {
+    try (MockedStatic<MicroserviceInstanceCache> 
microserviceInstanceCacheMockedStatic = 
Mockito.mockStatic(MicroserviceInstanceCache.class)) {
       microserviceInstanceCacheMockedStatic.when(() -> 
MicroserviceInstanceCache.getOrCreate(serviceId, instanceId))
               .thenReturn(microserviceInstance);
       microserviceInstanceCacheMockedStatic.when(() -> 
MicroserviceInstanceCache.getOrCreate(serviceId))

Reply via email to