diff options
Diffstat (limited to 'cmso-topology')
| -rw-r--r-- | cmso-topology/pom.xml | 8 | ||||
| -rw-r--r-- | cmso-topology/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml index 4809a93..19ea398 100644 --- a/cmso-topology/pom.xml +++ b/cmso-topology/pom.xml @@ -111,10 +111,6 @@ </dependency> --> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> </dependency> <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-mongodb</artifactId> @@ -136,10 +132,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> diff --git a/cmso-topology/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java b/cmso-topology/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java index 1993b82..fadad45 100644 --- a/cmso-topology/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java +++ b/cmso-topology/src/main/java/org/onap/optf/cmso/common/PropertiesManagement.java @@ -28,10 +28,10 @@ package org.onap.optf.cmso.common; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; +import java.util.Base64; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import org.apache.commons.codec.binary.Base64; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; @@ -98,7 +98,7 @@ public class PropertiesManagement { Cipher cipher = Cipher.getInstance(transformation); cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv); byte[] encrypted = cipher.doFinal(value.getBytes()); - return Base64.encodeBase64String(encrypted); + return Base64.getEncoder().encodeToString(encrypted); } catch (Exception ex) { errors.error("Unexpected exception {0}", ex.getMessage()); debug.debug("Unexpected exception", ex); @@ -113,7 +113,7 @@ public class PropertiesManagement { SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "AES"); Cipher cipher = Cipher.getInstance(transformation); cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv); - byte[] original = cipher.doFinal(Base64.decodeBase64(encrypted)); + byte[] original = cipher.doFinal(Base64.getDecoder().decode(encrypted)); return new String(original); } catch (Exception ex) { errors.error("Unexpected exception {0}", ex.getMessage()); |