From d629b626036a1ef1bc37e2b9aa5b5d2fcad1be66 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 14 Oct 2022 09:30:31 +0000 Subject: Remove the apache commons-lang dependency in aai-common Issue-ID: AAI-3551 Signed-off-by: Fiete Ostkamp Change-Id: Ib68b6fb43044532abf39c1ac088ef969c5aa00c2 --- aai-rest/pom.xml | 4 ++++ .../restclient/PropertyPasswordConfiguration.java | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'aai-rest') diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 04328bcf..74b5431e 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -44,6 +44,10 @@ + + org.apache.commons + commons-lang3 + com.att.eelf eelf-core diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/PropertyPasswordConfiguration.java b/aai-rest/src/main/java/org/onap/aai/restclient/PropertyPasswordConfiguration.java index 29d9506f..47dd2f2d 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/PropertyPasswordConfiguration.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/PropertyPasswordConfiguration.java @@ -19,16 +19,6 @@ */ package org.onap.aai.restclient; -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.EnumerablePropertySource; -import org.springframework.core.env.MapPropertySource; -import org.springframework.core.env.PropertySource; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -39,6 +29,16 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.EnumerablePropertySource; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; + public class PropertyPasswordConfiguration implements ApplicationContextInitializer { private static final Pattern decodePasswordPattern = Pattern.compile("password\\((.*?)\\)"); -- cgit 1.2.3-korg