修改sonaqube提示的问题

entropy-cloud · Nov 30, 2023 · 39f7d84 · 39f7d84
1 parent 89445dc
commit 39f7d84
Show file tree

Hide file tree

Showing 325 changed files with 939 additions and 606 deletions.
diff --git a/nop-api-core/pom.xml b/nop-api-core/pom.xml
@@ -35,6 +35,7 @@
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
         <slf4j.version>2.0.6</slf4j.version>
 
+        <maven.plugin.validation>VERBOSE</maven.plugin.validation>
     </properties>
 
     <dependencies>
@@ -110,10 +111,17 @@
                 <version>3.3.0</version>
             </plugin>
 
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -124,6 +132,7 @@
                 </executions>
             </plugin>
         </plugins>
+
     </build>
 
 </project>
diff --git a/nop-api-core/src/main/java/io/nop/api/core/context/BaseContext.java b/nop-api-core/src/main/java/io/nop/api/core/context/BaseContext.java
@@ -245,7 +245,7 @@ public void close() {
 
         IContext context = BaseContextProvider.contextHolder().get();
         if (context == this) {
-            BaseContextProvider.contextHolder().remove();
+            BaseContextProvider.clear();
         }
         this.closed = true;
         this.attributes.clear();

diff --git a/nop-api-core/src/main/java/io/nop/api/core/context/BaseContextProvider.java b/nop-api-core/src/main/java/io/nop/api/core/context/BaseContextProvider.java
@@ -19,6 +19,10 @@ public IContext currentContext() {
         return t_context.get();
     }
 
+    public static void clear(){
+        t_context.remove();
+    }
+
     @Override
     public IContext getOrCreateContext() {
         IContext context = t_context.get();

diff --git a/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_ActionAuthModel.java b/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_ActionAuthModel.java
@@ -120,6 +120,7 @@ public boolean hasSites(){
     }
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -133,6 +134,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_AuthRoleModel.java b/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_AuthRoleModel.java
@@ -119,6 +119,7 @@ public void setPrimary(boolean value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -128,6 +129,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_DataAuthModel.java b/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_DataAuthModel.java
@@ -67,6 +67,7 @@ public boolean hasObjs(){
     }
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -78,6 +79,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_ObjDataAuthModel.java b/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_ObjDataAuthModel.java
@@ -119,6 +119,7 @@ public boolean hasRoleAuths(){
     }
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -130,6 +131,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_RoleDataAuthModel.java b/nop-auth/nop-auth-core/src/main/java/io/nop/auth/core/model/_gen/_RoleDataAuthModel.java
@@ -147,6 +147,7 @@ public void setRoleId(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -156,6 +157,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-auth/nop-auth-service/src/main/java/io/nop/auth/service/login/LoginServiceImpl.java b/nop-auth/nop-auth-service/src/main/java/io/nop/auth/service/login/LoginServiceImpl.java
@@ -153,9 +153,7 @@ public CompletionStage<IUserContext> loginAsync(LoginRequest request, Map<String
             errorCode = ERR_AUTH_INVALID_LOGIN_REQUEST;
         } else {
             user = getAuthUser(request);
-            if (user == null) {
-                errorCode = ERR_AUTH_LOGIN_WITH_UNKNOWN_USER;
-            } else {
+            if (user != null) {
                 failCount = userContextCache.getLoginFailCountForUser(user.getUserName());
 
                 int maxFailCount = CFG_AUTH_MAX_LOGIN_FAIL_COUNT.get();
@@ -172,6 +170,9 @@ public CompletionStage<IUserContext> loginAsync(LoginRequest request, Map<String
         }
 
         if (errorCode != null || user == null) {
+            if(errorCode == null)
+                errorCode = ERR_AUTH_LOGIN_WITH_UNKNOWN_USER;
+
             failCount++;
             if (user != null)
                 userContextCache.setLoginFailCountForUser(user.getUserName(), failCount);

diff --git a/nop-auth/nop-auth-sso/src/main/java/io/nop/auth/sso/SsoConstants.java b/nop-auth/nop-auth-sso/src/main/java/io/nop/auth/sso/SsoConstants.java
@@ -16,7 +16,7 @@ public interface SsoConstants {
     String JWT_BEARER_CLIENT_ASSERTION_TYPE = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
 
     String CLIENT_CREDENTIALS_GRANT = "client_credentials";
-    String PASSWORD_GRANT = "password";
+    String PASSWORD_GRANT = "password"; //NOSONAR
     String REFRESH_TOKEN_GRANT = "refresh_token";
     String REFRESH_TOKEN_VALUE = "refresh_token";
 
@@ -34,8 +34,8 @@ public interface SsoConstants {
     String INTROSPECTION_TOKEN_USERNAME = "username";
     String INTROSPECTION_TOKEN_SUB = "sub";
 
-    String PASSWORD_GRANT_USERNAME = "username";
-    String PASSWORD_GRANT_PASSWORD = "password";
+    String PASSWORD_GRANT_USERNAME = "username";  //NOSONAR
+    String PASSWORD_GRANT_PASSWORD = "password";  //NOSONAR
 
     String TOKEN_SCOPE = "scope";
     String GRANT_TYPE = "grant_type";

diff --git a/nop-auth/nop-auth-sso/src/main/java/io/nop/auth/sso/jwk/JWKPublicKeyLocator.java b/nop-auth/nop-auth-sso/src/main/java/io/nop/auth/sso/jwk/JWKPublicKeyLocator.java
@@ -40,7 +40,7 @@ public class JWKPublicKeyLocator implements IPublicKeyLocator {
 
     private static final Logger log = LoggerFactory.getLogger(JWKPublicKeyLocator.class);
 
-    private volatile ConcurrentMap<String, PublicKey> currentKeys = new ConcurrentHashMap<>();
+    private volatile ConcurrentHashMap<String, PublicKey> currentKeys = new ConcurrentHashMap<>();
 
     private volatile long lastRequestTime = 0;
 

diff --git a/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java b/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java
@@ -65,10 +65,11 @@ public void destroy(ExtensionContext ctx) {
     }
 
     protected void configExecutionMode(TestInfo testInfo) {
-        if (testInfo.getTestMethod().isEmpty())
+        Method method = testInfo.getTestMethod().orElse(null);
+        if (method == null)
             return;
 
-        EnableSnapshot enableSnapshot = testInfo.getTestMethod().get().getAnnotation(EnableSnapshot.class);
+        EnableSnapshot enableSnapshot = method.getAnnotation(EnableSnapshot.class);
         if (enableSnapshot != null && !CFG_AUTOTEST_DISABLE_SNAPSHOT.get()) {
             setCheckOutput(enableSnapshot.checkOutput());
             setLocalDb(enableSnapshot.localDb());
@@ -101,8 +102,11 @@ protected void configExecutionMode(TestInfo testInfo) {
     }
 
     protected String getCaseDataPath(TestInfo testInfo) {
-        Guard.checkArgument(testInfo.getTestMethod().isPresent());
-        return AutoTestDataHelper.getTestDataPath(testInfo.getTestClass().get(), testInfo.getTestMethod().get());
+        Class<?> testClass = testInfo.getTestClass().orElse(null);
+        Method testMethod = testInfo.getTestMethod().orElse(null);
+        if(testClass == null || testMethod == null)
+            throw new IllegalArgumentException("null test info");
+        return AutoTestDataHelper.getTestDataPath(testClass, testMethod);
     }
 
     protected void checkEquals(ErrorCode errorCode, String fileName, Object expected, Object value) {

diff --git a/...test/nop-autotest-junit/src/main/java/io/nop/autotest/junit/VariantsArgumentProvider.java b/...test/nop-autotest-junit/src/main/java/io/nop/autotest/junit/VariantsArgumentProvider.java
@@ -33,11 +33,12 @@ public void accept(EnableVariants enableVariants) {
 
     @Override
     public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-        Guard.checkArgument(context.getTestClass().isPresent());
-        Guard.checkArgument(context.getTestMethod().isPresent());
 
-        Class<?> testClass = context.getTestClass().get();
-        Method testMethod = context.getTestMethod().get();
+        Class<?> testClass = context.getTestClass().orElse(null);
+        Method testMethod = context.getTestMethod().orElse(null);
+
+        if(testClass == null || testMethod == null)
+            throw new IllegalArgumentException("null test info");
 
         String dataDir = AutoTestDataHelper.getTestDataPath(testClass, testMethod);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizActionArgModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizActionArgModel.java
@@ -225,6 +225,7 @@ public void setType(io.nop.core.type.IGenericType value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -236,6 +237,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizActionModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizActionModel.java
@@ -509,6 +509,7 @@ public void setType(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -534,6 +535,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizCacheEvictModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizCacheEvictModel.java
@@ -67,6 +67,7 @@ public void setCacheName(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -76,6 +77,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizCacheModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizCacheModel.java
@@ -67,6 +67,7 @@ public void setCacheName(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -76,6 +77,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizLoaderModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizLoaderModel.java
@@ -197,6 +197,7 @@ public void setSource(io.nop.core.lang.eval.IEvalAction value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -212,6 +213,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizMakerCheckerModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizMakerCheckerModel.java
@@ -67,6 +67,7 @@ public void setTryMethod(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -76,6 +77,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizModel.java
@@ -301,6 +301,7 @@ public void setWfName(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -318,6 +319,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizObserveModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizObserveModel.java
@@ -119,6 +119,7 @@ public void setSource(io.nop.core.lang.eval.IEvalAction value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -128,6 +129,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizReturnModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizReturnModel.java
@@ -121,6 +121,7 @@ public void setType(io.nop.core.type.IGenericType value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -132,6 +133,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);
 

diff --git a/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizTccModel.java b/nop-biz/src/main/java/io/nop/biz/model/_gen/_BizTccModel.java
@@ -67,6 +67,7 @@ public void setConfirmMethod(java.lang.String value){
 
 
 
+    @Override
     public void freeze(boolean cascade){
         if(frozen()) return;
         super.freeze(cascade);
@@ -76,6 +77,7 @@ public void freeze(boolean cascade){
         }
     }
 
+    @Override
     protected void outputJson(IJsonHandler out){
         super.outputJson(out);