Cleanup after tinkerpop-upgrade merge. Code style fixes, add missing …

…headers and replace legacy names.

Signed-off-by: sjudeng <[email protected]>

janusgraph-berkeleyje/src/test/java/org/janusgraph/blueprints/BerkeleyGraphComputerProvider.java

@@ -33,7 +33,8 @@ public class BerkeleyGraphComputerProvider extends AbstractJanusGraphComputerPro
 
     @Override
     public ModifiableConfiguration getJanusGraphConfiguration(String graphName, Class<?> test, String testMethodName) {
-        ModifiableConfiguration config = BerkeleyStorageSetup.getBerkeleyJEConfiguration(StorageSetup.getHomeDir(graphName));
+        ModifiableConfiguration config = super.getJanusGraphConfiguration(graphName, test, testMethodName);
+        config.setAll(BerkeleyStorageSetup.getBerkeleyJEConfiguration(StorageSetup.getHomeDir(graphName)).getAll());
         config.set(GraphDatabaseConfiguration.IDAUTHORITY_WAIT, Duration.ofMillis(20));
         config.set(GraphDatabaseConfiguration.STORAGE_TRANSACTIONAL,false);
         return config;

janusgraph-cassandra/src/test/java/org/janusgraph/blueprints/thrift/ThriftGraphComputerProvider.java

@@ -30,7 +30,9 @@ public class ThriftGraphComputerProvider extends AbstractJanusGraphComputerProvi
     @Override
     public ModifiableConfiguration getJanusGraphConfiguration(String graphName, Class<?> test, String testMethodName) {
         CassandraStorageSetup.startCleanEmbedded();
-        return CassandraStorageSetup.getCassandraThriftConfiguration(graphName);
+        ModifiableConfiguration config = super.getJanusGraphConfiguration(graphName, test, testMethodName);
+        config.setAll(CassandraStorageSetup.getCassandraThriftConfiguration(graphName).getAll());
+        return config;
     }
 
 }

janusgraph-core/src/main/java/org/janusgraph/core/JanusGraph.java

@@ -55,11 +55,13 @@
 @Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.structure.io.IoTest$GraphMLTest",
         method = "shouldReadGraphMLWithNoEdgeLabels",
-        reason = "Titan does not support default edge label (edge) used when GraphML is missing edge labels.")
+        reason = "JanusGraph does not support default edge label (edge) used when GraphML is missing edge labels.")
 @Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
         method = "shouldSupportGraphFilter",
-        reason = "Titan currently does not support graph filters but does not throw proper exception because doing so breaks numerous tests in gremlin-test ProcessComputerSuite.")
+        reason = "JanusGraph test graph computer (FulgoraGraphComputer} " +
+            "currently does not support graph filters but does not throw proper exception because doing so breaks numerous " +
+            "tests in gremlin-test ProcessComputerSuite.")
 public interface JanusGraph extends Transaction {
 
    /* ---------------------------------------------------------------

janusgraph-core/src/main/java/org/janusgraph/graphdb/database/serialize/attribute/SerializableSerializer.java

@@ -1,3 +1,17 @@
+// Copyright 2017 JanusGraph Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.janusgraph.graphdb.database.serialize.attribute;
 
 import org.janusgraph.core.attribute.AttributeSerializer;
@@ -11,6 +25,10 @@
 import java.io.Serializable;
 import java.util.HashMap;
 
+/**
+ * Serializes {@link Serializable} objects.
+ * @param <T> Serializable type
+ */
 public class SerializableSerializer<T extends Serializable> implements AttributeSerializer<T>, SerializerInjected {
 
     private Serializer serializer;

janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/FulgoraMemory.java

@@ -158,9 +158,7 @@ protected void attachReferenceElements(Graph graph) {
     }
 
     private static void attachReferenceElements(TraverserSet<Object> toProcessTraversers, Graph graph) {
-        final Iterator<Traverser.Admin<Object>> traversers = toProcessTraversers.iterator();
-        while (traversers.hasNext()) {
-            final Traverser.Admin<Object> traverser = traversers.next();
+        toProcessTraversers.stream().forEach(traverser -> {
             Object value = traverser.get();
             if (value instanceof ReferenceVertex) {
                 Vertex vertex = ((ReferenceVertex) value).attach(Attachable.Method.get(graph));
@@ -169,7 +167,7 @@ private static void attachReferenceElements(TraverserSet<Object> toProcessTraver
                 Edge edge = ((ReferenceEdge) value).attach(Attachable.Method.get(graph));
                 traverser.set(edge);
             }
-        }
+        });
     }
 
 }

janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/VertexMemoryHandler.java

@@ -41,7 +41,7 @@ class VertexMemoryHandler<M> implements PreloadedVertex.PropertyMixing, Messenge
     protected final FulgoraVertexMemory<M> vertexMemory;
     private final PreloadedVertex vertex;
     protected final long vertexId;
-    private boolean inExecute;
+    private volatile boolean inExecute;
 
     VertexMemoryHandler(FulgoraVertexMemory<M> vertexMemory, PreloadedVertex vertex) {
         assert vertex!=null && vertexMemory!=null;
@@ -67,7 +67,7 @@ public <V> Iterator<VertexProperty<V>> properties(String... keys) {
         if (keys==null || keys.length==0) {
             keys = memoryKeys.stream().filter(k -> !k.equals(TraversalVertexProgram.HALTED_TRAVERSERS)).toArray(String[]::new);
         }
-        List<VertexProperty<V>> result = new ArrayList<>(Math.min(keys.length,memoryKeys.size()));
+        final List<VertexProperty<V>> result = new ArrayList<>(Math.min(keys.length,memoryKeys.size()));
         for (String key : keys) {
             if (!supports(key)) continue;
             V value = vertexMemory.getProperty(vertexId,key);

janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/JanusGraphBlueprintsTransaction.java

@@ -78,14 +78,14 @@ public <I extends Io> I io(final Io.Builder<I> builder) {
 
     @Override
     public <C extends GraphComputer> C compute(Class<C> graphComputerClass) throws IllegalArgumentException {
-        TitanBlueprintsGraph graph = getGraph();
+        JanusGraphBlueprintsGraph graph = getGraph();
         if (isOpen()) commit();
         return graph.compute(graphComputerClass);
     }
 
     @Override
     public FulgoraGraphComputer compute() throws IllegalArgumentException {
-        TitanBlueprintsGraph graph = getGraph();
+        JanusGraphBlueprintsGraph graph = getGraph();
         if (isOpen()) commit();
         return graph.compute();
     }

janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/io/graphson/JanusGraphSONModule.java

@@ -39,7 +39,7 @@
  */
 public class JanusGraphSONModule extends TinkerPopJacksonModule {
 
-    private static final String TYPE_NAMESPACE = "titan";
+    private static final String TYPE_NAMESPACE = "janusgraph";
 
     private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
             new LinkedHashMap<Class, String>() {{
@@ -48,7 +48,7 @@ public class JanusGraphSONModule extends TinkerPopJacksonModule {
             }});
 
     private JanusGraphSONModule() {
-        super("titan");
+        super("janusgraph");
         addSerializer(RelationIdentifier.class, new RelationIdentifierSerializer());
         addSerializer(Geoshape.class, new Geoshape.GeoshapeGsonSerializer());
 

janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/optimize/JanusGraphLocalQueryOptimizerStrategy.java

@@ -50,8 +50,8 @@ public void apply(final Traversal.Admin<?, ?> traversal) {
         Graph graph = traversal.getGraph().get();
 
         //If this is a compute graph then we can't apply local traversal optimisation at this stage.
-        StandardJanusGraph titanGraph = graph instanceof StandardJanusGraphTx ? ((StandardJanusGraphTx) graph).getGraph() : (StandardJanusGraph) graph;
-        final boolean useMultiQuery = !TraversalHelper.onGraphComputer(traversal) && titanGraph.getConfiguration().useMultiQuery();
+        StandardJanusGraph janusGraph = graph instanceof StandardJanusGraphTx ? ((StandardJanusGraphTx) graph).getGraph() : (StandardJanusGraph) graph;
+        final boolean useMultiQuery = !TraversalHelper.onGraphComputer(traversal) && janusGraph.getConfiguration().useMultiQuery();
 
         /*
                 ====== VERTEX STEP ======

janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/optimize/JanusGraphStep.java

@@ -100,7 +100,7 @@ public List<HasContainer> getHasContainers() {
 
     @Override
     public void addHasContainer(final HasContainer hasContainer) {
-	this.addAll(Collections.singleton(hasContainer));
+        this.addAll(Collections.singleton(hasContainer));
     }
 }
 

janusgraph-core/src/main/java/org/janusgraph/graphdb/tinkerpop/optimize/JanusGraphStepStrategy.java

@@ -44,11 +44,11 @@ public void apply(final Traversal.Admin<?, ?> traversal) {
         TraversalHelper.getStepsOfClass(GraphStep.class, traversal).forEach(originalGraphStep -> {
             if (originalGraphStep.getIds() == null || originalGraphStep.getIds().length == 0) {
                 //Try to optimize for index calls
-                final JanusGraphStep<?, ?> titanGraphStep = new JanusGraphStep<>(originalGraphStep);
-                TraversalHelper.replaceStep(originalGraphStep, (Step) titanGraphStep, traversal);
-                HasStepFolder.foldInHasContainer(titanGraphStep, traversal);
-                HasStepFolder.foldInOrder(titanGraphStep, traversal, traversal, titanGraphStep.returnsVertex());
-                HasStepFolder.foldInRange(titanGraphStep, traversal);
+                final JanusGraphStep<?, ?> janusGraphStep = new JanusGraphStep<>(originalGraphStep);
+                TraversalHelper.replaceStep(originalGraphStep, (Step) janusGraphStep, traversal);
+                HasStepFolder.foldInHasContainer(janusGraphStep, traversal);
+                HasStepFolder.foldInOrder(janusGraphStep, traversal, traversal, janusGraphStep.returnsVertex());
+                HasStepFolder.foldInRange(janusGraphStep, traversal);
             } else {
                 //Make sure that any provided "start" elements are instantiated in the current transaction
                 Object[] ids = originalGraphStep.getIds();

janusgraph-hbase-parent/janusgraph-hbase-core/src/test/java/org/janusgraph/blueprints/HBaseGraphComputerProvider.java

@@ -31,7 +31,9 @@ public class HBaseGraphComputerProvider extends AbstractJanusGraphComputerProvid
 
     @Override
     public ModifiableConfiguration getJanusGraphConfiguration(String graphName, Class<?> test, String testMethodName) {
-        return HBaseStorageSetup.getHBaseConfiguration(graphName);
+        ModifiableConfiguration config = super.getJanusGraphConfiguration(graphName, test, testMethodName);
+        config.setAll(HBaseStorageSetup.getHBaseConfiguration(graphName).getAll());
+        return config;
     }
 
     @Override

janusgraph-test/src/main/java/org/janusgraph/blueprints/AbstractJanusGraphProvider.java

@@ -73,7 +73,7 @@
  */
 public abstract class AbstractJanusGraphProvider extends AbstractGraphProvider {
 
-    private static final Logger logger = LoggerFactory.getLogger(AbstractTitanGraphProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbstractJanusGraphProvider.class);
 
     private static final Set<Class> IMPLEMENTATION = new HashSet<Class>() {{
         add(StandardJanusGraph.class);

janusgraph-test/src/test/java/org/janusgraph/blueprints/InMemoryGraphComputerProvider.java

@@ -28,7 +28,8 @@ public class InMemoryGraphComputerProvider extends AbstractJanusGraphComputerPro
 
     @Override
     public ModifiableConfiguration getJanusGraphConfiguration(String graphName, Class<?> test, String testMethodName) {
-        ModifiableConfiguration config = StorageSetup.getInMemoryConfiguration();
+        ModifiableConfiguration config = super.getJanusGraphConfiguration(graphName, test, testMethodName);
+        config.setAll(StorageSetup.getInMemoryConfiguration().getAll());
         config.set(GraphDatabaseConfiguration.STORAGE_TRANSACTIONAL,false);
         return config;
     }