You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/12/10 12:08:56 UTC

[tinkerpop] 01/01: Revert "uses the directly field instead of getter method (#1001)"

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch revert-1001-access_field_instead_getter_method
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 96e47d2ed15d42a850fec40b2bbe32b7f565a40e
Author: stephen mallette <sp...@users.noreply.github.com>
AuthorDate: Mon Dec 10 12:08:49 2018 +0000

    Revert "uses the directly field instead of getter method (#1001)"
    
    This reverts commit a4098503f3180f1def2969d9bcfae5e6454943e2.
---
 .../gremlin/jsr223/AbstractGremlinScriptEngineFactory.java |  4 ++--
 .../gremlin/jsr223/DefaultGremlinScriptEngineManager.java  |  2 +-
 .../tinkerpop/gremlin/process/computer/GraphFilter.java    |  4 ++--
 .../computer/bulkloading/IncrementalBulkLoader.java        |  4 ++--
 .../computer/traversal/MemoryTraversalSideEffects.java     |  2 +-
 .../gremlin/process/computer/util/ComputerGraph.java       |  4 ++--
 .../org/apache/tinkerpop/gremlin/process/traversal/P.java  |  4 ++--
 .../process/traversal/dsl/graph/GraphTraversalSource.java  |  4 ++--
 .../gremlin/process/traversal/step/branch/RepeatStep.java  |  2 +-
 .../gremlin/process/traversal/step/map/GraphStep.java      |  2 +-
 .../process/traversal/step/util/ReducingBarrierStep.java   |  2 +-
 .../gremlin/process/traversal/util/DefaultTraversal.java   |  8 ++++----
 .../gremlin/structure/io/graphml/GraphMLWriterHelper.java  |  2 +-
 .../io/graphson/AbstractGraphSONTypeSerializer.java        |  2 +-
 .../gremlin/structure/io/graphson/GraphSONMapper.java      |  2 +-
 .../structure/io/graphson/GraphSONTypeIdResolver.java      | 14 +++++++-------
 .../org/apache/tinkerpop/gremlin/util/function/Lambda.java |  2 +-
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index 9161958..69f4f73 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -89,13 +89,13 @@ public abstract class AbstractGremlinScriptEngineFactory implements GremlinScrip
     @Override
     public Object getParameter(final String key) {
         if (key.equals(ScriptEngine.ENGINE)) {
-            return engineName;
+            return this.getEngineName();
         } else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
             return this.getEngineVersion();
         } else if (key.equals(ScriptEngine.NAME)) {
             return engineName;
         } else if (key.equals(ScriptEngine.LANGUAGE)) {
-            return languageName;
+            return this.getLanguageName();
         } else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
             return this.getLanguageVersion();
         } else
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultGremlinScriptEngineManager.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultGremlinScriptEngineManager.java
index 98753cf..e485c05 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultGremlinScriptEngineManager.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultGremlinScriptEngineManager.java
@@ -428,7 +428,7 @@ public class DefaultGremlinScriptEngineManager implements GremlinScriptEngineMan
 
                     globalScope.put(kv.getKey(), kv.getValue());
                 });
-        engine.setBindings(globalScope, ScriptContext.GLOBAL_SCOPE);
+        engine.setBindings(getBindings(), ScriptContext.GLOBAL_SCOPE);
 
         // merge in bindings that are marked with engine scope. there typically won't be any of these but it's just
         // here for completeness. bindings will typically apply with global scope only as engine scope will generally
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
index 2f01dcf..65d74d2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
@@ -319,9 +319,9 @@ public final class GraphFilter implements Cloneable, Serializable {
     public boolean equals(final Object object) {
         if (!(object instanceof GraphFilter))
             return false;
-        else if (((GraphFilter) object).hasVertexFilter() && !((GraphFilter) object).vertexFilter.equals(this.vertexFilter))
+        else if (((GraphFilter) object).hasVertexFilter() && !((GraphFilter) object).getVertexFilter().equals(this.vertexFilter))
             return false;
-        else if (((GraphFilter) object).hasEdgeFilter() && !((GraphFilter) object).edgeFilter.equals(this.edgeFilter))
+        else if (((GraphFilter) object).hasEdgeFilter() && !((GraphFilter) object).getEdgeFilter().equals(this.edgeFilter))
             return false;
         else
             return true;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
index 5713773..22c6999 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
@@ -49,12 +49,12 @@ public class IncrementalBulkLoader implements BulkLoader {
     public Vertex getOrCreateVertex(final Vertex vertex, final Graph graph, final GraphTraversalSource g) {
         final Iterator<Vertex> iterator = useUserSuppliedIds()
                 ? g.V().hasId(vertex.id())
-                : g.V().has(vertex.label(), bulkLoaderVertexId, vertex.id().toString());
+                : g.V().has(vertex.label(), getVertexIdProperty(), vertex.id().toString());
         return iterator.hasNext()
                 ? iterator.next()
                 : useUserSuppliedIds()
                 ? g.addV(vertex.label()).property(T.id, vertex.id()).next()
-                : g.addV(vertex.label()).property(bulkLoaderVertexId, vertex.id().toString()).next();
+                : g.addV(vertex.label()).property(getVertexIdProperty(), vertex.id().toString()).next();
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
index fa4659c..ed16fc9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
@@ -166,7 +166,7 @@ public final class MemoryTraversalSideEffects implements TraversalSideEffects {
         final Set<MemoryComputeKey> keys = new HashSet<>();
         final TraversalSideEffects sideEffects =
                 traversal.getSideEffects() instanceof MemoryTraversalSideEffects ?
-                        ((MemoryTraversalSideEffects) traversal.getSideEffects()).sideEffects :
+                        ((MemoryTraversalSideEffects) traversal.getSideEffects()).getSideEffects() :
                         traversal.getSideEffects();
         sideEffects.keys().
                 stream().
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerGraph.java
index 2e4082c..31438c3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerGraph.java
@@ -62,11 +62,11 @@ public final class ComputerGraph implements Graph {
     }
 
     public static ComputerVertex vertexProgram(final Vertex starVertex, VertexProgram vertexProgram) {
-        return new ComputerGraph(State.VERTEX_PROGRAM, starVertex, Optional.of(vertexProgram)).starVertex;
+        return new ComputerGraph(State.VERTEX_PROGRAM, starVertex, Optional.of(vertexProgram)).getStarVertex();
     }
 
     public static ComputerVertex mapReduce(final Vertex starVertex) {
-        return new ComputerGraph(State.MAP_REDUCE, starVertex, Optional.empty()).starVertex;
+        return new ComputerGraph(State.MAP_REDUCE, starVertex, Optional.empty()).getStarVertex();
     }
 
     public ComputerVertex getStarVertex() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index b6960aa..8454f33 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -84,8 +84,8 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
     public boolean equals(final Object other) {
         return other instanceof P &&
                 ((P) other).getClass().equals(this.getClass()) &&
-                ((P) other).biPredicate.equals(this.biPredicate) &&
-                ((((P) other).originalValue == null && this.originalValue == null) || ((P) other).originalValue.equals(this.originalValue));
+                ((P) other).getBiPredicate().equals(this.biPredicate) &&
+                ((((P) other).getOriginalValue() == null && this.originalValue == null) || ((P) other).getOriginalValue().equals(this.originalValue));
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index e0f0857..0b2398f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -281,14 +281,14 @@ public class GraphTraversalSource implements TraversalSource {
         if (useBulk)
             return this;
         final GraphTraversalSource clone = this.clone();
-        RequirementsStrategy.addRequirements(clone.strategies, TraverserRequirement.ONE_BULK);
+        RequirementsStrategy.addRequirements(clone.getStrategies(), TraverserRequirement.ONE_BULK);
         clone.bytecode.addSource(Symbols.withBulk, useBulk);
         return clone;
     }
 
     public GraphTraversalSource withPath() {
         final GraphTraversalSource clone = this.clone();
-        RequirementsStrategy.addRequirements(clone.strategies, TraverserRequirement.PATH);
+        RequirementsStrategy.addRequirements(clone.getStrategies(), TraverserRequirement.PATH);
         clone.bytecode.addSource(Symbols.withPath);
         return clone;
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
index 955dacb..f62b22c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
@@ -253,7 +253,7 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
     public static <A, B, C extends Traversal<A, B>> C addRepeatToTraversal(final C traversal, final String loopName, final Traversal.Admin<B, B> repeatTraversal) {
         addRepeatToTraversal(traversal, repeatTraversal);
         final Step<?, B> step = traversal.asAdmin().getEndStep();
-        ((RepeatStep) step).loopName = loopName;
+        ((RepeatStep) step).setLoopName(loopName);
         return traversal;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index c7ca542..345eb42 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -93,7 +93,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
     }
 
     public static boolean isStartStep(final Step<?, ?> step) {
-        return step instanceof GraphStep && ((GraphStep) step).isStart;
+        return step instanceof GraphStep && ((GraphStep) step).isStartStep();
     }
 
     public boolean returnsVertex() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
index 26e87db..62e12f8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
@@ -127,7 +127,7 @@ public abstract class ReducingBarrierStep<S, E> extends AbstractStep<S, E> imple
 
     @Override
     public MemoryComputeKey<E> getMemoryComputeKey() {
-        return MemoryComputeKey.of(this.getId(), this.reducingBiOperator, false, true);
+        return MemoryComputeKey.of(this.getId(), this.getBiOperator(), false, true);
     }
 
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index ecebef7..6e805bc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -137,7 +137,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
         }
         this.finalEndStep = this.getEndStep();
         // finalize requirements
-        if (this.parent instanceof EmptyStep) {
+        if (this.getParent() instanceof EmptyStep) {
             this.requirements = null;
             this.getTraverserRequirements();
         }
@@ -149,14 +149,14 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
         if (null == this.requirements) {
             // if (!this.locked) this.applyStrategies();
             this.requirements = EnumSet.noneOf(TraverserRequirement.class);
-            for (final Step<?, ?> step : this.unmodifiableSteps) {
+            for (final Step<?, ?> step : this.getSteps()) {
                 this.requirements.addAll(step.getRequirements());
             }
             if (!this.requirements.contains(TraverserRequirement.LABELED_PATH) && TraversalHelper.hasLabels(this))
                 this.requirements.add(TraverserRequirement.LABELED_PATH);
-            if (!this.sideEffects.keys().isEmpty())
+            if (!this.getSideEffects().keys().isEmpty())
                 this.requirements.add(TraverserRequirement.SIDE_EFFECTS);
-            if (null != this.sideEffects.getSackInitialValue())
+            if (null != this.getSideEffects().getSackInitialValue())
                 this.requirements.add(TraverserRequirement.SACK);
             if (this.requirements.contains(TraverserRequirement.ONE_BULK))
                 this.requirements.remove(TraverserRequirement.BULK);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
index 13b7d26..60ece3d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
@@ -220,7 +220,7 @@ final class GraphMLWriterHelper {
             StringBuilder s = new StringBuilder();
             for (; indentStep > 0; indentStep--)
                 s.append(' ');
-            this.indentStep = s.toString();
+            setIndentStep(s.toString());
         }
 
         public void setIndentStep(String s) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
index 7134d05..fa90b2c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
@@ -82,7 +82,7 @@ public abstract class AbstractGraphSONTypeSerializer extends TypeSerializer {
 
     protected void writeTypePrefix(final JsonGenerator jsonGenerator, final String s) throws IOException {
         jsonGenerator.writeStartObject();
-        jsonGenerator.writeStringField(propertyName, s);
+        jsonGenerator.writeStringField(this.getPropertyName(), s);
         jsonGenerator.writeFieldName(this.valuePropertyName);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 30112f9..b553271 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -100,7 +100,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
         if (version == GraphSONVersion.V3_0 || (version == GraphSONVersion.V2_0 && typeInfo != TypeInfo.NO_TYPES)) {
             final GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
             final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder(version)
-                    .typesEmbedding(this.typeInfo)
+                    .typesEmbedding(getTypeInfo())
                     .valuePropertyName(GraphSONTokens.VALUEPROP)
                     .init(JsonTypeInfo.Id.CUSTOM, graphSONTypeIdResolver)
                     .typeProperty(GraphSONTokens.VALUETYPE);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
index 06f2b2a..db2ef5c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
@@ -57,11 +57,11 @@ public class GraphSONTypeIdResolver implements TypeIdResolver {
             // and for which creating a default type is failing because it may fall into a
             // a self-referencing never-ending loop. Temporarily we force Tree<Element>
             // which should cover all the usage TinkerPop would do of the Trees anyway.
-            idToType.put(name, TypeFactory.defaultInstance().constructType(new TypeReference<Tree<? extends Element>>() {}));
+            getIdToType().put(name, TypeFactory.defaultInstance().constructType(new TypeReference<Tree<? extends Element>>() {}));
         } else {
-            idToType.put(name, TypeFactory.defaultInstance().constructType(clasz));
+            getIdToType().put(name, TypeFactory.defaultInstance().constructType(clasz));
         }
-        typeToId.put(clasz, name);
+        getTypeToId().put(clasz, name);
         return this;
     }
 
@@ -76,13 +76,13 @@ public class GraphSONTypeIdResolver implements TypeIdResolver {
 
     @Override
     public String idFromValueAndType(final Object o, final Class<?> aClass) {
-        if (!typeToId.containsKey(aClass)) {
+        if (!getTypeToId().containsKey(aClass)) {
             // If one wants to serialize an object with a type, but hasn't registered
             // a typeID for that class, fail.
             throw new IllegalArgumentException(String.format("Could not find a type identifier for the class : %s. " +
                     "Make sure the value to serialize has a type identifier registered for its class.", aClass));
         } else {
-            return typeToId.get(aClass);
+            return getTypeToId().get(aClass);
         }
     }
 
@@ -94,8 +94,8 @@ public class GraphSONTypeIdResolver implements TypeIdResolver {
     @Override
     public JavaType typeFromId(final DatabindContext databindContext, final String s) {
         // Get the type from the string from the stored Map. If not found, default to deserialize as a String.
-        return idToType.containsKey(s)
-                ? idToType.get(s)
+        return getIdToType().containsKey(s)
+                ? getIdToType().get(s)
                 // TODO: shouldn't we fail instead, if the type is not found? Or log something?
                 : databindContext.constructType(String.class);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
index 66c27a3..1031156 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
@@ -77,7 +77,7 @@ public interface Lambda extends Serializable {
         @Override
         public boolean equals(final Object object) {
             return object instanceof Lambda &&
-                    ((Lambda) object).getLambdaArguments() == this.lambdaArguments &&
+                    ((Lambda) object).getLambdaArguments() == this.getLambdaArguments() &&
                     ((Lambda) object).getLambdaScript().equals(this.lambdaSource) &&
                     ((Lambda) object).getLambdaLanguage().equals(this.lambdaLanguage);
         }