[impove] fixed sonar cloud issue

apache · Aug 6, 2024 · 4385fc6 · 4385fc6
1 parent 1ae53d7
commit 4385fc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...ole-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java b/...ole-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java
@@ -80,7 +80,7 @@ public static FlinkCatalogParams of(FlinkCatalog flinkCatalog) {
             }
         } catch (JsonProcessingException e) {
             log.error("Flink catalog params json read failed", e);
-            throw new RuntimeException(e);
+            throw new RuntimeException("Flink catalog params json read failed");
         }
 
         return flinkCatalogParams;

diff --git a/...console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java b/...console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java
@@ -92,7 +92,7 @@ public static FlinkCatalog of(FlinkCatalogParams flinkCatalogParams) {
             }
         } catch (JsonProcessingException e) {
             log.error("Flink catalog json read failed", e);
-            throw new RuntimeException(e);
+            throw new RuntimeException("Flink catalog json read failed");
         }
         return flinkCatalog;
     }

diff --git a/...ice/src/main/java/org/apache/streampark/console/core/service/impl/CatalogServiceImpl.java b/...ice/src/main/java/org/apache/streampark/console/core/service/impl/CatalogServiceImpl.java
@@ -38,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /** catalog manage */
 @Service
@@ -47,6 +48,8 @@ public class CatalogServiceImpl extends ServiceImpl<CatalogMapper, FlinkCatalog>
     implements
         CatalogService {
 
+    private static final String catalog_regex = "^(?:[a-z0-9]+[-\\.]?)*(?:[a-z0-9]+)$";
+
     @Override
     public boolean create(FlinkCatalogParams catalog, Long userId) {
         AlertException.throwIfNull(
@@ -115,7 +118,6 @@ public Boolean existsByCatalogName(String catalogName) {
 
     /** validate catalog name */
     private boolean validateCatalogName(String catalogName) {
-        String regex = "^(?:[a-z0-9]+[-\\.]?)*(?:[a-z0-9]+)$";
-        return catalogName.matches(regex);
+        return Pattern.compile(catalog_regex).matcher(catalogName).matches();
     }
 }