diff options
Diffstat (limited to 'sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util')
3 files changed, 11 insertions, 17 deletions
diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/ConfigHelper.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/ConfigHelper.java index 9f43405..29436f0 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/ConfigHelper.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/ConfigHelper.java @@ -77,14 +77,12 @@ public class ConfigHelper { * @throws Exception the exception */ public static Properties loadConfig(String fileName) throws Exception { - String basePath = System.getProperty("user.dir"); - InputStream fileInputStream = new FileInputStream(basePath + "//" + fileName); - - Properties props = new Properties(); - props.load(fileInputStream); - - return props; + try (InputStream fileInputStream = new FileInputStream(basePath + "//" + fileName)) { + Properties props = new Properties(); + props.load(fileInputStream); + return props; + } } /** @@ -96,14 +94,11 @@ public class ConfigHelper { public static Properties loadConfigFromExplicitPath(String fileName) { Properties props = new Properties(); - - try { - InputStream fileInputStream = new FileInputStream(fileName); + try (InputStream fileInputStream = new FileInputStream(fileName)) { props.load(fileInputStream); } catch (Exception exc) { LOG.warn(AaiUiMsgs.CONFIG_NOT_FOUND_VERBOSE, fileName, exc.getLocalizedMessage()); } - return props; } diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/Encryptor.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/Encryptor.java index a239b36..5c09eab 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/Encryptor.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/Encryptor.java @@ -36,7 +36,7 @@ import org.onap.aai.sparky.logging.AaiUiMsgs; public class Encryptor { private static final Logger LOG = LoggerFactory.getInstance().getLogger(Encryptor.class); - private static final String PWD_OBFUSCATION_PATTERN = "OBF:"; + private static final String START_OBFUSCATION_PATTERN = "OBF:"; /** * Instantiates a new encryptor. @@ -69,7 +69,7 @@ public class Encryptor { public String decryptValue(String value) { String decyptedValue = ""; try { - decyptedValue = value.startsWith(PWD_OBFUSCATION_PATTERN)? Password.deobfuscate(value) : value; + decyptedValue = value.startsWith(START_OBFUSCATION_PATTERN)? Password.deobfuscate(value) : value; } catch (Exception exc) { LOG.error(AaiUiMsgs.DECRYPTION_ERROR, value, exc.toString()); } diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/NodeUtils.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/NodeUtils.java index 25aa8b4..cce4be8 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/NodeUtils.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/util/NodeUtils.java @@ -71,7 +71,7 @@ public class NodeUtils { private static SecureRandom sRandom = new SecureRandom(); private static final Pattern URL_VERSION_PREFIX = Pattern.compile("/v[0-9]+/(.*)"); - private static final Pattern OXM_VERSION_PREFIX = Pattern.compile(".*_v([0-9]+).*"); + private static final Pattern OXM_VERSION_PREFIX = Pattern.compile(".{0,256}_v([0-9]{1,5})[^_]*"); private static final Pattern GIZMO_VERSION_PREFIX = Pattern.compile("[/]*services/inventory/v[0-9]+/(.*)"); private static final Pattern GIZMO_RELATIONSHIP_VERSION_PREFIX = Pattern.compile("services/inventory/relationships/v[0-9]+/(.*)"); @@ -116,9 +116,8 @@ public class NodeUtils { return null; - } - - + } + public static String extractRawPathWithoutVersion(String selfLinkUri) { try { |