Add AAF certs with year duration to DR

Remove console logs during unit tests
Disable checkstyle warnings

Change-Id: Ie57e792e9616fe348be1931aacc274d28a9798bc
Issue-ID: DMAAP-1143
Signed-off-by: econwar <conor.ward@est.tech>

2 files changed, 8 insertions, 25 deletions

diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties
index 27e91c90..7c076359 100644
--- a/datarouter-node/src/main/resources/node.properties
+++ b/datarouter-node/src/main/resources/node.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
 KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
 #
 #    The password for the https keystore
-KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
 #
 #    The password for the private key in the https keystore
-KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
 #
 #    The type of truststore for https
 TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
 TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
 #
 #    The password for the https truststore
-TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g
+TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
 #
 #    The path to the file used to trigger an orderly shutdown
 QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
index 9a3d82e5..6dc334fc 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java
@@ -92,31 +92,14 @@ public class DeliveryQueueTest {
         files[0] = dirPath + FileName1;
     }
 
-    private void createFolder(String dirName) throws Exception {
-        String dirPath = dirName;
-
-        File newDirectory = new File(dirPath);
-        boolean isCreated = newDirectory.mkdirs();
-        if (isCreated) {
-            System.out.println("1. Successfully created directories, path: " + newDirectory.getCanonicalPath());
-        } else if (newDirectory.exists()) {
-            System.out.print("1. Directory path already exist, path: " + newDirectory.getCanonicalPath());
-        } else {
-            System.out.println("1. Unable to create directory");
-        }
+    private void createFolder(String dirName) {
+        File newDirectory = new File(dirName);
+        newDirectory.mkdirs();
     }
 
     private void createFile(String file, String dir) throws Exception {
-        String FileName = file;
-        String dirPath = dir;
-
-        File newFile = new File(dirPath + File.separator + FileName);
-        boolean isCreated = newFile.createNewFile();
-        if (isCreated) {
-            System.out.println("\n2. Successfully created new file, path: " + newFile.getCanonicalPath());
-        } else { //File may already exist
-            System.out.println("\n2. Unable to create new file: " + newFile.getCanonicalPath());
-        }
+        File newFile = new File(dir + File.separator + file);
+        newFile.createNewFile();
     }
 
     private void deleteFile(String fileName) {