fix(): fix some sonar issue

Rawven · May 19, 2024 · 00aa06a · 00aa06a
1 parent c0026bd
commit 00aa06a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/...pc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsHeaderFilter.java b/...pc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/cors/CorsHeaderFilter.java
@@ -93,15 +93,7 @@ protected void invoke(Invoker<?> invoker, RpcInvocation invocation, HttpRequest
 
     private boolean process(CorsMeta cors, HttpRequest request, HttpResponse response) {
 
-        Set<String> varHeadersSet = new LinkedHashSet<>();
-        List<String> varyHeaders = response.headerValues(VARY);
-        if (varyHeaders != null) {
-            varHeadersSet.addAll(varyHeaders);
-        }
-        varHeadersSet.add(ORIGIN);
-        varHeadersSet.add(ACCESS_CONTROL_REQUEST_METHOD);
-        varHeadersSet.add(ACCESS_CONTROL_REQUEST_HEADERS);
-        response.setHeader(VARY, StringUtils.join(varHeadersSet, ", "));
+        setVaryHeader(response);
 
         String origin = request.header(ORIGIN);
         if (isNotCorsRequest(request, origin)) {
@@ -161,6 +153,19 @@ private boolean process(CorsMeta cors, HttpRequest request, HttpResponse respons
         return true;
     }
 
+    private static void setVaryHeader(HttpResponse response){
+        Set<String> varHeadersSet = new LinkedHashSet<>();
+        List<String> varyHeaders = response.headerValues(VARY);
+        if (varyHeaders != null) {
+            varHeadersSet.addAll(varyHeaders);
+        }
+        varHeadersSet.add(ORIGIN);
+        varHeadersSet.add(ACCESS_CONTROL_REQUEST_METHOD);
+        varHeadersSet.add(ACCESS_CONTROL_REQUEST_HEADERS);
+        response.setHeader(VARY, StringUtils.join(varHeadersSet, ", "));
+
+    }
+
     private static String checkOrigin(CorsMeta cors, String origin) {
         if (StringUtils.isBlank(origin)) {
             return null;

diff --git a/...pc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/meta/CorsMeta.java b/...pc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/meta/CorsMeta.java
@@ -41,7 +41,7 @@ public class CorsMeta {
     private final Boolean allowCredentials;
     private final Long maxAge;
 
-    public static final String[] DEFAULT_ALLOWED_METHODS = {
+    protected static final String[] DEFAULT_ALLOWED_METHODS = {
         HttpMethods.GET.name(), HttpMethods.HEAD.name(), HttpMethods.POST.name()
     };
 
@@ -244,15 +244,6 @@ public Builder applyDefault() {
             return this;
         }
 
-        public Boolean enabledCors() {
-            return !(allowedOrigins.isEmpty()
-                    && allowedMethods.isEmpty()
-                    && allowedHeaders.isEmpty()
-                    && exposedHeaders.isEmpty()
-                    && allowCredentials == null
-                    && maxAge == null);
-        }
-
         public CorsMeta build() {
             if (allowedOrigins.isEmpty()
                     && allowedMethods.isEmpty()
@@ -285,12 +276,5 @@ public CorsMeta build() {
                     maxAge);
         }
 
-        public CorsMeta buildDefault() {
-            if (enabledCors()) {
-                return applyDefault().build();
-            } else {
-                return null;
-            }
-        }
     }
 }