From 67bc1d8d4a9266270aaa77dd816dee405e6ae840 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Sun, 24 Aug 2025 13:55:32 +0700 Subject: [PATCH] Polish some methods Signed-off-by: Tran Ngoc Nhan --- .../DefaultServiceAuthenticationDetails.java | 9 ++++----- .../web/savedrequest/DefaultSavedRequest.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java index 262c8e05e0..b48785e752 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java @@ -71,14 +71,13 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails @Override public boolean equals(Object obj) { - if (this == obj) { + if (super.equals(obj)) { return true; } - if (!super.equals(obj) || !(obj instanceof DefaultServiceAuthenticationDetails)) { - return false; + if (obj instanceof DefaultServiceAuthenticationDetails that) { + return this.serviceUrl.equals(that.getServiceUrl()); } - ServiceAuthenticationDetails that = (ServiceAuthenticationDetails) obj; - return this.serviceUrl.equals(that.getServiceUrl()); + return false; } @Override diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index 4cb37019a7..659c22c5a0 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -193,15 +193,15 @@ public class DefaultSavedRequest implements SavedRequest { * @since 4.2 */ private void addParameters(Map parameters) { - if (!ObjectUtils.isEmpty(parameters)) { - for (String paramName : parameters.keySet()) { - Object paramValues = parameters.get(paramName); - if (paramValues instanceof String[]) { - this.addParameter(paramName, (String[]) paramValues); - } - else { - logger.warn("ServletRequest.getParameterMap() returned non-String array"); - } + if (ObjectUtils.isEmpty(parameters)) { + return; + } + + for (Map.Entry entry : parameters.entrySet()) { + String name = entry.getKey(); + String[] values = entry.getValue(); + if (values != null) { + this.parameters.put(name, values); } } }