diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java | 8 | ||||
-rw-r--r-- | src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java | 1 |
2 files changed, 6 insertions, 3 deletions
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); diff --git a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java index b16c8a0..7a630b5 100644 --- a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java @@ -22,7 +22,6 @@ package org.onap.aai.modelloader.entity.model; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; |