From 8aac2df744820304ee29354333661699e9695939 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Tue, 2 May 2017 15:11:04 -0700 Subject: Remove commented methods/fields in APPC Taking a stab at removing numerous commented out methods and fields. Almost all of what is removed is commented code with no explanation. Change-Id: I61cb1d7100ae6c75f6d42f500ade0504c97b760c Signed-off-by: Marcus G K Williams --- .../main/java/org/openecomp/appc/encryption/EncryptionTool.java | 3 --- appc-common/src/main/java/org/openecomp/appc/pool/Pool.java | 2 -- .../src/main/java/org/openecomp/appc/util/MessageFormatter.java | 8 -------- 3 files changed, 13 deletions(-) (limited to 'appc-common/src/main/java/org') diff --git a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java index 088fc8570..a8b302698 100644 --- a/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java +++ b/appc-common/src/main/java/org/openecomp/appc/encryption/EncryptionTool.java @@ -122,8 +122,6 @@ public class EncryptionTool { */ @SuppressWarnings("nls") private EncryptionTool() { - // encryptor = new BasicTextEncryptor(); - // encryptor.setPassword(secret.toString()); String out = "Found the following security algorithms:"; for (Provider p : Security.getProviders()) { for (Service s : p.getServices()) { @@ -147,7 +145,6 @@ public class EncryptionTool { public synchronized String decrypt(String cipherText) { if (isEncrypted(cipherText)) { String encValue = cipherText.substring(ENCRYPTED_VALUE_PREFIX.length()); - // return encryptor.decrypt(encValue); byte[] plainByte = Base64.decodeBase64(encValue.getBytes()); byte[] decryptByte = xorWithSecret(plainByte); return new String(decryptByte); diff --git a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java index 4c5b92474..29a12f432 100644 --- a/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java +++ b/appc-common/src/main/java/org/openecomp/appc/pool/Pool.java @@ -267,8 +267,6 @@ public class Pool { writeLock.unlock(); } - // return obj; - /* * Now that we have the real object, lets wrap it in a dynamic proxy so that we can intercept the close call and * just return the context to the free pool. obj.getClass().getInterfaces(). We need to find ALL interfaces that diff --git a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java index 39c9a67e3..95463321a 100644 --- a/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java +++ b/appc-common/src/main/java/org/openecomp/appc/util/MessageFormatter.java @@ -44,14 +44,6 @@ public class MessageFormatter { for (Map.Entry entry : params.entrySet()) { formattedMessage = formattedMessage.replaceAll("\\$\\{" + entry.getKey() + "\\}", String.valueOf(entry.getValue())); } -/* } else { - StringBuilder builder = new StringBuilder(formattedMessage); - builder.append("; output params: ["); - for (Map.Entry entry : params.entrySet()) { - builder.append(entry.getKey()).append(":").append(String.valueOf(entry.getValue())).append("; "); - } - builder.append("]"); - formattedMessage = builder.toString();*/ } return formattedMessage; -- cgit 1.2.3-korg