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 --- .../src/main/java/org/onap/aai/edges/EdgeRuleQuery.java | 10 +++++----- .../src/main/java/org/onap/aai/setup/ConfigTranslator.java | 11 +++++++---- .../java/org/onap/aai/validation/CheckEverythingStrategy.java | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'aai-schema-ingest/src/main/java') diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java index 8ecbe2a3..893ebad5 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java @@ -22,22 +22,22 @@ package org.onap.aai.edges; -import com.jayway.jsonpath.Criteria; -import com.jayway.jsonpath.Filter; -import com.jayway.jsonpath.Predicate; - import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.onap.aai.edges.enums.AAIDirection; import org.onap.aai.edges.enums.EdgeField; import org.onap.aai.edges.enums.EdgeProperty; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.setup.SchemaVersion; +import com.jayway.jsonpath.Criteria; +import com.jayway.jsonpath.Filter; +import com.jayway.jsonpath.Predicate; + /** * For querying the edge rules schema (not the database) * diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java index a62dd17b..e87a05cc 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java @@ -20,10 +20,11 @@ package org.onap.aai.setup; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; @@ -31,6 +32,8 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.onap.aai.edges.JsonIngestor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java index d16e3cc7..7cd0124a 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java @@ -27,7 +27,7 @@ package org.onap.aai.validation; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * When an error is found, mark that it is NOT ok to -- cgit 1.2.3-korg