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 2024/08/27 20:16:11 UTC
(tinkerpop) branch gvalue-3.7 updated: prevented JavaTranslator from using GValue
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch gvalue-3.7
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/gvalue-3.7 by this push:
new 95c3d66f45 prevented JavaTranslator from using GValue
95c3d66f45 is described below
commit 95c3d66f455ecabe5a1fe15c1beb574c6f451892
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Aug 27 16:15:21 2024 -0400
prevented JavaTranslator from using GValue
---
.../org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 1641d823bc..96a4450309 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
@@ -38,6 +39,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -336,8 +338,12 @@ public final class JavaTranslator<S extends TraversalSource, T extends Traversal
private synchronized static void buildMethodCache(final Object delegate, final Map<String, List<ReflectedMethod>> methodCache) {
if (methodCache.isEmpty()) {
for (final Method method : delegate.getClass().getMethods()) {
- final List<ReflectedMethod> list = methodCache.computeIfAbsent(method.getName(), k -> new ArrayList<>());
- list.add(new ReflectedMethod(method));
+ final boolean freeOfGValue = Arrays.stream(method.getParameters()).
+ noneMatch(p -> p.getType() == GValue.class || p.getType().getComponentType() == GValue.class);
+ if (freeOfGValue) {
+ final List<ReflectedMethod> list = methodCache.computeIfAbsent(method.getName(), k -> new ArrayList<>());
+ list.add(new ReflectedMethod(method));
+ }
}
GLOBAL_METHOD_CACHE.put(delegate.getClass(), methodCache);
}