This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 076f03a6fe2eab33ecb0db7fe152f1baed5b79cc Author: Andriy Redko <[email protected]> AuthorDate: Thu Dec 4 22:23:06 2025 -0500 Fix PMD violations (cherry picked from commit 76f9ef641d05ffda30f7f61aa30cb15d6c530bd8) (cherry picked from commit 1bc18148444fd86101fb98bc804658f7efb4d1d8) --- .../interceptors/CorbaStreamOutEndingInterceptor.java | 4 ++-- .../corba/interceptors/CorbaStreamOutInterceptor.java | 4 ++-- .../apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 16 ++++++++-------- .../cxf/rs/security/jose/jwe/AbstractJweEncryption.java | 2 +- .../jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java | 2 +- .../security/jose/jwe/DirectKeyEncryptionAlgorithm.java | 2 +- .../apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java | 4 ++-- .../org/apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 ++-- .../rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +- .../http/policy/impl/ClientPolicyCalculator.java | 2 +- .../transport/https/httpclient/PublicSuffixMatcher.java | 2 +- .../apache/cxf/sts/operation/TokenIssueOperation.java | 4 ++-- .../cxf/sts/token/provider/DefaultSubjectProvider.java | 4 ++-- .../sts/token/provider/jwt/DefaultJWTClaimsProvider.java | 6 +++--- .../forked/dispatch/HugeResponseInterceptor.java | 6 +++--- .../processor/internal/DefaultServiceBuilderFactory.java | 4 ++-- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java index 5c92fb6064..1bee4e78d7 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java @@ -120,7 +120,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me QName paramName; final CorbaObjectHandler obj; - if (param.getMode().equals(ModeType.OUT)) { + if (param.getMode() == ModeType.OUT) { if (wrap) { paramName = new QName(wrapNSUri, param.getName()); } else { @@ -180,7 +180,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me QName idlType = param.getIdltype(); QName paramName; final CorbaObjectHandler obj; - if (param.getMode().equals(ModeType.IN)) { + if (param.getMode() == ModeType.IN) { if (wrap) { paramName = new QName(wrapNSUri, param.getName()); } else { diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java index 7ec3265b32..d125d3334c 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java @@ -77,7 +77,7 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message> List<ArgType> params = new ArrayList<>(); for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) { ParamType param = iter.next(); - if (!param.getMode().equals(ModeType.OUT)) { + if (param.getMode() != ModeType.OUT) { params.add(param); } } @@ -100,7 +100,7 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message> } for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) { ParamType param = iter.next(); - if (!param.getMode().equals(ModeType.IN)) { + if (param.getMode() != ModeType.IN) { params.add(param); } } diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java index 7778b48897..8db0865aba 100644 --- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java +++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java @@ -368,10 +368,10 @@ public class FiqlParserTest { assertEquals(2, conditions.size()); PrimitiveStatement st1 = conditions.get(0).getStatement(); PrimitiveStatement st2 = conditions.get(1).getStatement(); - assertTrue((ConditionType.EQUALS.equals(st1.getCondition()) - && ConditionType.GREATER_THAN.equals(st2.getCondition())) - || (ConditionType.EQUALS.equals(st2.getCondition()) - && ConditionType.GREATER_THAN.equals(st1.getCondition()))); + assertTrue((ConditionType.EQUALS == st1.getCondition() + && ConditionType.GREATER_THAN == st2.getCondition()) + || (ConditionType.EQUALS == st2.getCondition() + && ConditionType.GREATER_THAN == st1.getCondition())); assertTrue(filter.isMet(new Condition("amichalec", 12, new Date()))); assertTrue(filter.isMet(new Condition("ami", 12, new Date()))); @@ -397,10 +397,10 @@ public class FiqlParserTest { PrimitiveStatement st1 = conditions.get(0).getStatement(); PrimitiveStatement st2 = conditions.get(1).getStatement(); - assertTrue((ConditionType.EQUALS.equals(st1.getCondition()) - && ConditionType.GREATER_THAN.equals(st2.getCondition())) - || (ConditionType.EQUALS.equals(st2.getCondition()) - && ConditionType.GREATER_THAN.equals(st1.getCondition()))); + assertTrue((ConditionType.EQUALS == st1.getCondition() + && ConditionType.GREATER_THAN == st2.getCondition()) + || (ConditionType.EQUALS == st2.getCondition() + && ConditionType.GREATER_THAN == st1.getCondition())); assertTrue(filter.isMet(new Condition("ami", 0, new Date()))); assertTrue(filter.isMet(new Condition("foo", 20, null))); diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java index ebfb01c499..616412af4e 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java @@ -177,7 +177,7 @@ public abstract class AbstractJweEncryption implements JweEncryptionProvider { if (jweInHeaders != null) { if (jweInHeaders.getKeyEncryptionAlgorithm() != null && (getKeyAlgorithm() == null - || !getKeyAlgorithm().equals(jweInHeaders.getKeyEncryptionAlgorithm()))) { + || getKeyAlgorithm() != jweInHeaders.getKeyEncryptionAlgorithm())) { LOG.warning("Invalid key encryption algorithm"); throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM); } diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java index 4f67106b11..ae135579fa 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java @@ -90,7 +90,7 @@ public abstract class AbstractWrapKeyEncryptionAlgorithm implements KeyEncryptio } protected void checkAlgorithms(JweHeaders headers) { KeyAlgorithm providedAlgo = headers.getKeyEncryptionAlgorithm(); - if (providedAlgo != null && !providedAlgo.equals(algorithm)) { + if (providedAlgo != null && providedAlgo != algorithm) { LOG.warning("Invalid key encryption algorithm: " + providedAlgo); throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM); } diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java index 584390a363..c828afa80d 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java @@ -31,7 +31,7 @@ public class DirectKeyEncryptionAlgorithm implements KeyEncryptionProvider { } protected void checkKeyEncryptionAlgorithm(JweHeaders headers) { KeyAlgorithm keyAlgo = headers.getKeyEncryptionAlgorithm(); - if (keyAlgo != null && !KeyAlgorithm.DIRECT.equals(keyAlgo)) { + if (keyAlgo != null && KeyAlgorithm.DIRECT != keyAlgo) { LOG.warning("Key encryption algorithm header is set"); throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM); } diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java index 5111d5dca0..71b86e2ad3 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java @@ -92,9 +92,9 @@ public class JweJsonConsumer { Map<String, Object> recipientProps) { for (Map.Entry<JweJsonEncryptionEntry, JweHeaders> entry : recipientsMap.entrySet()) { KeyAlgorithm keyAlgo = entry.getValue().getKeyEncryptionAlgorithm(); - if (keyAlgo != null && keyAlgo.equals(jwe.getKeyAlgorithm()) + if (keyAlgo != null && keyAlgo == jwe.getKeyAlgorithm() || keyAlgo == null - && (jwe.getKeyAlgorithm() == null || KeyAlgorithm.DIRECT.equals(jwe.getKeyAlgorithm()))) { + && (jwe.getKeyAlgorithm() == null || KeyAlgorithm.DIRECT == jwe.getKeyAlgorithm())) { if (recipientProps != null && !entry.getValue().asMap().entrySet().containsAll(recipientProps.entrySet())) { continue; 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 824f918641..d255923712 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 @@ -565,7 +565,7 @@ public final class JwkUtils { } public static void includeCertChain(JsonWebKey jwk, JoseHeaders headers, String algo) { - if (KeyType.RSA.equals(jwk.getKeyType())) { + if (KeyType.RSA == jwk.getKeyType()) { List<String> chain = CastUtils.cast((List<?>)jwk.getProperty(JsonWebKey.X509_CHAIN)); if (chain != null) { headers.setX509Chain(chain); @@ -574,7 +574,7 @@ public final class JwkUtils { } public static void includePublicKey(JsonWebKey jwk, JoseHeaders headers, String algo) { - if (KeyType.RSA.equals(jwk.getKeyType())) { + if (KeyType.RSA == jwk.getKeyType()) { JsonWebKey jwkPublic = JwkUtils.fromRSAPublicKey(JwkUtils.toRSAPublicKey(jwk), algo); if (jwk.getKeyId() != null) { jwkPublic.setKeyId(jwk.getKeyId()); diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java index 8549c46f5f..914aa4435a 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java @@ -149,7 +149,7 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator LOG.warning(message); throw ExceptionUtils.toForbiddenException(null, null); } - if (am != null && !am.equals(accessTokenV.getTokenSubject().getAuthenticationMethod())) { + if (am != null && am != accessTokenV.getTokenSubject().getAuthenticationMethod()) { String message = "The token has been authorized by the resource owner " + "using an unsupported authentication method"; LOG.warning(message); diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java index 0f1f05804e..ee41dc0f4a 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java @@ -227,7 +227,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy if (compatible) { compatible &= !p1.isSetProxyServerType() || !p2.isSetProxyServerType() - || p1.getProxyServerType().equals(p2.getProxyServerType()); + || p1.getProxyServerType() == p2.getProxyServerType(); } if (compatible) { diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java index 9c615fef62..d01d6b0ea0 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java @@ -96,7 +96,7 @@ public final class PublicSuffixMatcher { if (domainType == null) { return false; } - return expectedType == null || domainType.equals(expectedType); + return expectedType == null || domainType == expectedType; } private boolean hasRule(final String rule, final DomainType expectedType) { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index c7c1f5c4ea..d397d4f668 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -227,9 +227,9 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera if (tokenResponse == null) { LOG.fine("No Token Validator has been found that can handle this token"); - } else if (validateTarget.getState().equals(STATE.INVALID)) { + } else if (validateTarget.getState() == STATE.INVALID) { throw new STSException("Incoming token is invalid", STSException.REQUEST_FAILED); - } else if (validateTarget.getState().equals(STATE.VALID)) { + } else if (validateTarget.getState() == STATE.VALID) { processValidToken(providerParameters, validateTarget, tokenResponse); } else { //[TODO] Add plugin for validation out-of-band diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java index 49f6f37e80..de7ae784e3 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java @@ -130,12 +130,12 @@ public class DefaultSubjectProvider implements SubjectProvider { //if validation was successful, the principal was set in ReceivedToken if (providerParameters.getTokenRequirements().getOnBehalfOf() != null) { ReceivedToken receivedToken = providerParameters.getTokenRequirements().getOnBehalfOf(); - if (receivedToken.getState().equals(STATE.VALID)) { + if (receivedToken.getState() == STATE.VALID) { principal = receivedToken.getPrincipal(); } } else if (providerParameters.getTokenRequirements().getValidateTarget() != null) { ReceivedToken receivedToken = providerParameters.getTokenRequirements().getValidateTarget(); - if (receivedToken.getState().equals(STATE.VALID)) { + if (receivedToken.getState() == STATE.VALID) { principal = receivedToken.getPrincipal(); } } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java index 9f02af9332..a06a58a6d4 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java @@ -132,12 +132,12 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider { //if validation was successful, the principal was set in ReceivedToken if (providerParameters.getTokenRequirements().getOnBehalfOf() != null) { ReceivedToken receivedToken = providerParameters.getTokenRequirements().getOnBehalfOf(); - if (receivedToken.getState().equals(STATE.VALID)) { + if (receivedToken.getState() == STATE.VALID) { principal = receivedToken.getPrincipal(); } } else if (providerParameters.getTokenRequirements().getValidateTarget() != null) { ReceivedToken receivedToken = providerParameters.getTokenRequirements().getValidateTarget(); - if (receivedToken.getState().equals(STATE.VALID)) { + if (receivedToken.getState() == STATE.VALID) { principal = receivedToken.getPrincipal(); } } else { @@ -271,7 +271,7 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider { if (providerParameters.getTokenRequirements().getActAs() != null) { ReceivedToken receivedToken = providerParameters.getTokenRequirements().getActAs(); - if (receivedToken.getState().equals(STATE.VALID)) { + if (receivedToken.getState() == STATE.VALID) { claims.setClaim("ActAs", receivedToken.getPrincipal().getName()); } } diff --git a/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java b/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java index 6da4941ba7..925e303081 100644 --- a/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java +++ b/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java @@ -40,9 +40,9 @@ public class HugeResponseInterceptor extends AbstractPhaseInterceptor<Message> { } public void handleMessage(Message message) throws Fault { - if (type.equals(ResponseInterceptorType.overflow)) { + if (type == ResponseInterceptorType.overflow) { throw new StackOverflowError(); - } else if (type.equals(ResponseInterceptorType.ElementLevelThreshold)) { + } else if (type == ResponseInterceptorType.ElementLevelThreshold) { InputStream is = message.getContent(InputStream.class); if (is != null) { CachedOutputStream bos = new CachedOutputStream(); @@ -59,7 +59,7 @@ public class HugeResponseInterceptor extends AbstractPhaseInterceptor<Message> { throw new Fault(e); } } - } else if (type.equals(ResponseInterceptorType.ElementCountThreshold)) { + } else if (type == ResponseInterceptorType.ElementCountThreshold) { InputStream is = message.getContent(InputStream.class); if (is != null) { CachedOutputStream bos = new CachedOutputStream(); diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java index deea27bf57..9c2d33a33a 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java @@ -49,9 +49,9 @@ public final class DefaultServiceBuilderFactory extends ServiceBuilderFactory { throw new ToolException("Unsupported databinding: " + dbn); } final AbstractServiceFactory builder; - if (Style.Jaxws.equals(s)) { + if (Style.Jaxws == s) { builder = new JaxwsServiceBuilder(); - } else if (Style.Simple.equals(s)) { + } else if (Style.Simple == s) { builder = new SimpleServiceBuilder(); } else { throw new ToolException("Unsupported frontend style: " + s);
