Polish some methods

Signed-off-by: Tran Ngoc Nhan <[email protected]>

Author: ngocnhan-tran1996

cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java

@@ -70,14 +70,13 @@ public String getServiceUrl() {
 
 	@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

web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java

@@ -206,21 +206,17 @@ private void addLocale(Locale locale) {
 	 * @since 4.2
 	 */
 	private void addParameters(Map<String, String[]> 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;
 		}
-	}
 
-	private void addParameter(String name, String[] values) {
-		this.parameters.put(name, values);
+		for (Map.Entry<String, String[]> entry : parameters.entrySet()) {
+			String name = entry.getKey();
+			String[] values = entry.getValue();
+			if (values != null) {
+				this.parameters.put(name, values);
+			}
+		}
 	}
 
 	/**