Use aai-common 1.15.4 in traversal

- use aai-common 1.15.4 that contains dependency updates
- remove jopt-simple dependency
- do not declare jnr-ffi as explicit dependency
  since it is only used transitively

Issue-ID: AAI-4095
Change-Id: I4260df8bd8f3da337d29d6ab82d29e4b75b57aa4
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 4c644e0..ebf1919 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.aai.traversal</groupId>
                <artifactId>traversal</artifactId>
-               <version>1.15.3-SNAPSHOT</version>
+               <version>1.15.4-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.aai.traversal</groupId>
        <artifactId>aai-traversal</artifactId>
@@ -39,8 +39,6 @@
                <maven.compiler.source>11</maven.compiler.source>
                <maven.compiler.target>11</maven.compiler.target>
 
-               <jopt.simple.version>4.9</jopt.simple.version>
-
                <!-- End of the jacoco plugin properties -->
 
                <!-- Default docker registry that maven fabric plugin will try to pull
@@ -91,8 +89,8 @@
                <schema.uri.base.path>/aai</schema.uri.base.path>
 
                <!-- versions -->
-               <janusgraph.version>1.0.0</janusgraph.version>
-               <gremlin.version>3.7.1</gremlin.version>
+               <!-- <janusgraph.version>1.0.0</janusgraph.version>
+               <gremlin.version>3.7.1</gremlin.version> -->
 
                <spring-cloud.version>2021.0.9</spring-cloud.version>
 
@@ -318,11 +316,6 @@
                        <groupId>org.glassfish.jaxb</groupId>
                        <artifactId>jaxb-runtime</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>net.sf.jopt-simple</groupId>
-                       <artifactId>jopt-simple</artifactId>
-                       <version>${jopt.simple.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
@@ -372,10 +365,7 @@
                        <groupId>org.janusgraph</groupId>
                        <artifactId>janusgraph-inmemory</artifactId>
                        <version>${janusgraph.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.github.jnr</groupId>
-                       <artifactId>jnr-ffi</artifactId>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.tinkerpop</groupId>
@@ -404,10 +394,6 @@
                        <artifactId>org.eclipse.persistence.moxy</artifactId>
                        <scope>compile</scope>
                </dependency>
-               <dependency>
-                       <groupId>com.github.fge</groupId>
-                       <artifactId>json-patch</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.javatuples</groupId>
                        <artifactId>javatuples</artifactId>
@@ -428,27 +414,27 @@
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.aai</groupId>
-                    <artifactId>aai-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.eclipse.jetty</groupId>
+                                       <artifactId>jetty-http</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.eclipse.jetty</groupId>
+                                       <artifactId>jetty-server</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.springframework</groupId>
+                                       <artifactId>spring-web</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.onap.aai</groupId>
+                                       <artifactId>aai-logging</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>junit</groupId>
+                                       <artifactId>junit</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>

diff --git a/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java b/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java
index 24d5a83..77f2cd3 100644 (file)
--- a/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java
+++ b/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import joptsimple.internal.Objects;
-
 public class MapTraverser {
 
     private Converter converter;
@@ -36,7 +34,8 @@ public class MapTraverser {
 
     public Map<String, Object> convertKeys(Map<String, Object> map) {
 
-        Objects.ensureNotNull(map);
+        if (map == null)
+            throw new NullPointerException();
 
         Map<String, Object> modifiedMap = new HashMap<>();
         convertKeys(map, modifiedMap);

diff --git a/pom.xml b/pom.xml
index 62eb1e8..a675fab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3</version>
+        <version>1.15.4</version>
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
@@ -42,7 +42,7 @@
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
-        <aai.common.version>1.15.3</aai.common.version>
+        <aai.common.version>1.15.4</aai.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path>
         <release.path>/content/repositories/releases/</release.path>