This is an automated email from the ASF dual-hosted git repository. okram pushed a commit to branch tp4 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push: new 95e16c8 beam and pipes are now off of machine.processor package. Removed the (Java) postfix on all the pom.xmls. 95e16c8 is described below commit 95e16c8f7f2311f9fadbccdb051516c883ca9644 Author: Marko A. Rodriguez <okramma...@gmail.com> AuthorDate: Tue Mar 19 10:06:50 2019 -0600 beam and pipes are now off of machine.processor package. Removed the (Java) postfix on all the pom.xmls. --- java/core/pom.xml | 2 +- java/language/gremlin/pom.xml | 2 +- java/language/pom.xml | 2 +- java/machine/pom.xml | 2 +- java/machine/processor/beam/pom.xml | 2 +- .../machine/{ => processor}/beam/AbstractFn.java | 2 +- .../machine/{ => processor}/beam/Beam.java | 8 ++--- .../{ => processor}/beam/BeamProcessor.java | 4 +-- .../machine/{ => processor}/beam/BranchFn.java | 2 +- .../machine/{ => processor}/beam/FilterFn.java | 2 +- .../machine/{ => processor}/beam/FlatMapFn.java | 2 +- .../tinkerpop/machine/{ => processor}/beam/Fn.java | 2 +- .../machine/{ => processor}/beam/InitialFn.java | 2 +- .../machine/{ => processor}/beam/MapFn.java | 2 +- .../machine/{ => processor}/beam/OutputFn.java | 2 +- .../machine/{ => processor}/beam/ReduceFn.java | 8 ++--- .../{ => processor}/beam/RepeatDeadEndFn.java | 2 +- .../machine/{ => processor}/beam/RepeatEndFn.java | 2 +- .../{ => processor}/beam/RepeatStartFn.java | 2 +- .../beam/serialization/CoefficientCoder.java | 2 +- .../beam/serialization/ReducerCoder.java | 4 +-- .../beam/serialization/TraverserCoder.java | 2 +- .../beam/sideeffect/BasicReducer.java | 4 +-- .../beam/strategy/BeamStrategy.java | 4 +-- .../beam/util/PrimitiveVisitor.java | 6 ++-- .../{ => processor}/beam/util/TopologyUtil.java | 24 +++++++------- .../apache/tinkerpop/machine/beam/BeamTest.java | 1 + .../beam/functions/TraversalSourceLibrary.java | 2 +- java/machine/processor/pipes/pom.xml | 2 +- .../{ => processor}/pipes/AbstractStep.java | 2 +- .../machine/{ => processor}/pipes/BarrierStep.java | 6 ++-- .../machine/{ => processor}/pipes/BranchStep.java | 2 +- .../machine/{ => processor}/pipes/EmptyStep.java | 2 +- .../machine/{ => processor}/pipes/FilterStep.java | 2 +- .../machine/{ => processor}/pipes/FlatMapStep.java | 2 +- .../machine/{ => processor}/pipes/InitialStep.java | 2 +- .../machine/{ => processor}/pipes/MapStep.java | 2 +- .../machine/{ => processor}/pipes/Pipes.java | 4 +-- .../{ => processor}/pipes/PipesProcessor.java | 4 +-- .../machine/{ => processor}/pipes/ReduceStep.java | 4 +-- .../machine/{ => processor}/pipes/RepeatStep.java | 2 +- .../machine/{ => processor}/pipes/SourceStep.java | 2 +- .../machine/{ => processor}/pipes/Step.java | 2 +- .../pipes/strategy/PipesStrategy.java | 4 +-- .../{ => processor}/pipes/util/Barrier.java | 2 +- .../pipes/util/InMemoryBarrier.java | 2 +- .../pipes/util/InMemoryReducer.java | 2 +- .../{ => processor}/pipes/util/Reducer.java | 2 +- .../pipes/function/TraversalSourceLibrary.java | 37 ---------------------- .../machine/{ => processor}/pipes/PipesTest.java | 3 +- java/machine/processor/pom.xml | 2 +- java/machine/structure/pom.xml | 2 +- java/machine/structure/tinkergraph/pom.xml | 2 +- java/pom.xml | 2 +- 54 files changed, 83 insertions(+), 118 deletions(-) diff --git a/java/core/pom.xml b/java/core/pom.xml index 64c2071..bdb543f 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <artifactId>tinkerpop</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Core</name> + <name>Apache TinkerPop :: Core</name> <artifactId>core</artifactId> <build> <directory>${basedir}/target</directory> diff --git a/java/language/gremlin/pom.xml b/java/language/gremlin/pom.xml index 30ee8dc..1c09cc6 100644 --- a/java/language/gremlin/pom.xml +++ b/java/language/gremlin/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <groupId>org.apache.tinkerpop</groupId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Language :: Gremlin</name> + <name>Apache TinkerPop :: Language :: Gremlin</name> <artifactId>gremlin</artifactId> <dependencies> <dependency> diff --git a/java/language/pom.xml b/java/language/pom.xml index 3aaf916..3ef169e 100644 --- a/java/language/pom.xml +++ b/java/language/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <artifactId>tinkerpop</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Language</name> + <name>Apache TinkerPop :: Language</name> <artifactId>language</artifactId> <modules> <module>gremlin</module> diff --git a/java/machine/pom.xml b/java/machine/pom.xml index e190872..18d4b59 100644 --- a/java/machine/pom.xml +++ b/java/machine/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <artifactId>tinkerpop</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine</name> + <name>Apache TinkerPop :: Machine</name> <artifactId>machine</artifactId> <modules> <module>processor</module> diff --git a/java/machine/processor/beam/pom.xml b/java/machine/processor/beam/pom.xml index 8249a50..d009108 100644 --- a/java/machine/processor/beam/pom.xml +++ b/java/machine/processor/beam/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <groupId>org.apache.tinkerpop</groupId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine :: Beam</name> + <name>Apache TinkerPop :: Machine :: Beam</name> <artifactId>beam</artifactId> <dependencies> <dependency> diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/AbstractFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/AbstractFn.java index 17a28f2..cf70f0c 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/AbstractFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.transforms.DoFn; import org.apache.tinkerpop.machine.function.CFunction; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Beam.java similarity index 92% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Beam.java index 2a5d2e9..96dcf00 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Beam.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; -import org.apache.tinkerpop.machine.beam.serialization.TraverserCoder; -import org.apache.tinkerpop.machine.beam.util.PrimitiveVisitor; -import org.apache.tinkerpop.machine.beam.util.TopologyUtil; +import org.apache.tinkerpop.machine.processor.beam.serialization.TraverserCoder; +import org.apache.tinkerpop.machine.processor.beam.util.PrimitiveVisitor; +import org.apache.tinkerpop.machine.processor.beam.util.TopologyUtil; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.processor.Processor; import org.apache.tinkerpop.machine.traverser.EmptyTraverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BeamProcessor.java similarity index 92% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BeamProcessor.java index 8268001..8981d9d 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BeamProcessor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; -import org.apache.tinkerpop.machine.beam.strategy.BeamStrategy; +import org.apache.tinkerpop.machine.processor.beam.strategy.BeamStrategy; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.processor.Processor; import org.apache.tinkerpop.machine.processor.ProcessorFactory; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BranchFn.java similarity index 97% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BranchFn.java index 7756b73..63ca3c7 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/BranchFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.values.TupleTag; import org.apache.tinkerpop.machine.bytecode.Compilation; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FilterFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FilterFn.java index 732fc8b..1a7ab4a 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FilterFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.tinkerpop.machine.function.FilterFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FlatMapFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FlatMapFn.java index 6c4e8ef..876b9da 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/FlatMapFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.tinkerpop.machine.function.FlatMapFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Fn.java similarity index 94% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Fn.java index 3729120..9a671ee 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/Fn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/InitialFn.java similarity index 97% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/InitialFn.java index 93131c9..792eace 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/InitialFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.tinkerpop.machine.function.InitialFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/MapFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/MapFn.java index 2cc3aee..7b5398f 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/MapFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.tinkerpop.machine.function.MapFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/OutputFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/OutputFn.java index 7c2c37c..cfebb0e 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/OutputFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.transforms.DoFn; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/ReduceFn.java similarity index 92% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/ReduceFn.java index f495796..bd9dc71 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/ReduceFn.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.coders.CannotProvideCoderException; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.transforms.Combine; -import org.apache.tinkerpop.machine.beam.serialization.ReducerCoder; -import org.apache.tinkerpop.machine.beam.serialization.TraverserCoder; -import org.apache.tinkerpop.machine.beam.sideeffect.BasicReducer; +import org.apache.tinkerpop.machine.processor.beam.serialization.ReducerCoder; +import org.apache.tinkerpop.machine.processor.beam.serialization.TraverserCoder; +import org.apache.tinkerpop.machine.processor.beam.sideeffect.BasicReducer; import org.apache.tinkerpop.machine.function.ReduceFunction; import org.apache.tinkerpop.machine.traverser.Traverser; import org.apache.tinkerpop.machine.traverser.TraverserFactory; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatDeadEndFn.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatDeadEndFn.java index ca28c72..6838a76 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatDeadEndFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.transforms.DoFn; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatEndFn.java similarity index 98% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatEndFn.java index 02c7b2a..0f0d156 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatEndFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.values.TupleTag; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatStartFn.java similarity index 98% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatStartFn.java index ca0f4ea..30ac329 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/RepeatStartFn.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam; +package org.apache.tinkerpop.machine.processor.beam; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.values.TupleTag; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/CoefficientCoder.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/CoefficientCoder.java index 75d7c01..5cd6440 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/CoefficientCoder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.serialization; +package org.apache.tinkerpop.machine.processor.beam.serialization; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.CoderException; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/ReducerCoder.java similarity index 93% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/ReducerCoder.java index 85673ff..5763bb6 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/ReducerCoder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.serialization; +package org.apache.tinkerpop.machine.processor.beam.serialization; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.CoderException; -import org.apache.tinkerpop.machine.beam.sideeffect.BasicReducer; +import org.apache.tinkerpop.machine.processor.beam.sideeffect.BasicReducer; import java.io.IOException; import java.io.InputStream; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/TraverserCoder.java similarity index 96% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/TraverserCoder.java index c487bec..d68f11b 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/serialization/TraverserCoder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.serialization; +package org.apache.tinkerpop.machine.processor.beam.serialization; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.CoderException; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/sideeffect/BasicReducer.java similarity index 94% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/sideeffect/BasicReducer.java index bf13637..b91ca21 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/sideeffect/BasicReducer.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.sideeffect; +package org.apache.tinkerpop.machine.processor.beam.sideeffect; import org.apache.beam.sdk.coders.DefaultCoder; import org.apache.beam.sdk.transforms.Combine; -import org.apache.tinkerpop.machine.beam.serialization.ReducerCoder; +import org.apache.tinkerpop.machine.processor.beam.serialization.ReducerCoder; import org.apache.tinkerpop.machine.function.ReduceFunction; import org.apache.tinkerpop.machine.traverser.Traverser; import org.apache.tinkerpop.machine.traverser.TraverserFactory; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/strategy/BeamStrategy.java similarity index 92% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/strategy/BeamStrategy.java index 890f86c..9a37543 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/strategy/BeamStrategy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.strategy; +package org.apache.tinkerpop.machine.processor.beam.strategy; import org.apache.tinkerpop.machine.bytecode.Bytecode; import org.apache.tinkerpop.machine.bytecode.BytecodeUtil; import org.apache.tinkerpop.machine.bytecode.CoreCompiler.Symbols; -import org.apache.tinkerpop.machine.pipes.PipesProcessor; +import org.apache.tinkerpop.machine.processor.pipes.PipesProcessor; import org.apache.tinkerpop.machine.strategy.AbstractStrategy; import org.apache.tinkerpop.machine.strategy.Strategy; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/PrimitiveVisitor.java similarity index 92% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/PrimitiveVisitor.java index d85042e..6a5f4e2 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/PrimitiveVisitor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.util; +package org.apache.tinkerpop.machine.processor.beam.util; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.runners.TransformHierarchy; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PValue; -import org.apache.tinkerpop.machine.beam.OutputFn; -import org.apache.tinkerpop.machine.beam.RepeatDeadEndFn; +import org.apache.tinkerpop.machine.processor.beam.OutputFn; +import org.apache.tinkerpop.machine.processor.beam.RepeatDeadEndFn; import java.util.ArrayList; import java.util.List; diff --git a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/TopologyUtil.java similarity index 90% rename from java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java rename to java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/TopologyUtil.java index af7584f..ebd72cf 100644 --- a/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java +++ b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/processor/beam/util/TopologyUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.beam.util; +package org.apache.tinkerpop.machine.processor.beam.util; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.Flatten; @@ -26,17 +26,17 @@ import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; -import org.apache.tinkerpop.machine.beam.Beam; -import org.apache.tinkerpop.machine.beam.BranchFn; -import org.apache.tinkerpop.machine.beam.FilterFn; -import org.apache.tinkerpop.machine.beam.FlatMapFn; -import org.apache.tinkerpop.machine.beam.InitialFn; -import org.apache.tinkerpop.machine.beam.MapFn; -import org.apache.tinkerpop.machine.beam.ReduceFn; -import org.apache.tinkerpop.machine.beam.RepeatDeadEndFn; -import org.apache.tinkerpop.machine.beam.RepeatEndFn; -import org.apache.tinkerpop.machine.beam.RepeatStartFn; -import org.apache.tinkerpop.machine.beam.serialization.TraverserCoder; +import org.apache.tinkerpop.machine.processor.beam.Beam; +import org.apache.tinkerpop.machine.processor.beam.BranchFn; +import org.apache.tinkerpop.machine.processor.beam.FilterFn; +import org.apache.tinkerpop.machine.processor.beam.FlatMapFn; +import org.apache.tinkerpop.machine.processor.beam.InitialFn; +import org.apache.tinkerpop.machine.processor.beam.MapFn; +import org.apache.tinkerpop.machine.processor.beam.ReduceFn; +import org.apache.tinkerpop.machine.processor.beam.RepeatDeadEndFn; +import org.apache.tinkerpop.machine.processor.beam.RepeatEndFn; +import org.apache.tinkerpop.machine.processor.beam.RepeatStartFn; +import org.apache.tinkerpop.machine.processor.beam.serialization.TraverserCoder; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.function.BranchFunction; import org.apache.tinkerpop.machine.function.CFunction; diff --git a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java index 32d2315..29c5369 100644 --- a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java +++ b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java @@ -25,6 +25,7 @@ import org.apache.tinkerpop.language.gremlin.TraversalSource; import org.apache.tinkerpop.language.gremlin.TraversalUtil; import org.apache.tinkerpop.language.gremlin.__; import org.apache.tinkerpop.machine.coefficient.LongCoefficient; +import org.apache.tinkerpop.machine.processor.beam.BeamProcessor; import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy; import org.apache.tinkerpop.machine.structure.tinkergraph.TinkerGraphStructure; import org.junit.jupiter.api.Test; diff --git a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java index 8b7c846..efa826f 100644 --- a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java +++ b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java @@ -20,7 +20,7 @@ package org.apache.tinkerpop.machine.beam.functions; import org.apache.tinkerpop.language.gremlin.Gremlin; import org.apache.tinkerpop.language.gremlin.TraversalSource; -import org.apache.tinkerpop.machine.beam.BeamProcessor; +import org.apache.tinkerpop.machine.processor.beam.BeamProcessor; import org.apache.tinkerpop.machine.coefficient.LongCoefficient; import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy; diff --git a/java/machine/processor/pipes/pom.xml b/java/machine/processor/pipes/pom.xml index d9b2f29..9b8626a 100644 --- a/java/machine/processor/pipes/pom.xml +++ b/java/machine/processor/pipes/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <groupId>org.apache.tinkerpop</groupId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine :: Pipes</name> + <name>Apache TinkerPop :: Machine :: Pipes</name> <artifactId>pipes</artifactId> <dependencies> <dependency> diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/AbstractStep.java similarity index 96% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/AbstractStep.java index 4e75f0e..f1243f2 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/AbstractStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.CFunction; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BarrierStep.java similarity index 93% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BarrierStep.java index ba4d48b..f186cc3 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BarrierStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.BarrierFunction; -import org.apache.tinkerpop.machine.pipes.util.Barrier; -import org.apache.tinkerpop.machine.pipes.util.InMemoryBarrier; +import org.apache.tinkerpop.machine.processor.pipes.util.Barrier; +import org.apache.tinkerpop.machine.processor.pipes.util.InMemoryBarrier; import org.apache.tinkerpop.machine.traverser.Traverser; import org.apache.tinkerpop.machine.traverser.TraverserFactory; import org.apache.tinkerpop.util.EmptyIterator; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BranchStep.java similarity index 98% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BranchStep.java index 52ea854..a398d34 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/BranchStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.function.BranchFunction; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/EmptyStep.java similarity index 96% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/EmptyStep.java index 48acade..f92e15c 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/EmptyStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.traverser.COPTraverser; import org.apache.tinkerpop.util.FastNoSuchElementException; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FilterStep.java similarity index 97% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FilterStep.java index b5d378b..ac780a2 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FilterStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.FilterFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FlatMapStep.java similarity index 97% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FlatMapStep.java index 9fb6cb3..8268466 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/FlatMapStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.FlatMapFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/InitialStep.java similarity index 97% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/InitialStep.java index 574f20a..3acdb68 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/InitialStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.InitialFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/MapStep.java similarity index 96% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/MapStep.java index 1ca813c..b2e2c5a 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/MapStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.MapFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Pipes.java similarity index 97% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Pipes.java index afacfa1..330a421 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Pipes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.function.BarrierFunction; @@ -28,7 +28,7 @@ import org.apache.tinkerpop.machine.function.InitialFunction; import org.apache.tinkerpop.machine.function.MapFunction; import org.apache.tinkerpop.machine.function.ReduceFunction; import org.apache.tinkerpop.machine.function.branch.RepeatBranch; -import org.apache.tinkerpop.machine.pipes.util.InMemoryReducer; +import org.apache.tinkerpop.machine.processor.pipes.util.InMemoryReducer; import org.apache.tinkerpop.machine.processor.Processor; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/PipesProcessor.java similarity index 92% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/PipesProcessor.java index 6bbeda7..51de95e 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/PipesProcessor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.bytecode.Compilation; -import org.apache.tinkerpop.machine.pipes.strategy.PipesStrategy; +import org.apache.tinkerpop.machine.processor.pipes.strategy.PipesStrategy; import org.apache.tinkerpop.machine.processor.Processor; import org.apache.tinkerpop.machine.processor.ProcessorFactory; import org.apache.tinkerpop.machine.strategy.Strategy; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/ReduceStep.java similarity index 95% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/ReduceStep.java index 90a0b1a..282cf4a 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/ReduceStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.function.ReduceFunction; -import org.apache.tinkerpop.machine.pipes.util.Reducer; +import org.apache.tinkerpop.machine.processor.pipes.util.Reducer; import org.apache.tinkerpop.machine.traverser.Traverser; import org.apache.tinkerpop.machine.traverser.TraverserFactory; import org.apache.tinkerpop.util.FastNoSuchElementException; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/RepeatStep.java similarity index 99% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/RepeatStep.java index 6a6eb4e..6bf6ada 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/RepeatStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.bytecode.Compilation; import org.apache.tinkerpop.machine.function.branch.RepeatBranch; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/SourceStep.java similarity index 96% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/SourceStep.java index edeb906..1229234 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/SourceStep.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Step.java similarity index 95% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Step.java index 28dbf09..f21b0e8 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/Step.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/strategy/PipesStrategy.java similarity index 92% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/strategy/PipesStrategy.java index f2de88c..320067f 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/strategy/PipesStrategy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes.strategy; +package org.apache.tinkerpop.machine.processor.pipes.strategy; import org.apache.tinkerpop.machine.bytecode.Bytecode; import org.apache.tinkerpop.machine.bytecode.BytecodeUtil; import org.apache.tinkerpop.machine.bytecode.CoreCompiler.Symbols; -import org.apache.tinkerpop.machine.pipes.PipesProcessor; +import org.apache.tinkerpop.machine.processor.pipes.PipesProcessor; import org.apache.tinkerpop.machine.strategy.AbstractStrategy; import org.apache.tinkerpop.machine.strategy.Strategy; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Barrier.java similarity index 94% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Barrier.java index 9f2253d..5f69e11 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Barrier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes.util; +package org.apache.tinkerpop.machine.processor.pipes.util; import java.io.Serializable; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryBarrier.java similarity index 95% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryBarrier.java index cccb316..adda639 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryBarrier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes.util; +package org.apache.tinkerpop.machine.processor.pipes.util; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryReducer.java similarity index 96% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryReducer.java index fad1a38..8f48674 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/InMemoryReducer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes.util; +package org.apache.tinkerpop.machine.processor.pipes.util; import org.apache.tinkerpop.machine.function.ReduceFunction; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Reducer.java similarity index 95% rename from java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java rename to java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Reducer.java index 2679772..5f79af1 100644 --- a/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java +++ b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/processor/pipes/util/Reducer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes.util; +package org.apache.tinkerpop.machine.processor.pipes.util; import org.apache.tinkerpop.machine.traverser.Traverser; diff --git a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java deleted file mode 100644 index eb9e61c..0000000 --- a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.machine.pipes.function; - -import org.apache.tinkerpop.language.gremlin.Gremlin; -import org.apache.tinkerpop.language.gremlin.TraversalSource; -import org.apache.tinkerpop.machine.coefficient.LongCoefficient; -import org.apache.tinkerpop.machine.pipes.PipesProcessor; -import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy; - -/** - * @author Marko A. Rodriguez (http://markorodriguez.com) - */ -public class TraversalSourceLibrary { - - public static final TraversalSource<Long>[] LONG_SOURCES = new TraversalSource[]{ - Gremlin.<Long>traversal().withProcessor(PipesProcessor.class), - Gremlin.<Long>traversal().withCoefficient(LongCoefficient.class).withProcessor(PipesProcessor.class), - Gremlin.<Long>traversal().withProcessor(PipesProcessor.class).withStrategy(IdentityStrategy.class)}; - -} diff --git a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java similarity index 98% rename from java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java rename to java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java index 23ddcb0..536ff0d 100644 --- a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java +++ b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.machine.pipes; +package org.apache.tinkerpop.machine.processor.pipes; import org.apache.tinkerpop.language.gremlin.Gremlin; import org.apache.tinkerpop.language.gremlin.P; @@ -25,6 +25,7 @@ import org.apache.tinkerpop.language.gremlin.TraversalSource; import org.apache.tinkerpop.language.gremlin.TraversalUtil; import org.apache.tinkerpop.language.gremlin.__; import org.apache.tinkerpop.machine.coefficient.LongCoefficient; +import org.apache.tinkerpop.machine.processor.pipes.PipesProcessor; import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy; import org.apache.tinkerpop.machine.structure.tinkergraph.TinkerGraphStructure; import org.junit.jupiter.api.Test; diff --git a/java/machine/processor/pom.xml b/java/machine/processor/pom.xml index 38312e1..f23513c 100644 --- a/java/machine/processor/pom.xml +++ b/java/machine/processor/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <artifactId>machine</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine :: Processor</name> + <name>Apache TinkerPop :: Machine :: Processor</name> <artifactId>processor</artifactId> <modules> <module>pipes</module> diff --git a/java/machine/structure/pom.xml b/java/machine/structure/pom.xml index 4075a0a..ac124fa 100644 --- a/java/machine/structure/pom.xml +++ b/java/machine/structure/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <artifactId>machine</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine :: Structure</name> + <name>Apache TinkerPop :: Machine :: Structure</name> <artifactId>structure</artifactId> <modules> <module>tinkergraph</module> diff --git a/java/machine/structure/tinkergraph/pom.xml b/java/machine/structure/tinkergraph/pom.xml index 47ecaa9..e396d1d 100644 --- a/java/machine/structure/tinkergraph/pom.xml +++ b/java/machine/structure/tinkergraph/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <groupId>org.apache.tinkerpop</groupId> <version>4.0.0-SNAPSHOT</version> </parent> - <name>Apache TinkerPop (Java) :: Machine :: TinkerGraph</name> + <name>Apache TinkerPop :: Machine :: TinkerGraph</name> <artifactId>tinkergraph</artifactId> <dependencies> <dependency> diff --git a/java/pom.xml b/java/pom.xml index 2486950..bad5956 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache TinkerPop</name> - <description>A Virtual Machine and Language</description> + <description>A Graph Virtual Machine and Language</description> <url>http://tinkerpop.apache.org/</url> <mailingLists> <mailingList>