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 2017/05/04 14:29:11 UTC
[2/2] tinkerpop git commit: TINKERPOP-786 Used templating language
instead of string concat
TINKERPOP-786 Used templating language instead of string concat
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3f8eae2f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3f8eae2f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3f8eae2f
Branch: refs/heads/TINKERPOP-786
Commit: 3f8eae2fa99bf5d0aab8c763a27989b2058cfb74
Parents: 6289286
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 4 10:28:29 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 4 10:28:29 2017 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/GremlinDslProcessor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f8eae2f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index f8a3266..e246765 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -154,7 +154,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
boolean added = false;
final List<? extends VariableElement> parameters = templateMethod.getParameters();
- String body = "return new " + ctx.defaultTraversalClassName + "(clone, super." + elementOfGraphTraversalSource.getSimpleName().toString() + "(";
+ String body = "return new $T (clone, super.$L(";
for (VariableElement param : parameters) {
methodToAdd.addParameter(ParameterSpec.get(param));
@@ -170,7 +170,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
body = body + ").asAdmin())";
methodToAdd.addStatement("$T clone = this.clone()", ctx.traversalSourceClassName)
- .addStatement(body)
+ .addStatement(body, ctx.defaultTraversalClassName, elementOfGraphTraversalSource.getSimpleName())
.returns(getReturnTypeDefinition(ctx.traversalClassName, templateMethod));
traversalSourceClass.addMethod(methodToAdd.build());
@@ -344,7 +344,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
boolean added = false;
final List<? extends VariableElement> parameters = templateMethod.getParameters();
final String parentCall = parent.isEmpty() ? "" : parent + ".";
- String body = "return (" + returnClazz.simpleName() + ") " + parentCall + "super." + methodName + "(";
+ String body = "return ($T) " + parentCall + "super.$L(";
for (VariableElement param : parameters) {
methodToAdd.addParameter(ParameterSpec.get(param));
@@ -359,7 +359,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
if (added) body = body.substring(0, body.length() - 1);
body = body + ")";
- methodToAdd.addStatement(body);
+ methodToAdd.addStatement(body, returnClazz, methodName);
return Optional.of(methodToAdd.build());
}