diff options
author | Neil Derraugh <neil.derraugh@yoppworks.com> | 2020-05-20 23:59:37 -0400 |
---|---|---|
committer | Neil Derraugh <neil.derraugh@yoppworks.com> | 2020-05-31 12:48:38 -0400 |
commit | 95bdca4419af09c4eeab5562589ea6baf9a4490d (patch) | |
tree | a91c2e9869c3e9f4849026503703e33d80870aa0 /security-util-lib/src/main/java/org | |
parent | 74dc5044f00a113eef41b345390f8c266112b2d7 (diff) |
Upgrade Junit to 5.6
- Update @Before -> @BeforeEach, @After -> @AfterEach
- Update Mockito usage
- Update assertThrows so not to expect exceptions
Issue-ID: SDC-3078
Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com>
Change-Id: I0b1056698767c4b060e243bbda799253072b4b55
Diffstat (limited to 'security-util-lib/src/main/java/org')
-rw-r--r-- | security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java | 5 | ||||
-rw-r--r-- | security-util-lib/src/main/java/org/onap/sdc/security/utils/RestUtils.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java b/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java index eb67813..099ca0a 100644 --- a/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java +++ b/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java @@ -46,7 +46,6 @@ public class SecurityUtil { private static final Logger LOG = Logger.getLogger(SecurityUtil.class); - public static final SecurityUtil INSTANCE = new SecurityUtil(); public static final String ALGORITHM = "AES"; public static final String CHARSET = UTF_8.name(); @@ -69,7 +68,7 @@ public class SecurityUtil { } // obfuscates key prefix -> ********** - public String obfuscateKey(String sensitiveData) { + public static String obfuscateKey(String sensitiveData) { if (sensitiveData == null) { return null; @@ -176,7 +175,7 @@ public class SecurityUtil { return Either.right("Decrypt FAILED"); } - public Either<String, String> decrypt(String byteCipherText) { + public static Either<String, String> decrypt(String byteCipherText) { try { return decrypt(byteCipherText.getBytes(CHARSET), true); } catch (UnsupportedEncodingException e) { diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/utils/RestUtils.java b/security-util-lib/src/main/java/org/onap/sdc/security/utils/RestUtils.java index 2803720..5df9d8a 100644 --- a/security-util-lib/src/main/java/org/onap/sdc/security/utils/RestUtils.java +++ b/security-util-lib/src/main/java/org/onap/sdc/security/utils/RestUtils.java @@ -32,6 +32,8 @@ import java.util.Properties; public class RestUtils { + private RestUtils() {} + public static void addBasicAuthHeader(Properties headers, String username, String password) { headers.setProperty(HttpHeaders.AUTHORIZATION, getAuthHeaderValue(username,password)); } @@ -49,7 +51,7 @@ public class RestUtils { @VisibleForTesting public static String decryptPassword(String password) { validate(password); - Either<String, String> passkey = SecurityUtil.INSTANCE.decrypt(password); + Either<String, String> passkey = SecurityUtil.decrypt(password); if(passkey.isLeft()) { return passkey.left().value(); } |