diff options
Diffstat (limited to 'PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java')
-rw-r--r-- | PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java index 9863f03ad..2ffdae159 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PeCryptoUtils.java @@ -20,25 +20,22 @@ package org.onap.policy.utils; -import java.security.GeneralSecurityException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.lang3.StringUtils; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.common.utils.security.CryptoUtils; public class PeCryptoUtils { - private static Logger logger = FlexLogger.getLogger(PeCryptoUtils.class); private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key"; private static CryptoUtils cryptoUtils = null; private static String secretKey = System.getenv("AES_ENCRYPTION_KEY"); private static final Map<String, String> decryptCache = new ConcurrentHashMap<>(); private static final Map<String, String> encryptCache = new ConcurrentHashMap<>(); - - private PeCryptoUtils() {} + private PeCryptoUtils() { + } /** * Inits the aes key. @@ -65,19 +62,10 @@ public class PeCryptoUtils { * @return The encrypted String */ public static String encrypt(String value) { - if (cryptoUtils == null || StringUtils.isBlank(value)) { return value; } - - return encryptCache.computeIfAbsent(value, k -> { - try { - return cryptoUtils.encrypt(k); - } catch (GeneralSecurityException e) { - logger.error("Could not decrypt value - exception: ", e); - return value; - } - }); + return encryptCache.computeIfAbsent(value, cryptoUtils::encrypt); } /** @@ -90,13 +78,6 @@ public class PeCryptoUtils { if (cryptoUtils == null || StringUtils.isBlank(value)) { return value; } - return decryptCache.computeIfAbsent(value, k -> { - try { - return cryptoUtils.decrypt(k); - } catch (GeneralSecurityException e) { - logger.error("Could not decrypt value - exception: ", e); - return value; - } - }); + return decryptCache.computeIfAbsent(value, cryptoUtils::decrypt); } } |