From d8e9e9815225ab2c7d8852f9ac85a32eed229f87 Mon Sep 17 00:00:00 2001 From: noear Date: Mon, 7 Oct 2024 20:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20SaRequest:getParamNames()?= =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=20Collection=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=88=E4=B9=8B=E5=89=8D=E4=B8=BA=20List=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/dev33/satoken/context/model/SaRequest.java | 3 ++- .../satoken/context/dubbo/model/SaRequestForDubbo.java | 3 ++- .../context/dubbo3/model/SaRequestForDubbo3.java | 3 ++- .../satoken/context/grpc/model/SaRequestForGrpc.java | 3 ++- .../satoken/servlet/model/SaRequestForServlet.java | 9 ++------- .../satoken/reactor/model/SaRequestForReactor.java | 10 +++------- .../satoken/reactor/model/SaRequestForReactor.java | 10 +++------- .../satoken/servlet/model/SaRequestForServlet.java | 9 ++------- .../dev33/satoken/solon/model/SaRequestForSolon.java | 9 +++------ 9 files changed, 21 insertions(+), 38 deletions(-) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java index 91c0f73f..1971726d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java @@ -20,6 +20,7 @@ import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.router.SaHttpMethod; import cn.dev33.satoken.util.SaFoxUtil; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -95,7 +96,7 @@ public interface SaRequest { * 获取 [ 请求体 ] 里提交的所有参数名称 * @return 参数名称列表 */ - List getParamNames(); + Collection getParamNames(); /** * 获取 [ 请求体 ] 里提交的所有参数 diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java index 5cebcd25..d4af48ee 100644 --- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java +++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java @@ -18,6 +18,7 @@ package cn.dev33.satoken.context.dubbo.model; import cn.dev33.satoken.context.model.SaRequest; import org.apache.dubbo.rpc.RpcContext; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -64,7 +65,7 @@ public class SaRequestForDubbo implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ + public Collection getParamNames(){ return null; } diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java index 73e6d2a1..036fb839 100644 --- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java +++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java @@ -18,6 +18,7 @@ package cn.dev33.satoken.context.dubbo3.model; import cn.dev33.satoken.context.model.SaRequest; import org.apache.dubbo.rpc.RpcContext; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -64,7 +65,7 @@ public class SaRequestForDubbo3 implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ + public Collection getParamNames(){ return null; } diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java index f6ca8a4d..c8ab9e78 100644 --- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java +++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java @@ -18,6 +18,7 @@ package cn.dev33.satoken.context.grpc.model; import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext; import cn.dev33.satoken.context.model.SaRequest; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -51,7 +52,7 @@ public class SaRequestForGrpc implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ + public Collection getParamNames(){ return null; } diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java index cc677c3c..493fb067 100644 --- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java +++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java @@ -71,13 +71,8 @@ public class SaRequestForServlet implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ - Enumeration parameterNames = request.getParameterNames(); - List list = new ArrayList<>(); - while (parameterNames.hasMoreElements()) { - list.add(parameterNames.nextElement()); - } - return list; + public Collection getParamNames(){ + return Collections.list(request.getParameterNames()); } /** diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java index b209afd9..6280a27e 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java @@ -27,10 +27,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * 对 SaRequest 包装类的实现（Reactor 响应式编程版） @@ -74,9 +71,8 @@ public class SaRequestForReactor implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ - Set names = request.getQueryParams().keySet(); - return new ArrayList<>(names); + public Collection getParamNames(){ + return request.getQueryParams().keySet(); } /** diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java index e656a4b6..65cba177 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java +++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java @@ -27,10 +27,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * 对 SaRequest 包装类的实现（Reactor 响应式编程版） @@ -74,9 +71,8 @@ public class SaRequestForReactor implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ - Set names = request.getQueryParams().keySet(); - return new ArrayList<>(names); + public Collection getParamNames(){ + return request.getQueryParams().keySet(); } /** diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java index 5088143c..a4023ebe 100644 --- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java +++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java @@ -71,13 +71,8 @@ public class SaRequestForServlet implements SaRequest { * @return 参数名称列表 */ @Override - public List getParamNames(){ - Enumeration parameterNames = request.getParameterNames(); - List list = new ArrayList<>(); - while (parameterNames.hasMoreElements()) { - list.add(parameterNames.nextElement()); - } - return list; + public Collection getParamNames(){ + return Collections.list(request.getParameterNames()); } /** diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java index 92355153..9f32ca6c 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java @@ -20,10 +20,7 @@ import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.util.SaFoxUtil; import org.noear.solon.core.handle.Context; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @author noear @@ -48,8 +45,8 @@ public class SaRequestForSolon implements SaRequest { } @Override - public List getParamNames() { - return new ArrayList<>(ctx.paramNames()); + public Collection getParamNames() { + return ctx.paramNames(); } /**