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 ba803aa966ff8aaf9c2a8c7333c91e8c58917946 Author: Andriy Redko <[email protected]> AuthorDate: Wed Nov 12 11:28:58 2025 -0500 Update PMD to 7.18.0 (#2697) (cherry picked from commit e3c0c6edfff3eb64a834725b0e81349061dc5102) # Conflicts: # pom.xml (cherry picked from commit 7a28bfa5998b84a0dabcecd8a46b74adf70ec109) # Conflicts: # pom.xml --- parent/pom.xml | 4 ++-- pom.xml | 2 +- .../cxf/binding/corba/types/CorbaStructEventProducer.java | 1 + .../java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 1 + .../handler/logical/LogicalHandlerFaultInInterceptor.java | 1 + .../jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java | 1 + .../cxf/management/counters/ResponseTimeCounter.java | 1 - .../main/java/org/apache/cxf/jaxrs/client/WebClient.java | 2 ++ .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 1 + .../client/proxy/MicroProfileClientProxyImpl.java | 2 ++ .../oauth2/provider/AbstractOAuthDataProvider.java | 1 + .../org/apache/cxf/systest/handlers/LoggingHandler.java | 15 --------------- .../org/apache/cxf/systest/soapfault/LoggingHandler.java | 14 -------------- .../tools/corba/processors/wsdl/WSDLToCorbaBinding.java | 2 +- .../apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java | 1 + 15 files changed, 15 insertions(+), 34 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 34837f67e2..244a3f81d4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -435,12 +435,12 @@ <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-core</artifactId> - <version>7.17.0</version> + <version>7.18.0</version> </dependency> <dependency> <groupId>net.sourceforge.pmd</groupId> <artifactId>pmd-java</artifactId> - <version>7.17.0</version> + <version>7.18.0</version> </dependency> </dependencies> <configuration> diff --git a/pom.xml b/pom.xml index 028c827419..4ab8c72dbd 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ </issueManagement> <properties> <cxf.compiler.fork>false</cxf.compiler.fork> - <cxf.build-utils.version>4.1.2</cxf.build-utils.version> + <cxf.build-utils.version>4.1.3-SNAPSHOT</cxf.build-utils.version> <cxf.xjc-utils.version>3.3.4</cxf.xjc-utils.version> <cxf.jdk.version>11</cxf.jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java index d1280d477c..1543833384 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java @@ -40,6 +40,7 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer { } + @SuppressWarnings("PMD.IdenticalConditionalBranches") public int next() { int event = states[state]; if (event != 0) { diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java index b13d2d2e61..b7cb123d2a 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java @@ -294,6 +294,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable { } } //CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") private String substituteVarargs(URITemplate templ, Map<String, Object> alreadyResolvedTs, Map<String, Object> alreadyResolvedTsPathEnc, diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java index e96799d970..bdbbf4a2c3 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java @@ -36,6 +36,7 @@ public class LogicalHandlerFaultInInterceptor addAfter(SOAPHandlerFaultInInterceptor.class.getName()); } + @SuppressWarnings("PMD.IdenticalConditionalBranches") @Override public void handleMessage(Message message) { if (binding.getHandlerChain().isEmpty()) { diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java index 5d30d9abb7..4d1e1c95ec 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java @@ -105,6 +105,7 @@ public class SOAPHandlerFaultInInterceptor extends } } + @SuppressWarnings("PMD.IdenticalConditionalBranches") private void handleAbort(SoapMessage message, MessageContext context) { if (isRequestor(message)) { diff --git a/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java b/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java index 2143ec34fb..60e8c0748b 100644 --- a/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java +++ b/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java @@ -46,7 +46,6 @@ public class ResponseTimeCounter implements ResponseTimeCounterMBean, Counter { objectName = on; } - @SuppressWarnings("PMD.UselessPureMethodCall") public void increase(MessageHandlingTimeRecorder mhtr) { if (!enabled) { return; diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java index 1612c5ae10..0c80e6ca58 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java @@ -1065,6 +1065,7 @@ public class WebClient extends AbstractClient { inAnns, respClass, outType, exchange, invContext); } //CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") protected Response doChainedInvocation(String httpMethod, MultivaluedMap<String, String> headers, Object body, @@ -1099,6 +1100,7 @@ public class WebClient extends AbstractClient { } //CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") private Message finalizeMessage(String httpMethod, MultivaluedMap<String, String> headers, Object body, diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index 0121cde4ee..1e20ef0e4b 100644 --- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -599,6 +599,7 @@ public class WadlGenerator implements ContainerRequestFilter { } // CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") protected boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes, ElementQNameResolver qnameResolver, Map<Class<?>, QName> clsMap, OperationResourceInfo ori, Map<Parameter, Object> classParams, diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java index 20936bebdf..3e24b4ba8e 100644 --- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java @@ -110,6 +110,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl { private final TLSConfiguration tlsConfig; //CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") public MicroProfileClientProxyImpl(URI baseURI, ClassLoader loader, ClassResourceInfo cri, boolean isRoot, boolean inheritHeaders, ExecutorService executorService, Configuration configuration, CDIInterceptorWrapper interceptorWrapper, @@ -126,6 +127,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl { init(executorService, configuration); } + @SuppressWarnings("PMD.ExcessiveParameterList") public MicroProfileClientProxyImpl(ClientState initialState, ClassLoader loader, ClassResourceInfo cri, boolean isRoot, boolean inheritHeaders, ExecutorService executorService, Configuration configuration, CDIInterceptorWrapper interceptorWrapper, diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java index 695c0aed6e..57822320ff 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java @@ -101,6 +101,7 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl } //CHECKSTYLE:OFF + @SuppressWarnings("PMD.ExcessiveParameterList") protected ServerAccessToken doCreateAccessToken(List<String> audiences, Client client, String clientCodeVerifier, diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java index fa7b948893..df085dc79b 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java @@ -37,7 +37,6 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { private PrintStream out; public LoggingHandler() { - //setLogStream(System.out); setLogStream(new PrintStream(new ByteArrayOutputStream())); } @@ -50,25 +49,21 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { } public boolean handleMessage(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleMessage Called...."); logToSystemOut(smc); return true; } public boolean handleFault(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleFault Called...."); logToSystemOut(smc); return true; } // nothing to clean up public void close(MessageContext messageContext) { - //System.out.println("LoggingHandler : close() Called...."); } // nothing to clean up public void destroy() { - //System.out.println("LoggingHandler : destroy() Called...."); } /* @@ -79,20 +74,10 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { * SOAPException or IOException */ protected void logToSystemOut(SOAPMessageContext smc) { - Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - if (outboundProperty.booleanValue()) { - //out.println("\nOutbound message:"); - } else { - //out.println("\nInbound message:"); - } - SOAPMessage message = smc.getMessage(); try { message.writeTo(out); - //out.println(); } catch (Exception e) { - //out.println("Exception in handler: " + e); e.printStackTrace(); } } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java index 49ecca882e..5855f9d794 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java @@ -48,25 +48,21 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { } public boolean handleMessage(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleMessage Called...."); logToSystemOut(smc); return true; } public boolean handleFault(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleFault Called...."); logToSystemOut(smc); return true; } // nothing to clean up public void close(MessageContext messageContext) { - //System.out.println("LoggingHandler : close() Called...."); } // nothing to clean up public void destroy() { - //System.out.println("LoggingHandler : destroy() Called...."); } /* @@ -77,20 +73,10 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { * SOAPException or IOException */ protected void logToSystemOut(SOAPMessageContext smc) { - Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - if (outboundProperty.booleanValue()) { - //out.println("\nOutbound message:"); - } else { - //out.println("\nInbound message:"); - } - SOAPMessage message = smc.getMessage(); try { message.writeTo(out); - //out.println(); } catch (Exception e) { - //out.println("Exception in handler: " + e); e.printStackTrace(); } } diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java index 0867edc26f..4591cbbd3e 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java @@ -863,7 +863,7 @@ public class WSDLToCorbaBinding { if (verboseOn) { ex.printStackTrace(); } - System.exit(1); //NOPMD + System.exit(1); } } diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java index 651bed3c99..3a63044515 100644 --- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java +++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java @@ -1179,6 +1179,7 @@ public class SourceGenerator { sbCode.append(localName).append(' '); } //CHECKSTYLE:OFF: ParameterNumber + @SuppressWarnings("PMD.ExcessiveParameterList") private void writeRequestTypes(Element requestEl, String classPackage, Element repElement,
