You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/06/09 16:47:21 UTC
[40/50] [abbrv] incubator-tinkerpop git commit: Added
ElementHelper.legalKeyValues() to Parameters to give a better exception
message to Gremlin users with traversals that use parameterized-steps. E.g.
addV(). Fixed #TINKERPOP-1324. CTR.
Added ElementHelper.legalKeyValues() to Parameters to give a better exception message to Gremlin users with traversals that use parameterized-steps. E.g. addV(). Fixed #TINKERPOP-1324. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ecbb8e8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ecbb8e8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ecbb8e8f
Branch: refs/heads/TINKERPOP-1331
Commit: ecbb8e8f1874a8b393c62d7eaa838f71ea3da964
Parents: 2c092c8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 8 07:55:06 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 8 07:55:06 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/util/Parameters.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ecbb8e8f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
index f98e616..f55bac9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
import java.io.Serializable;
import java.util.ArrayList;
@@ -79,7 +80,7 @@ public final class Parameters implements Cloneable, Serializable {
/**
* Gets the value of a key and if that key isn't present returns the default value from the {@link Supplier}.
*
- * @param key the key to retrieve
+ * @param key the key to retrieve
* @param defaultValue the default value generator
*/
public <E> List<E> get(final Object key, final Supplier<E> defaultValue) {
@@ -118,10 +119,10 @@ public final class Parameters implements Cloneable, Serializable {
*
* @param exceptKeys keys to not include in the returned {@link Map}
*/
- public Map<Object,List<Object>> getRaw(final Object... exceptKeys) {
+ public Map<Object, List<Object>> getRaw(final Object... exceptKeys) {
if (parameters.isEmpty()) return Collections.emptyMap();
final List<Object> exceptions = Arrays.asList(exceptKeys);
- final Map<Object,List<Object>> raw = new HashMap<>();
+ final Map<Object, List<Object>> raw = new HashMap<>();
for (Map.Entry<Object, List<Object>> entry : parameters.entrySet()) {
if (!exceptions.contains(entry.getKey())) raw.put(entry.getKey(), entry.getValue());
}
@@ -133,6 +134,7 @@ public final class Parameters implements Cloneable, Serializable {
* Set parameters given key/value pairs.
*/
public void set(final Object... keyValues) {
+ ElementHelper.legalPropertyKeyValueArray(keyValues);
for (int i = 0; i < keyValues.length; i = i + 2) {
if (keyValues[i + 1] != null) {
List<Object> values = this.parameters.get(keyValues[i]);