PMD

Author: AB-xdev

oauth2-oidc-remember-me/src/test/java/software/xdev/sse/oauth2/rememberme/serializer/DefaultOAuth2CookieRememberMeAuthSerializerTest.java

@@ -91,7 +91,7 @@ void performAttackWithoutProtectionSuccess()
 			List.of(
 				"Unable to deserialize"::equals,
 				s -> s.contains(AttackPerformer.SUCCESS_INDICATOR),
-				s -> s.equals(AttackPerformer.SUCCESS_INDICATOR))
+				AttackPerformer.SUCCESS_INDICATOR::equals)
 		);
 		Assertions.assertTrue(attackSuccessIds.contains(id));
 	}

vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java

@@ -154,20 +154,7 @@ protected synchronized void initAllowedPaths()
 			.stream()
 			.map(RouteBaseData::getTemplate)
 			.filter(s -> !s.isBlank())
-			.map(s -> {
-				final String urlParamIdentifier = "/:___url_parameter";
-				final int urlParamIndex = s.indexOf(urlParamIdentifier);
-				if(urlParamIndex == -1)
-				{
-					return s;
-				}
-				
-				final String substring = s.substring(0, urlParamIndex);
-				return substring + "/*"
-					// Do a full level wildcard if there is more stuff (excluding the optional ?)
-					// behind the path-part
-					+ (s.length() - substring.length() - urlParamIdentifier.length() <= 1 ? "" : "*");
-			})
+			.map(this::handleUrlParameterInPath)
 			.map(s -> "/" + s)
 			.collect(Collectors.toSet());
 
@@ -184,4 +171,20 @@ protected synchronized void initAllowedPaths()
 			.map(RequestMatcher.class::cast)
 			.toList());
 	}
+	
+	protected String handleUrlParameterInPath(final String path)
+	{
+		final String urlParamIdentifier = "/:___url_parameter";
+		final int urlParamIndex = path.indexOf(urlParamIdentifier);
+		if(urlParamIndex == -1)
+		{
+			return path;
+		}
+		
+		final String substring = path.substring(0, urlParamIndex);
+		return substring + "/*"
+			// Do a full level wildcard if there is more stuff (excluding the optional ?)
+			// behind the path-part
+			+ (path.length() - substring.length() - urlParamIdentifier.length() <= 1 ? "" : "*");
+	}
 }