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 --- .../main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java | 5 +++-- .../main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'aai-schema-abstraction/src/main') diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java index e7ee4b47..78ae6a6d 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java @@ -28,11 +28,11 @@ import java.io.StringWriter; import java.util.Arrays; import java.util.HashSet; import java.util.Map; -import java.util.Scanner; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; + import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.schemaif.SchemaProvider; @@ -52,7 +52,8 @@ import org.springframework.web.client.RestTemplate; public class JsonSchemaProvider implements SchemaProvider { - Logger logger = LoggerFactory.getInstance().getLogger(JsonSchemaProvider.class.getName()); + // Logger logger = LoggerFactory.getInstance().getLogger(JsonSchemaProvider.class.getName()); + Logger logger = LoggerFactory.getInstance().getLogger(SchemaProvider.class); private JsonSchemaProviderConfig config; private Map schemaCache = new ConcurrentHashMap<>(); diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java index 39e7039f..93508fc5 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java @@ -20,7 +20,6 @@ */ package org.onap.aai.schemaif.oxm; -import com.google.common.collect.Multimap; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,7 +31,9 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import org.apache.commons.io.IOUtils; +import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.edges.EdgeRule; @@ -44,6 +45,8 @@ import org.onap.aai.setup.Translator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import com.google.common.collect.Multimap; + @Component public class OxmEdgeRulesLoader { @@ -60,7 +63,7 @@ public class OxmEdgeRulesLoader { final static Pattern propsFilePattern = Pattern.compile(propsPrefix + "(.*)" + propsSuffix); final static Pattern propsVersionPattern = Pattern.compile("(?i)v\\d*"); - private static org.onap.aai.cl.api.Logger logger = + private static Logger logger = LoggerFactory.getInstance().getLogger(OxmEdgeRulesLoader.class.getName()); private OxmEdgeRulesLoader() {} -- cgit 1.2.3-korg