Fix a bunch of issues the new PMD is reporting, many more to go

core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java

@@ -51,7 +51,7 @@ public void cache(Message message) throws IOException {
  cache = new CachedOutputStream();
  AttachmentUtil.setStreamedAttachmentProperties(message, cache);
  try {
- IOUtils.copy(ins, cache);
+ IOUtils.copyAndCloseInput(ins, cache);
  cache.lockOutputStream();
  if (delegate != null) {
  delegate.setInputStream(cache.getInputStream());
@@ -61,11 +61,6 @@ public void cache(Message message) throws IOException {
  cache = null;
  throw cee;
  } finally {
- try {
- ins.close();
- } catch (Exception ex) {
- //ignore
- }
  ins = null;
  }
  }

core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java

@@ -192,6 +192,7 @@ public void getRealLambdaClassPropertyWasNotSetInBus() {
  EasyMock.verify(bus);
  }
 
+ @Test
  public void getRealLambdaClassPropertyWasSetInBus() {
  EasyMock.expect(bus.getProperty(ClassHelper.USE_DEFAULT_CLASS_HELPER)).andReturn(true);
  EasyMock.expect(bus.getProperty(ClassUnwrapper.class.getName())).andReturn(null);

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java

@@ -36,6 +36,7 @@
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.service.invoker.BeanInvoker;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -45,6 +46,7 @@ public class ExceptionInheritanceTest extends AbstractAegisTest {
  private WS1 client;
  private Map<String, Object> props;
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java

@@ -51,6 +51,7 @@
 import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
 import org.apache.ws.commons.schema.constants.Constants;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -63,6 +64,7 @@ public class BeanTest extends AbstractAegisTest {
  TypeMapping mapping;
  private AegisContext context;
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java

@@ -25,9 +25,11 @@
 import org.apache.cxf.aegis.services.DataService;
 import org.apache.cxf.wsdl.WSDLConstants;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class ByteDataTest extends AbstractAegisTest {
+ @Before
  public void setUp() throws Exception {
  super.setUp();
  createService(DataService.class);

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java

@@ -25,6 +25,7 @@
 import org.apache.cxf.aegis.type.TypeMapping;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -37,6 +38,7 @@
 public class DynamicProxyTest extends AbstractAegisTest {
  TypeMapping mapping;
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java

@@ -32,10 +32,12 @@
 import org.apache.cxf.aegis.type.TypeMapping;
 import org.apache.ws.commons.schema.constants.Constants;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class QualificationTest extends AbstractAegisTest {
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java

@@ -30,6 +30,7 @@
 import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertSame;
@@ -40,6 +41,7 @@ public class ArrayTypeInfoTest extends AbstractAegisTest {
  private TypeMapping mapping;
  private StructType addressType;
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java

@@ -28,6 +28,7 @@
 import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertArrayEquals;
@@ -48,6 +49,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
  },
  };
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java

@@ -33,6 +33,7 @@
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.cxf.helpers.DOMUtils;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -49,6 +50,7 @@ private Context getLocalContext() {
  return new Context(aegisContext);
  }
 
+ @Before
  public void setUp() throws Exception {
  super.setUp();
 

rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

@@ -749,29 +749,29 @@ protected void storeMessage(Connection con, Identifier sid, RMMessage msg, boole
  new Object[] {outbound ? "outbound" : "inbound", nr, id, to});
  }
  PreparedStatement stmt = null;
- CachedOutputStream cos = msg.getContent();
- InputStream msgin = null;
- try {
- msgin = cos.getInputStream();
- stmt = getStatement(con, outbound ? CREATE_OUTBOUND_MESSAGE_STMT_STR : CREATE_INBOUND_MESSAGE_STMT_STR);
-
- stmt.setString(1, id);
- stmt.setLong(2, nr);
- stmt.setString(3, to);
- stmt.setLong(4, msg.getCreatedTime());
- stmt.setBinaryStream(5, msgin);
- stmt.setString(6, contentType);
- stmt.execute();
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "Successfully stored {0} message number {1} for sequence {2}",
- new Object[] {outbound ? "outbound" : "inbound", nr, id});
- }
- } finally {
- releaseResources(stmt, null);
- if (null != msgin) {
- msgin.close();
+ try (CachedOutputStream cos = msg.getContent()) {
+ InputStream msgin = null;
+ try {
+ msgin = cos.getInputStream();
+ stmt = getStatement(con, outbound ? CREATE_OUTBOUND_MESSAGE_STMT_STR : CREATE_INBOUND_MESSAGE_STMT_STR);
+
+ stmt.setString(1, id);
+ stmt.setLong(2, nr);
+ stmt.setString(3, to);
+ stmt.setLong(4, msg.getCreatedTime());
+ stmt.setBinaryStream(5, msgin);
+ stmt.setString(6, contentType);
+ stmt.execute();
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Successfully stored {0} message number {1} for sequence {2}",
+ new Object[] {outbound ? "outbound" : "inbound", nr, id});
+ }
+ } finally {
+ releaseResources(stmt, null);
+ if (null != msgin) {
+ msgin.close();
+ }
  }
- cos.close(); // needed to clean-up tmp file folder
  }
  }
 

rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java

@@ -73,7 +73,7 @@ public void tearDown() {
  rq = null;
  }
 
- void setUpSource() {
+ protected void setUpSource() {
  source = control.createMock(Source.class);
  manager = control.createMock(RMManager.class);
  EasyMock.expect(source.getManager()).andReturn(manager).anyTimes();

rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java

@@ -107,7 +107,7 @@ public class WSDLServiceBuilderTest {
 
  private DestinationFactoryManager destinationFactoryManager;
 
- public void setUpBasic() throws Exception {
+ protected void setUpBasic() throws Exception {
  setUpWSDL(WSDL_PATH, 0);
  }
 

systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java

@@ -144,7 +144,7 @@ public void testSequentialStrategyWithDiffBaseAddresses() throws Exception {
  getFeature(false, Server.ADDRESS3, null);
  strategyTest(Server.ADDRESS1, feature, Server.ADDRESS3, Server.ADDRESS2, false, false, false);
  }
-
+ @Test
  public void testSequentialStrategyWithDiffBaseAddresses2() throws Exception {
  FailoverFeature feature =
  getFeature(false, Server.ADDRESS3, null);

systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java

@@ -146,11 +146,11 @@ public static void cleanUp() {
 
  //methods that a subclass can override to inject a Proxy into the flow
  //and assert the proxy was appropriately called
- public void configureProxy(Client c) {
+ protected void configureProxy(Client c) {
  }
- public void resetProxyCount() {
+ protected void resetProxyCount() {
  }
- public void assertProxyRequestCount(int i) {
+ protected void assertProxyRequestCount(int i) {
  }
 
 

systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java

@@ -73,7 +73,7 @@ public static void setupPorts() {
  BusServer.resetPortMap();
  }
 
- public void startServers() throws Exception {
+ protected void startServers() throws Exception {
  assertTrue(
  "Server failed to launch",
  // run the server in the same process
@@ -83,7 +83,7 @@ public void startServers() throws Exception {
  }
 
 
- public void stopServers() throws Exception {
+ protected void stopServers() throws Exception {
  stopAllServers();
  System.clearProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
  BusFactory.setDefaultBus(null);

systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java

@@ -251,11 +251,11 @@ public static TrustManager[] getTrustManagers(KeyStore keyStore)
 
  //methods that a subclass can override to inject a Proxy into the flow
  //and assert the proxy was appropriately called
- public void configureProxy(Client c) {
+ protected void configureProxy(Client c) {
  }
- public void resetProxyCount() {
+ protected void resetProxyCount() {
  }
- public void assertProxyRequestCount(int i) {
+ protected void assertProxyRequestCount(int i) {
  }
 
  /**

systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java

@@ -67,7 +67,7 @@ private void setTheConfiguration(String config) {
  }
  }
 
- public void startServers() throws Exception {
+ protected void startServers() throws Exception {
  assertTrue(
  "Server failed to launch",
  // run the server in the same process
@@ -77,7 +77,7 @@ public void startServers() throws Exception {
  }
 
 
- public void stopServers() throws Exception {
+ protected void stopServers() throws Exception {
  stopAllServers();
  System.clearProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
  BusFactory.setDefaultBus(null);

systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

@@ -61,7 +61,7 @@ public abstract class AbstractTypeTestClient
 
  protected boolean perfTestOnly;
 
- public void setPerformanceTestOnly() {
+ protected void setPerformanceTestOnly() {
  perfTestOnly = true;
  }
 

systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java

@@ -144,7 +144,7 @@ public void testRecovery() throws Exception {
  verifyRecovery();
  }
 
- void startClient() throws Exception {
+ protected void startClient() throws Exception {
  LOG.fine("Creating greeter client");
  System.setProperty("db.name", getPrefix() + "-client");
  SpringBusFactory bf = new SpringBusFactory();
@@ -163,7 +163,7 @@ void startClient() throws Exception {
  bus.getInInterceptors().add(in);
  }
 
- void populateStore() throws Exception {
+ protected void populateStore() throws Exception {
 
  bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(Long.valueOf(60000));
  bus.getOutInterceptors().add(new MessageLossSimulator());
@@ -198,7 +198,7 @@ void populateStore() throws Exception {
  mf.verifyAcknowledgements(new boolean[] {false, true, true}, false);
  }
 
- void verifyStorePopulation() {
+ protected void verifyStorePopulation() {
 
  RMManager manager = bus.getExtension(RMManager.class);
  assertNotNull(manager);
@@ -225,12 +225,12 @@ void verifyStorePopulation() {
  assertEquals(0, msgs.size());
  }
 
- void stopClient() {
+ protected void stopClient() {
  // ClientProxy.getClient(greeter).destroy();
  bus.shutdown(true);
  }
 
- void populateStoreAfterRestart() throws Exception {
+ protected void populateStoreAfterRestart() throws Exception {
 
  bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(Long.valueOf(60000));
 
@@ -274,7 +274,7 @@ void populateStoreAfterRestart() throws Exception {
  }
  }
 
- void recover() throws Exception {
+ protected void recover() throws Exception {
 
  // do nothing - resends should happen in the background
 
@@ -283,7 +283,7 @@ void recover() throws Exception {
 
  }
 
- void verifyRecovery() throws Exception {
+ protected void verifyRecovery() throws Exception {
 
  RMManager manager = bus.getExtension(RMManager.class);
  assertNotNull(manager);

systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java

@@ -269,7 +269,7 @@ void verifyServerRecovery(Response<GreetMeResponse>[] responses) throws Exceptio
  }
 
 
- void verifyRetransmissionQueue() throws Exception {
+ protected void verifyRetransmissionQueue() throws Exception {
  awaitMessages(2, 2, 60000);
 
  int count = 0;

testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java

@@ -47,11 +47,14 @@ public FaultThrowingInterceptor(String phase) {
  super(phase);
  }
 
- public synchronized void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) throws Fault {
  if (MessageUtils.isRequestor(message)) {
  return;
  }
- String msg = MESSAGE_FORMAT.format(new Object[] {getPhase()});
+ String msg = null;
+ synchronized (MESSAGE_FORMAT) {
+ msg = MESSAGE_FORMAT.format(new Object[] {getPhase()});
+ }
  LOG.fine(msg);
  throw new Fault(new RuntimeException(msg));
  }

testutils/src/main/resources/wsdl/type_test/type_test_tester_java.xsl

@@ -36,8 +36,6 @@ package org.apache.cxf.systest.type_test;
  * org.apache.type_test.TypeTestTester
  */
 public interface TypeTestTester {
-
- void setPerformanceTestOnly();
  
  void testVoid() throws Exception;