spmallette closed pull request #1014: uses the directly field instead of getter
method
URL: https://github.com/apache/tinkerpop/pull/1014
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 69f4f736e6..bab8a4193c 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 String getLanguageVersion() {
@Override
public Object getParameter(final String key) {
if (key.equals(ScriptEngine.ENGINE)) {
- return this.getEngineName();
+ return this.engineName;
} 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 this.getLanguageName();
+ return this.languageName;
} 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 e485c05589..98753cf18d 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 @@ private GremlinScriptEngine createGremlinScriptEngine(final
GremlinScriptEngineF
globalScope.put(kv.getKey(), kv.getValue());
});
- engine.setBindings(getBindings(), ScriptContext.GLOBAL_SCOPE);
+ engine.setBindings(globalScope, 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 65d74d2344..2f01dcf28a 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 int hashCode() {
public boolean equals(final Object object) {
if (!(object instanceof GraphFilter))
return false;
- else if (((GraphFilter) object).hasVertexFilter() && !((GraphFilter)
object).getVertexFilter().equals(this.vertexFilter))
+ else if (((GraphFilter) object).hasVertexFilter() && !((GraphFilter)
object).vertexFilter.equals(this.vertexFilter))
return false;
- else if (((GraphFilter) object).hasEdgeFilter() && !((GraphFilter)
object).getEdgeFilter().equals(this.edgeFilter))
+ else if (((GraphFilter) object).hasEdgeFilter() && !((GraphFilter)
object).edgeFilter.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 22c699923c..57137736b1 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 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(), getVertexIdProperty(),
vertex.id().toString());
+ : g.V().has(vertex.label(), bulkLoaderVertexId,
vertex.id().toString());
return iterator.hasNext()
? iterator.next()
: useUserSuppliedIds()
? g.addV(vertex.label()).property(T.id, vertex.id()).next()
- : g.addV(vertex.label()).property(getVertexIdProperty(),
vertex.id().toString()).next();
+ : g.addV(vertex.label()).property(bulkLoaderVertexId,
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 ed16fc944a..fa4659c325 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 static ProgramPhase getMemorySideEffectsPhase(final
Traversal.Admin<?, ?>
final Set<MemoryComputeKey> keys = new HashSet<>();
final TraversalSideEffects sideEffects =
traversal.getSideEffects() instanceof
MemoryTraversalSideEffects ?
- ((MemoryTraversalSideEffects)
traversal.getSideEffects()).getSideEffects() :
+ ((MemoryTraversalSideEffects)
traversal.getSideEffects()).sideEffects :
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 31438c3e91..2e4082cb78 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 @@ private ComputerGraph(final State state, final Vertex
starVertex, final Optional
}
public static ComputerVertex vertexProgram(final Vertex starVertex,
VertexProgram vertexProgram) {
- return new ComputerGraph(State.VERTEX_PROGRAM, starVertex,
Optional.of(vertexProgram)).getStarVertex();
+ return new ComputerGraph(State.VERTEX_PROGRAM, starVertex,
Optional.of(vertexProgram)).starVertex;
}
public static ComputerVertex mapReduce(final Vertex starVertex) {
- return new ComputerGraph(State.MAP_REDUCE, starVertex,
Optional.empty()).getStarVertex();
+ return new ComputerGraph(State.MAP_REDUCE, starVertex,
Optional.empty()).starVertex;
}
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 8454f33342..b6960aabbf 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 int hashCode() {
public boolean equals(final Object other) {
return other instanceof P &&
((P) other).getClass().equals(this.getClass()) &&
- ((P) other).getBiPredicate().equals(this.biPredicate) &&
- ((((P) other).getOriginalValue() == null && this.originalValue
== null) || ((P) other).getOriginalValue().equals(this.originalValue));
+ ((P) other).biPredicate.equals(this.biPredicate) &&
+ ((((P) other).originalValue == null && this.originalValue ==
null) || ((P) other).originalValue.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 35cdd771f3..aece7e6266 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
@@ -258,14 +258,14 @@ public GraphTraversalSource withBulk(final boolean
useBulk) {
if (useBulk)
return this;
final GraphTraversalSource clone = this.clone();
- RequirementsStrategy.addRequirements(clone.getStrategies(),
TraverserRequirement.ONE_BULK);
+ RequirementsStrategy.addRequirements(clone.strategies,
TraverserRequirement.ONE_BULK);
clone.bytecode.addSource(Symbols.withBulk, useBulk);
return clone;
}
public GraphTraversalSource withPath() {
final GraphTraversalSource clone = this.clone();
- RequirementsStrategy.addRequirements(clone.getStrategies(),
TraverserRequirement.PATH);
+ RequirementsStrategy.addRequirements(clone.strategies,
TraverserRequirement.PATH);
clone.bytecode.addSource(Symbols.withPath);
return clone;
}
@@ -310,7 +310,7 @@ public GraphTraversalSource withRemote(final
RemoteConnection connection) {
final GraphTraversalSource clone = this.clone();
clone.connection = connection;
- clone.getStrategies().addStrategies(new RemoteStrategy(connection));
+ clone.strategies.addStrategies(new RemoteStrategy(connection));
return clone;
}
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 e40271c476..ec65ebf8c8 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
@@ -80,7 +80,7 @@ public boolean isStartStep() {
}
public static boolean isStartStep(final Step<?, ?> step) {
- return step instanceof GraphStep && ((GraphStep) step).isStartStep();
+ return step instanceof GraphStep && ((GraphStep) step).isStart;
}
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 62e12f8f73..26e87db959 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 void addBarrier(final E barrier) {
@Override
public MemoryComputeKey<E> getMemoryComputeKey() {
- return MemoryComputeKey.of(this.getId(), this.getBiOperator(), false,
true);
+ return MemoryComputeKey.of(this.getId(), this.reducingBiOperator,
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 6e805bc69a..ecebef779d 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 void applyStrategies() throws IllegalStateException {
}
this.finalEndStep = this.getEndStep();
// finalize requirements
- if (this.getParent() instanceof EmptyStep) {
+ if (this.parent instanceof EmptyStep) {
this.requirements = null;
this.getTraverserRequirements();
}
@@ -149,14 +149,14 @@ public void applyStrategies() throws
IllegalStateException {
if (null == this.requirements) {
// if (!this.locked) this.applyStrategies();
this.requirements = EnumSet.noneOf(TraverserRequirement.class);
- for (final Step<?, ?> step : this.getSteps()) {
+ for (final Step<?, ?> step : this.unmodifiableSteps) {
this.requirements.addAll(step.getRequirements());
}
if (!this.requirements.contains(TraverserRequirement.LABELED_PATH)
&& TraversalHelper.hasLabels(this))
this.requirements.add(TraverserRequirement.LABELED_PATH);
- if (!this.getSideEffects().keys().isEmpty())
+ if (!this.sideEffects.keys().isEmpty())
this.requirements.add(TraverserRequirement.SIDE_EFFECTS);
- if (null != this.getSideEffects().getSackInitialValue())
+ if (null != this.sideEffects.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 60ece3d41f..13b7d260ed 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 @@ public void setIndentStep(int indentStep) {
StringBuilder s = new StringBuilder();
for (; indentStep > 0; indentStep--)
s.append(' ');
- setIndentStep(s.toString());
+ this.indentStep = 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 fa90b2c711..9d82eef307 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 @@ protected boolean canWriteTypeId() {
protected void writeTypePrefix(final JsonGenerator jsonGenerator, final
String s) throws IOException {
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(this.getPropertyName(), s);
+ jsonGenerator.writeStringField(this.propertyName, 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 e8b83ced85..e76e50218a 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 ObjectMapper createMapper() {
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(getTypeInfo())
+ .typesEmbedding(typeInfo)
.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 db2ef5ce4b..06f2b2ae5a 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 GraphSONTypeIdResolver addCustomType(final String
name, final Class clasz
// 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.
- getIdToType().put(name,
TypeFactory.defaultInstance().constructType(new TypeReference<Tree<? extends
Element>>() {}));
+ idToType.put(name, TypeFactory.defaultInstance().constructType(new
TypeReference<Tree<? extends Element>>() {}));
} else {
- getIdToType().put(name,
TypeFactory.defaultInstance().constructType(clasz));
+ idToType.put(name,
TypeFactory.defaultInstance().constructType(clasz));
}
- getTypeToId().put(clasz, name);
+ typeToId.put(clasz, name);
return this;
}
@@ -76,13 +76,13 @@ public String idFromValue(final Object o) {
@Override
public String idFromValueAndType(final Object o, final Class<?> aClass) {
- if (!getTypeToId().containsKey(aClass)) {
+ if (!typeToId.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 getTypeToId().get(aClass);
+ return typeToId.get(aClass);
}
}
@@ -94,8 +94,8 @@ public String idFromBaseType() {
@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 getIdToType().containsKey(s)
- ? getIdToType().get(s)
+ return idToType.containsKey(s)
+ ? idToType.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 1031156db4..66c27a3abb 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 int hashCode() {
@Override
public boolean equals(final Object object) {
return object instanceof Lambda &&
- ((Lambda) object).getLambdaArguments() ==
this.getLambdaArguments() &&
+ ((Lambda) object).getLambdaArguments() ==
this.lambdaArguments &&
((Lambda)
object).getLambdaScript().equals(this.lambdaSource) &&
((Lambda)
object).getLambdaLanguage().equals(this.lambdaLanguage);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
