From 8ac4d430c6e5eb6f7a468cf7c8a83a4905bff4ba Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 26 Apr 2024 16:27:15 +0200 Subject: Update oparent in model-loader - update oparent from 2.1.0 to latest 3.3.3 - remove: - org.json - jetty-security - jline dependencies as they are not used anywhere Issue-ID: AAI-3837 Change-Id: Id39dac0dfbb3a56568f43816035f06c29148d15c Signed-off-by: Fiete Ostkamp --- .../java/org/onap/aai/modelloader/entity/model/ModelSorter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java index 4c39975..22367c6 100644 --- a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java @@ -29,7 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import jline.internal.Log; + +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.modelloader.entity.Artifact; /** @@ -39,6 +41,8 @@ import org.onap.aai.modelloader.entity.Artifact; */ public class ModelSorter { + private static Logger logger = LoggerFactory.getInstance().getLogger(ModelSorter.class); + /** * Wraps a Model object to form dependencies other Models using Edges. */ @@ -168,7 +172,7 @@ public class ModelSorter { // create node AbstractModelArtifact referencedModel = versionIdToModelMap.get(referencedModelId); if (referencedModel == null) { - Log.debug("ignoring " + referencedModelId); + logger.debug("ignoring " + referencedModelId); continue; // referenced model not supplied, no need to sort it } referencedNode = new Node(referencedModel); -- cgit 1.2.3-korg