diff --git a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java index 7db49b4dcf5..a05c58c15ac 100644 --- a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java +++ b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java @@ -85,6 +85,8 @@ public String run() { return Boolean.parseBoolean(cname); } + + @SuppressWarnings("PMD.UselessPureMethodCall") public static void doHacks() { if (skipHack("org.apache.cxf.JDKBugHacks.all")) { return; diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java index 26820c640d4..d7135180d6d 100644 --- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java +++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java @@ -226,6 +226,7 @@ public static Logger getL7dLogger(Class cls, /** * Create a logger */ + @SuppressWarnings("PMD.UselessPureMethodCall") protected static Logger createLogger(Class cls, String name, String loggerName) { diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java index d920936f814..0975a6fd09c 100644 --- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java +++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java @@ -61,6 +61,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport private final Map> wildCardBeanDefinitions = new TreeMap<>(); private BeanFactory beanFactory; + @SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") static class MatcherHolder implements Comparable { Matcher matcher; String wildCardId; diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java index 67dd3b4ddb8..2478fb9ce56 100644 --- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java +++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java @@ -49,6 +49,7 @@ import org.apache.cxf.common.util.ReflectionUtil; @NoJSR250Annotations +@SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") public class AutomaticWorkQueueImpl implements AutomaticWorkQueue { public static final String PROPERTY_NAME = "name"; static final int DEFAULT_MAX_QUEUE_SIZE = 256; diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java index 69008ea0e0f..70657184808 100644 --- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java +++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java @@ -55,8 +55,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; public class AttachmentDeserializerTest { @@ -696,12 +696,8 @@ public void testManyAttachments() throws Exception { ad.initializeAttachments(); // Force it to load the attachments - try { - msg.getAttachments().size(); - fail("Failure expected on too many attachments"); - } catch (RuntimeException ex) { - // expected - } + assertThrows("Failure expected on too many attachments", RuntimeException.class, + () -> msg.getAttachments().size()); } @Test @@ -734,12 +730,8 @@ public void testChangingMaxAttachmentCount() throws Exception { ad.initializeAttachments(); // Force it to load the attachments - try { - msg.getAttachments().size(); - fail("Failure expected on too many attachments"); - } catch (RuntimeException ex) { - // expected - } + assertThrows("Failure expected on too many attachments", RuntimeException.class, + () -> msg.getAttachments().size()); // Now we'll allow it msg = new MessageImpl(); diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/provider/SpringBasedTimedAnnotationProviderTest.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/provider/SpringBasedTimedAnnotationProviderTest.java index 93d4f0f929c..bbada8a885e 100644 --- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/provider/SpringBasedTimedAnnotationProviderTest.java +++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/provider/SpringBasedTimedAnnotationProviderTest.java @@ -54,6 +54,7 @@ public class SpringBasedTimedAnnotationProviderTest { private MethodDispatcher methodDispatcher; @Before + @SuppressWarnings("PMD.UselessPureMethodCall") public void setUp() { openMocks(this); underTest = new SpringBasedTimedAnnotationProvider(); diff --git a/parent/pom.xml b/parent/pom.xml index 8293827d4db..24e82ec9748 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -437,7 +437,7 @@ net.sourceforge.pmd pmd-java - 7.16.0 + 7.17.0 diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java index 504ac15724e..0418513b8fa 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java @@ -19,6 +19,7 @@ package org.apache.cxf.aegis.type.array; +@SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") public class DuplicateArrayReturnItem implements Comparable { String name; diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java index 28dbce42e66..22bad1dbcb7 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java @@ -83,6 +83,7 @@ class JAXBContextInitializer extends ServiceModelVisitor { } @Override + @SuppressWarnings("PMD.UselessPureMethodCall") public void begin(MessagePartInfo part) { Class clazz = part.getTypeClass(); if (clazz == null) { diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java index 5e0dcb8fa3c..3088122d61c 100644 --- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java +++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.MockitoAnnotations.openMocks; +@SuppressWarnings("PMD.UselessPureMethodCall") public class DefaultExceptionClassProviderTest { private static final Exception EXCEPTION_CAUSE = new CauseException(); diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java index 64d47167fbf..3f9eb581ed2 100644 --- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java +++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.MockitoAnnotations.openMocks; -@SuppressWarnings({"unused"}) +@SuppressWarnings({"unused", "PMD.UselessPureMethodCall"}) public class DefaultTimedAnnotationProviderTest { private DefaultTimedAnnotationProvider underTest; diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java index c5e25ba9241..1550aa5fa67 100644 --- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java +++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java @@ -37,6 +37,7 @@ import static org.mockito.MockitoAnnotations.openMocks; +@SuppressWarnings("PMD.UselessPureMethodCall") public class StandardTagsTest { private static final String DUMMY_METHOD_NAME = "dummyMethod"; diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxws/JaxwsFaultCodeProviderTest.java b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxws/JaxwsFaultCodeProviderTest.java index 326ab34230c..0879e8211dc 100644 --- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxws/JaxwsFaultCodeProviderTest.java +++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxws/JaxwsFaultCodeProviderTest.java @@ -35,6 +35,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.MockitoAnnotations.openMocks; +@SuppressWarnings("PMD.UselessPureMethodCall") public class JaxwsFaultCodeProviderTest { private static final String RUNTIME_FAULT_STRING = "RUNTIME_FAULT"; diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java index 57d98c63997..425c0c719ae 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import jakarta.activation.DataHandler; import jakarta.mail.util.ByteArrayDataSource; @@ -55,7 +56,11 @@ public void testCreateAndModify() { assertTrue(attachments.containsAll(attachments)); List testCollection = new ArrayList<>(); testCollection.add("Some value"); - assertFalse(attachments.containsAll(testCollection)); + assertFalse(attachments + .stream() + .map(Attachment::toString) + .collect(Collectors.toList()) + .containsAll(testCollection)); attachments.add(att3); assertEquals(3, attachments.size()); diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/WrapperClassLoaderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/WrapperClassLoaderTest.java index c2a2a4083e3..cdbc9f51e25 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/WrapperClassLoaderTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/WrapperClassLoaderTest.java @@ -140,6 +140,7 @@ public void testWrapperClassLoaderWithWrappedOperationsAndLegacyConvention() thr loadedClassNames); } + @SuppressWarnings("PMD.UselessPureMethodCall") private List testWrapperClassLoaderWithNamingConvention(WrapperClassNamingConvention convention) throws Exception { bus.setExtension(convention, WrapperClassNamingConvention.class); 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 60e8c0748b3..2143ec34fb9 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,6 +46,7 @@ public ResponseTimeCounter(ObjectName on) { objectName = on; } + @SuppressWarnings("PMD.UselessPureMethodCall") public void increase(MessageHandlingTimeRecorder mhtr) { if (!enabled) { return; diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java index 91c3d8a1029..5c60035db81 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java @@ -48,6 +48,7 @@ /** * */ +@SuppressWarnings("PMD.UselessPureMethodCall") public class AbstractRMInterceptorTest { @Test public void testAccessors() { diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java index 8923f111bdc..65c869db094 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java @@ -96,6 +96,7 @@ public void getBookNoContentInterface(@Suspended AsyncResponse async) { @GET @Path("/books/cancel") + @SuppressWarnings("PMD.UselessPureMethodCall") public void getBookDescriptionWithCancel(@PathParam("id") String id, @Suspended AsyncResponse async) { PhaseInterceptorChain.getCurrentMessage().getClass(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java index 20bb7d1c782..4b8af0892d9 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java @@ -19,6 +19,7 @@ package org.apache.cxf.systest.provider; +@SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") public class HWSourcePayloadProvider extends AbstractSourcePayloadProvider implements Comparable { diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java index b17d65bcad9..1758dda2d93 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java @@ -325,7 +325,7 @@ public void testAuthorizationCodeFlowWithRefresh() throws Exception { accessToken = response.readEntity(ClientAccessToken.class); assertNotNull(accessToken.getTokenKey()); assertNotNull(accessToken.getRefreshToken()); - accessToken.getParameters().get("id_token"); + assertNotNull(accessToken.getParameters().get("id_token")); assertNotNull(idToken); if (isAccessTokenInJWTFormat()) { diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java index 8c379a357a3..a4130779b61 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java @@ -413,7 +413,7 @@ public void testUserInfoRefreshToken() throws Exception { accessToken = response.readEntity(ClientAccessToken.class); assertNotNull(accessToken.getTokenKey()); assertNotNull(accessToken.getRefreshToken()); - accessToken.getParameters().get("id_token"); + assertNotNull(accessToken.getParameters().get("id_token")); assertNotNull(idToken); String newAccessToken = accessToken.getTokenKey(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java index f341d7f771c..e7ce0baf8ef 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java @@ -27,7 +27,6 @@ import jakarta.resource.spi.ManagedConnection; import jakarta.resource.spi.ManagedConnectionFactory; import jakarta.xml.ws.Endpoint; -import jakarta.xml.ws.WebServiceException; import org.apache.cxf.BusFactory; import org.apache.cxf.connector.Connection; import org.apache.cxf.jca.cxf.CXFConnectionRequestInfo; @@ -44,7 +43,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; public class OutBoundConnectionTest extends AbstractBusClientServerTestBase { public static final String PORT = Server.PORT; @@ -89,7 +87,6 @@ public static void startServers() throws Exception { } @Test - @org.junit.Ignore public void testBasicConnection() throws Exception { URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl"); assertNotNull(wsdl); @@ -108,19 +105,14 @@ public void testBasicConnection() throws Exception { Object o = mc.getConnection(subject, cri); // test for the Object hash() - try { - o.hashCode(); - o.toString(); - } catch (WebServiceException ex) { - fail("The connection object should support Object method"); - } + assertNotNull(o.hashCode()); + assertNotNull(o.toString()); verifyResult(o); } @Test - @org.junit.Ignore public void testGetConnectionFromSEI() throws Exception { CXFConnectionRequestInfo requestInfo = new CXFConnectionRequestInfo(); requestInfo.setInterface(Greeter.class); diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java index 1e874ef9767..b861bbcce74 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java @@ -46,6 +46,7 @@ public Set getImports() { return imports; } + @SuppressWarnings("PMD.UselessPureMethodCall") private void prompt() { toString(); }