You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/21 00:31:00 UTC
incubator-tinkerpop git commit: naming convention stuff.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 2874935a8 -> 936c9a3c5
naming convention stuff.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/936c9a3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/936c9a3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/936c9a3c
Branch: refs/heads/master
Commit: 936c9a3c5443ef8eb9c16ad20db4c033dde670e6
Parents: 2874935
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 20 16:30:58 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 20 16:30:58 2015 -0700
----------------------------------------------------------------------
.../gremlin/process/graph/traversal/step/map/TreeStep.java | 2 +-
.../traversal/step/sideEffect/GroupCountSideEffectStep.java | 6 +++---
.../graph/traversal/step/sideEffect/TreeSideEffectStep.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/936c9a3c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/TreeStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/TreeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/TreeStep.java
index 4ca4404..3519bf9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/TreeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/TreeStep.java
@@ -49,7 +49,7 @@ import java.util.function.Supplier;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TreeStep<S> extends ReducingBarrierStep<S, Tree> implements MapReducer, TraversalParent {
+public final class TreeStep<S> extends ReducingBarrierStep<S, Tree> implements MapReducer, TraversalParent {
private TraversalRing<Object, Object> traversalRing = new TraversalRing<>();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/936c9a3c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountSideEffectStep.java
index 0669b8c..acd2073 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountSideEffectStep.java
@@ -107,7 +107,7 @@ public final class GroupCountSideEffectStep<S, E> extends SideEffectStep<S> impl
public static final class GroupCountSideEffectMapReduce<E> extends StaticMapReduce<E, Long, E, Long, Map<E, Long>> {
- public static final String GROUP_COUNT_STEP_SIDE_EFFECT_KEY = "gremlin.groupCountStep.sideEffectKey";
+ public static final String GROUP_COUNT_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY = "gremlin.groupCountSideEffectStep.sideEffectKey";
private String sideEffectKey;
private Supplier<Map<E, Long>> mapSupplier;
@@ -124,12 +124,12 @@ public final class GroupCountSideEffectStep<S, E> extends SideEffectStep<S> impl
@Override
public void storeState(final Configuration configuration) {
super.storeState(configuration);
- configuration.setProperty(GROUP_COUNT_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
+ configuration.setProperty(GROUP_COUNT_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
}
@Override
public void loadState(final Configuration configuration) {
- this.sideEffectKey = configuration.getString(GROUP_COUNT_STEP_SIDE_EFFECT_KEY);
+ this.sideEffectKey = configuration.getString(GROUP_COUNT_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY);
this.mapSupplier = TraversalVertexProgram.getTraversalSupplier(configuration).get().getSideEffects().<Map<E, Long>>getRegisteredSupplier(this.sideEffectKey).orElse(HashMap::new);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/936c9a3c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeSideEffectStep.java
index 0c43d11..f1dcf00 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeSideEffectStep.java
@@ -120,7 +120,7 @@ public final class TreeSideEffectStep<S> extends SideEffectStep<S> implements Re
public static final class TreeSideEffectMapReduce extends StaticMapReduce<Object, Tree, Object, Tree, Tree> {
- public static final String TREE_STEP_SIDE_EFFECT_KEY = "gremlin.treeStep.sideEffectKey";
+ public static final String TREE_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY = "gremlin.treeSideEffectStep.sideEffectKey";
private String sideEffectKey;
@@ -135,12 +135,12 @@ public final class TreeSideEffectStep<S> extends SideEffectStep<S> implements Re
@Override
public void storeState(final Configuration configuration) {
super.storeState(configuration);
- configuration.setProperty(TREE_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
+ configuration.setProperty(TREE_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
}
@Override
public void loadState(final Configuration configuration) {
- this.sideEffectKey = configuration.getString(TREE_STEP_SIDE_EFFECT_KEY);
+ this.sideEffectKey = configuration.getString(TREE_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY);
}
@Override