diff options
| -rw-r--r-- | pom.xml | 17 | ||||
| -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 |
3 files changed, 7 insertions, 19 deletions
@@ -26,7 +26,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.1.0</version> + <version>3.3.3</version> <relativePath /> </parent> @@ -310,21 +310,6 @@ <version>${sdc-distribution-client.version}</version> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20131018</version> - <!--$NO-MVN-MAN-VER$ --> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>2.12.1</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> <version>${commons-compress.version}</version> 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; |