Code style fixes, add missing headers and replace legacy names

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

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/FulgoraGraphComputer.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.olap.computer;
 
 import com.google.common.base.Function;

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

@@ -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/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-hadoop-parent/janusgraph-hadoop-2/pom.xml

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-server</artifactId>
-            <version>${hbase098.version}</version>	    	    
+            <version>${hbase098.version}</version>
             <optional>true</optional>
             <scope>test</scope>
             <exclusions>

janusgraph-hadoop-parent/janusgraph-hadoop/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>janusgraph-hadoop-core</artifactId>
-            <version>${project.version}</version>	    	    
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>