This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9eafdc7f15da4e82dc5dba210ef2ba9cf9e031bc Author: Andriy Redko <[email protected]> AuthorDate: Fri Feb 28 18:29:59 2025 -0500 Fix PMD violations --- .../main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java | 2 +- .../main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java | 3 ++- .../src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 ++-- .../src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 4 ++-- .../cxf/rs/security/oauth2/services/AbstractTokenService.java | 3 +-- rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 6 +++--- .../test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java index 2d70b6589b..f07a8fe24c 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java @@ -177,7 +177,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor { public void close() throws IOException { LoggingMessage buffer = setupBuffer(message); if (count >= lim) { - buffer.getMessage().append("(message truncated to " + lim + " bytes)\n"); + buffer.getMessage().append("(message truncated to ").append(lim).append(" bytes)\n"); } StringWriter w2 = out2; if (w2 == null) { diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java index bc74d80341..aa1ac05804 100644 --- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java +++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java @@ -19,6 +19,7 @@ package org.apache.cxf.jaxrs.ext.search.fiql; import java.util.ArrayList; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -79,7 +80,7 @@ public class FiqlParser<T> extends AbstractSearchConditionParser<T> { OPERATORS_MAP.put(EQ, ConditionType.EQUALS); OPERATORS_MAP.put(NEQ, ConditionType.NOT_EQUALS); - CONDITION_MAP = new HashMap<>(); + CONDITION_MAP = new EnumMap<>(ConditionType.class); CONDITION_MAP.put(ConditionType.GREATER_THAN, GT); CONDITION_MAP.put(ConditionType.GREATER_OR_EQUALS, GE); CONDITION_MAP.put(ConditionType.LESS_THAN, LT); diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java index 40c9010aa9..824f918641 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java @@ -36,7 +36,7 @@ import java.security.interfaces.RSAPublicKey; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -79,7 +79,7 @@ import org.apache.cxf.rt.security.rs.PrivateKeyPasswordProvider; public final class JwkUtils { private static final Map<KeyType, List<String>> JWK_REQUIRED_FIELDS_MAP; static { - JWK_REQUIRED_FIELDS_MAP = new HashMap<>(); + JWK_REQUIRED_FIELDS_MAP = new EnumMap<>(KeyType.class); JWK_REQUIRED_FIELDS_MAP.put(KeyType.RSA, Arrays.asList( JsonWebKey.RSA_PUBLIC_EXP, JsonWebKey.KEY_TYPE, JsonWebKey.RSA_MODULUS)); JWK_REQUIRED_FIELDS_MAP.put(KeyType.EC, Arrays.asList( diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java index f9155bf352..9aaf81e00e 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java @@ -25,7 +25,7 @@ import java.security.cert.X509Certificate; import java.security.interfaces.ECPrivateKey; import java.security.interfaces.RSAKey; import java.util.ArrayList; -import java.util.HashMap; +import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -229,7 +229,7 @@ public final class JwsUtils { public static Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> getJwsJsonSignatureMap( List<JwsJsonSignatureEntry> signatures) { - Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> map = new HashMap<>(); + Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> map = new EnumMap<>(SignatureAlgorithm.class); for (JwsJsonSignatureEntry entry : signatures) { SignatureAlgorithm sigAlgorithm = entry.getUnionHeader().getSignatureAlgorithm(); List<JwsJsonSignatureEntry> entries = map.get(sigAlgorithm); diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java index 8e32ccac66..4931de1ab5 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java @@ -139,8 +139,7 @@ public class AbstractTokenService extends AbstractOAuthService { if (clientSecretVerifier != null) { return clientSecretVerifier.validateClientSecret(client, providedClientSecret); } - return client.getClientSecret() != null - && providedClientSecret != null && client.getClientSecret().equals(providedClientSecret); + return client.getClientSecret() != null && client.getClientSecret().equals(providedClientSecret); } protected boolean isValidPublicClient(Client client, String clientId) { return canSupportPublicClients diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java index 65a2397a9f..469e7163ba 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java @@ -20,7 +20,7 @@ package org.apache.cxf.ws.rm; import java.util.Collection; -import java.util.HashMap; +import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -101,8 +101,8 @@ public class RMEndpoint { private EndpointReferenceType replyTo; private Source source; private Destination destination; - private final Map<ProtocolVariation, WrappedService> services = new HashMap<>(); - private final Map<ProtocolVariation, Endpoint> endpoints = new HashMap<>(); + private final Map<ProtocolVariation, WrappedService> services = new EnumMap<>(ProtocolVariation.class); + private final Map<ProtocolVariation, Endpoint> endpoints = new EnumMap<>(ProtocolVariation.class); private Object tokenStore; private Proxy proxy; private Servant servant; diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java index cb41395e12..a56e083075 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java @@ -403,7 +403,7 @@ public class SAMLClaimsTest { assertTrue(tokenString.contains(providerResponse.getTokenId())); assertTrue(tokenString.contains("AttributeStatement")); - String requiredClaim = CustomClaimsHandler.ROLE_CLAIM.toString(); + String requiredClaim = CustomClaimsHandler.ROLE_CLAIM; assertTrue(tokenString.contains(requiredClaim)); assertTrue(tokenString.contains("DUMMY")); assertTrue(tokenString.contains("CustomRole")); @@ -447,7 +447,7 @@ public class SAMLClaimsTest { assertTrue(tokenString.contains(providerResponse.getTokenId())); assertTrue(tokenString.contains("AttributeStatement")); - String requiredClaim = CustomClaimsHandler.ROLE_CLAIM.toString(); + String requiredClaim = CustomClaimsHandler.ROLE_CLAIM; assertTrue(tokenString.contains(requiredClaim)); assertTrue(tokenString.contains("DUMMY")); assertTrue(tokenString.contains("CustomRole"));
