Repository: tinkerpop Updated Branches: refs/heads/shortest-path-wip c42fb5a09 -> c04b56fb0
wip Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c04b56fb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c04b56fb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c04b56fb Branch: refs/heads/shortest-path-wip Commit: c04b56fb06fa704c162ad4bab95a616e4b0dcbb8 Parents: c42fb5a Author: Daniel Kuppitz <[email protected]> Authored: Thu May 31 14:21:09 2018 -0700 Committer: Daniel Kuppitz <[email protected]> Committed: Thu May 31 14:21:09 2018 -0700 ---------------------------------------------------------------------- .../traversal/dsl/graph/GraphTraversal.java | 24 +++++++++------ .../io/graphson/TraversalSerializersV2d0.java | 4 +++ .../io/graphson/TraversalSerializersV3d0.java | 1 + .../structure/io/gryo/GryoSerializersV1d0.java | 32 -------------------- .../structure/io/gryo/GryoSerializersV3d0.java | 2 +- 5 files changed, 21 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c04b56fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 5ec9564..28798ee 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -19,7 +19,10 @@ package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph; import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; -import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.*; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRankVertexProgramStep; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ProgramVertexProgramStep; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ShortestPathVertexProgramStep; import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Path; @@ -155,7 +158,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.*; +import java.util.function.BiFunction; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -302,9 +308,9 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { } /** - * Map the {@link Vertex} to its adjacent vertices given a edgeTraversal and edge labels. + * Map the {@link Vertex} to its adjacent vertices given a direction and edge labels. * - * @param direction the edgeTraversal to traverse from the current vertex + * @param direction the direction to traverse from the current vertex * @param edgeLabels the edge labels to traverse * @return the traversal with an appended {@link VertexStep}. * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps"; target="_blank">Reference Documentation - Vertex Step</a> @@ -355,9 +361,9 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { } /** - * Map the {@link Vertex} to its incident edges given the edgeTraversal and edge labels. + * Map the {@link Vertex} to its incident edges given the direction and edge labels. * - * @param direction the edgeTraversal to traverse from the current vertex + * @param direction the direction to traverse from the current vertex * @param edgeLabels the edge labels to traverse * @return the traversal with an appended {@link VertexStep}. * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps"; target="_blank">Reference Documentation - Vertex Step</a> @@ -408,9 +414,9 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { } /** - * Map the {@link Edge} to its incident vertices given the edgeTraversal. + * Map the {@link Edge} to its incident vertices given the direction. * - * @param direction the edgeTraversal to traverser from the current edge + * @param direction the direction to traverser from the current edge * @return the traversal with an appended {@link EdgeVertexStep}. * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps"; target="_blank">Reference Documentation - Vertex Step</a> * @since 3.0.0-incubating @@ -2834,10 +2840,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { public static final String program = "program"; public static final String by = "by"; + public static final String with = "with"; public static final String times = "times"; public static final String as = "as"; public static final String option = "option"; - public static final String with = "with"; } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c04b56fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java index 2a07723..040fd1d 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java @@ -37,14 +37,18 @@ import org.apache.tinkerpop.shaded.jackson.core.JsonParser; import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException; import org.apache.tinkerpop.shaded.jackson.core.JsonToken; import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext; +import org.apache.tinkerpop.shaded.jackson.databind.JavaType; +import org.apache.tinkerpop.shaded.jackson.databind.JsonNode; import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider; import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer; import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer; +import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c04b56fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java index 8086b2a..eaa7b0f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java @@ -47,6 +47,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c04b56fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java index 9fdfd4e..ca7c241 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java @@ -18,14 +18,11 @@ */ package org.apache.tinkerpop.gremlin.structure.io.gryo; -import org.apache.commons.configuration.Configuration; import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser; import org.apache.tinkerpop.gremlin.process.traversal.Bytecode; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Path; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.DefaultStepConfiguration; import org.apache.tinkerpop.gremlin.process.traversal.util.AndP; import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP; import org.apache.tinkerpop.gremlin.process.traversal.util.OrP; @@ -47,10 +44,7 @@ import org.apache.tinkerpop.gremlin.util.function.Lambda; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; /** * This class holds serializers for graph-based objects such as vertices, edges, properties, and paths. These objects @@ -287,30 +281,4 @@ public final class GryoSerializersV1d0 { return new DefaultRemoteTraverser<>(o, input.readLong()); } } - -// public final static class DefaultStepConfigurationSerializer implements SerializerShim<DefaultStepConfiguration> { -// @Override -// public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultStepConfiguration stepConfig) { -// final LinkedHashMap<String,List<Object>> m = new LinkedHashMap<>(); -// final Configuration conf = stepConfig.getConfiguration(); -// final Iterator<String> keys = conf.getKeys(); -// while (keys.hasNext()) { -// final String key = keys.next(); -// final List<Object> args = new ArrayList<>(); -// -// // gryo doesn't (for whatever reason that i can't remember) coerce traversals to bytecode so if a -// // step configuration has a traversal it needs to be coerced here. not sure........ -// conf.getList(key).forEach(x -> args.add(x instanceof Traversal ? ((Traversal) x).asAdmin().getBytecode() : x)); -// m.put(key, args); -// } -// -// kryo.writeObject(output, m); -// } -// -// @Override -// public <I extends InputShim> DefaultStepConfiguration read(final KryoShim<I, ?> kryo, final I input, final Class<DefaultStepConfiguration> clazz) { -// final LinkedHashMap<String,List<Object>> m = kryo.readObject(input, LinkedHashMap.class); -// return DefaultStepConfiguration. -// } -// } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c04b56fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java index da91e42..8a57a06 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java @@ -46,12 +46,12 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty; import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; import org.apache.tinkerpop.gremlin.util.function.Lambda; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit;
