Update Janusgraph to 1.0.0

- update Janusgraph (0.6.4 -> 1.0.0)
- update Tinkerpop (3.5.8 -> 3.7.1)

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

4 files changed, 11 insertions, 13 deletions

diff --git a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
index 2703bdc4..9451e32e 100644
--- a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
+++ b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
@@ -35,7 +35,6 @@ public abstract class AaiCallable<T> implements Callable<T> {
     /**
      * The constructor.
      */
-    @SuppressWarnings("unchecked")
     public AaiCallable() {
         mdcCopy = MDC.getCopyOfContextMap();
     }
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java
index 6430df50..055a70e3 100644
--- a/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java
@@ -26,12 +26,10 @@ import com.google.common.collect.Multimap;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -49,10 +47,10 @@ import org.janusgraph.core.PropertyKey;
 import org.janusgraph.core.schema.ConsistencyModifier;
 import org.janusgraph.core.schema.JanusGraphIndex;
 import org.janusgraph.core.schema.JanusGraphManagement;
-import org.janusgraph.core.schema.JanusGraphManagement.IndexJobFuture;
 import org.janusgraph.core.schema.RelationTypeIndex;
 import org.janusgraph.core.schema.SchemaAction;
 import org.janusgraph.core.schema.SchemaStatus;
+import org.janusgraph.diskstorage.keycolumnvalue.scan.ScanJobFuture;
 import org.janusgraph.graphdb.database.StandardJanusGraph;
 import org.janusgraph.graphdb.database.management.ManagementSystem;
 import org.janusgraph.graphdb.database.management.RelationIndexStatusReport;
@@ -109,7 +107,7 @@ public class SchemaGenerator {
 
         final Map<String, Introspector> objs = LoaderUtil.getLatestVersion().getAllObjects();
         final Map<String, PropertyKey> seenProps = new HashMap<>();
-        
+
         for (Introspector obj : objs.values()) {
             createSchemaForObject(graphMgmt, seenProps, obj);
         }
@@ -340,7 +338,7 @@ public class SchemaGenerator {
     private static void awaitRelationIndexStatus(JanusGraph graph, Collection<String> labels, SchemaStatus newStatus) {
         LOGGER.info("Awaiting index status [{}]", newStatus);;
         CompletableFuture<RelationIndexStatusReport>[] awaits = labels.stream()
-            .map(label -> 
+            .map(label ->
                 CompletableFuture.supplyAsync(() -> {
                     try {
                         return ManagementSystem
@@ -365,8 +363,8 @@ public class SchemaGenerator {
     private static void updateRelationIndexes(JanusGraph graph, Collection<String> labels, SchemaAction updateAction) {
         JanusGraphManagement graphMgmt = graph.openManagement();
 
-        CompletableFuture<IndexJobFuture>[] awaits = labels.stream()
-            .map(label -> 
+        CompletableFuture<ScanJobFuture>[] awaits = labels.stream()
+            .map(label ->
                 CompletableFuture.supplyAsync(() -> {
                     EdgeLabel relation = graphMgmt.getEdgeLabel(label);
                     RelationTypeIndex index = graphMgmt.getRelationIndex(relation, label);
@@ -398,7 +396,7 @@ public class SchemaGenerator {
                 LOGGER.debug("Closing open transaction [{}] before schema generation", transaction.toString());
                 transaction.rollback();
         });
-        
+
         final JanusGraphManagement graphMgtForClosing = graph.openManagement();
 
         Set<String> instances = graphMgtForClosing.getOpenInstances();
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
index 10f5cbaf..4ea0c074 100644
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
@@ -30,10 +30,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyTranslator;
+import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
@@ -519,7 +520,7 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> {
     @Override
     public QueryBuilder<E> store(String name) {
 
-        this.traversal.store(name);
+        this.traversal.aggregate(Scope.local , name);
         stepIndex++;
 
         return this;
@@ -1028,7 +1029,7 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> {
        try {
            return mapPaginationResult((Map<String,Object>) completeTraversal.next());
        // .next() will throw an IllegalArguementException if there are no vertices of the given type
-       } catch (IllegalArgumentException e) {
+       } catch (NoSuchElementException | IllegalArgumentException e) {
            return new PaginationResult<>(Collections.emptyList(), 0L);
        }
     }
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
index 89970e24..9c7c4a44 100644
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
@@ -54,7 +54,7 @@ public class GraphSON implements FormatMapper {
     private static final GraphSONVersion version = GraphSONVersion.V1_0;
 
     private final GraphSONMapper mapper =
-            GraphSONMapper.build().version(version).addRegistry(JanusGraphIoRegistry.getInstance()).create();
+            GraphSONMapper.build().version(version).addRegistry(JanusGraphIoRegistry.instance()).create();
     private final GraphSONWriter writer = GraphSONWriter.build().mapper(mapper).create();
 
     @Override