From ad96df7f007d31b95e8314438af5e91da8f71a37 Mon Sep 17 00:00:00 2001 From: paliwalashish Date: Tue, 10 Feb 2015 16:59:23 +0530 Subject: [PATCH] moved namespace to org.apache --- CHANGELOG.asciidoc | 2 +- README.asciidoc | 4 +- bin/clean-grapes.sh | 4 +- docs/preprocessor/processor.groovy | 14 +- docs/src/gremlin-applications.asciidoc | 62 ++--- docs/src/implementations.asciidoc | 56 ++--- docs/src/intro.asciidoc | 2 +- docs/src/the-graph.asciidoc | 10 +- docs/src/the-graphcomputer.asciidoc | 2 +- docs/src/the-traversal.asciidoc | 10 +- gremlin-algorithm/pom.xml | 4 +- .../generator/AbstractGenerator.java | 8 +- .../generator/CommunityGenerator.java | 10 +- .../algorithm/generator/CopyDistribution.java | 2 +- .../algorithm/generator/Distribution.java | 2 +- .../generator/DistributionGenerator.java | 10 +- .../algorithm/generator/Generator.java | 2 +- .../generator/NormalDistribution.java | 2 +- .../generator/PowerLawDistribution.java | 2 +- .../algorithm/generator/SizableIterable.java | 2 +- gremlin-console/conf/remote-objects.yaml | 2 +- gremlin-console/conf/remote.yaml | 2 +- gremlin-console/pom.xml | 14 +- gremlin-console/src/assembly/standalone.xml | 8 +- gremlin-console/src/main/bin/gremlin.bat | 6 +- gremlin-console/src/main/bin/gremlin.sh | 6 +- gremlin-console/src/main/ext/plugins.txt | 6 +- .../tinkerpop/gremlin/console/Console.groovy | 12 +- .../ConsoleImportCustomizerProvider.groovy | 4 +- .../tinkerpop/gremlin/console/Mediator.groovy | 6 +- .../console/commands/InstallCommand.groovy | 10 +- .../console/commands/PluginCommand.groovy | 4 +- .../console/commands/RemoteCommand.groovy | 8 +- .../console/commands/SubmitCommand.groovy | 4 +- .../console/commands/UninstallCommand.groovy | 4 +- .../plugin/ConsolePluginAcceptor.groovy | 6 +- .../console/plugin/GephiRemoteAcceptor.groovy | 16 +- .../gremlin/console/plugin/PluggedIn.groovy | 4 +- .../gremlin/console/util/ArrayIterator.groovy | 4 +- .../groovy/plugin/DriverGremlinPlugin.java | 20 +- .../groovy/plugin/DriverRemoteAcceptor.java | 18 +- .../groovy/plugin/GephiGremlinPlugin.java | 14 +- .../groovy/plugin/UtilitiesGremlinPlugin.java | 10 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 3 - .../services/javax.script.ScriptEngineFactory | 2 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 3 + .../commands/InstallCommand.properties | 0 .../console/commands/PluginCommand.properties | 0 .../console/commands/RemoteCommand.properties | 0 .../console/commands/SubmitCommand.properties | 0 .../commands/UninstallCommand.properties | 0 .../UtilitiesGremlinPluginScript.groovy | 6 +- .../AbstractGremlinServerIntegrationTest.java | 6 +- .../plugin/DriverGremlinPluginTest.java | 4 +- .../DriverRemoteAcceptorIntegrateTest.java | 10 +- .../plugin/DriverRemoteAcceptorTest.java | 6 +- .../groovy/plugin/SpyPluginAcceptor.java | 4 +- .../groovy/plugin/SugarGremlinPluginTest.java | 12 +- .../plugin/UtilitiesGremlinPluginTest.java | 7 +- .../gremlin/console/groovy/plugin/remote.yaml | 3 - .../plugin/gremlin-server-integration.yaml | 10 +- .../gremlin/console/groovy/plugin/remote.yaml | 3 + .../plugin/tinkergraph-empty.properties | 2 +- gremlin-core/pom.xml | 2 +- .../process/FastNoSuchElementException.java | 2 +- .../tinkerpop/gremlin/process/Path.java | 4 +- .../tinkerpop/gremlin/process/Scope.java | 2 +- .../tinkerpop/gremlin/process/Step.java | 8 +- .../apache}/tinkerpop/gremlin/process/T.java | 8 +- .../tinkerpop/gremlin/process/Traversal.java | 40 ++-- .../gremlin/process/TraversalEngine.java | 2 +- .../gremlin/process/TraversalSideEffects.java | 8 +- .../gremlin/process/TraversalStrategies.java | 46 ++-- .../gremlin/process/TraversalStrategy.java | 2 +- .../tinkerpop/gremlin/process/Traverser.java | 8 +- .../gremlin/process/TraverserGenerator.java | 4 +- .../process/computer/ComputerResult.java | 4 +- .../process/computer/GraphComputer.java | 4 +- .../gremlin/process/computer/KeyValue.java | 2 +- .../gremlin/process/computer/MapReduce.java | 10 +- .../gremlin/process/computer/Memory.java | 4 +- .../process/computer/MessageCombiner.java | 2 +- .../process/computer/MessageScope.java | 8 +- .../gremlin/process/computer/Messenger.java | 2 +- .../process/computer/VertexProgram.java | 6 +- .../peerpressure/ClusterCountMapReduce.java | 16 +- .../ClusterPopulationMapReduce.java | 12 +- .../PeerPressureVertexProgram.java | 32 +-- .../computer/lambda/LambdaMapReduce.java | 20 +- .../computer/lambda/LambdaVertexProgram.java | 24 +- .../ranking/pagerank/PageRankMapReduce.java | 12 +- .../pagerank/PageRankMessageCombiner.java | 4 +- .../pagerank/PageRankVertexProgram.java | 32 +-- .../computer/traversal/TraversalScript.java | 10 +- .../traversal/TraversalVertexProgram.java | 62 ++--- ...TraversalVertexProgramMessageCombiner.java | 6 +- .../computer/traversal/TraverserExecutor.java | 20 +- .../traversal/VertexTraversalSideEffects.java | 8 +- .../step/map/ComputerResultStep.java | 30 +-- .../mapreduce/TraverserMapReduce.java | 32 +-- .../util/AbstractVertexProgramBuilder.java | 4 +- .../computer/util/ComputerDataStrategy.java | 22 +- .../computer/util/GraphComputerHelper.java | 14 +- .../computer/util/ImmutableMemory.java | 6 +- .../process/computer/util/LambdaHolder.java | 2 +- .../process/computer/util/MapMemory.java | 12 +- .../process/computer/util/MemoryHelper.java | 4 +- .../computer/util/ScriptEngineCache.java | 2 +- .../computer/util/ScriptEngineLambda.java | 4 +- .../computer/util/StaticMapReduce.java | 6 +- .../computer/util/StaticVertexProgram.java | 4 +- .../computer/util/VertexProgramHelper.java | 8 +- .../traversal/DefaultGraphTraversal.java | 4 +- .../graph/traversal/EdgeTraversal.java | 8 +- .../graph/traversal/ElementTraversal.java | 26 +- .../graph/traversal/GraphTraversal.java | 202 ++++++++-------- .../traversal/VertexPropertyTraversal.java | 8 +- .../graph/traversal/VertexTraversal.java | 8 +- .../gremlin/process/graph/traversal/__.java | 24 +- .../graph/traversal/lambda/LoopTraversal.java | 6 +- .../traversal/step/ComparatorHolder.java | 2 +- .../traversal/step/HasContainerHolder.java | 4 +- .../process/graph/traversal/step/Ranging.java | 2 +- .../traversal/step/SideEffectCapable.java | 2 +- .../traversal/step/TraversalOptionParent.java | 6 +- .../traversal/step/branch/BranchStep.java | 16 +- .../traversal/step/branch/ChooseStep.java | 6 +- .../traversal/step/branch/LocalStep.java | 16 +- .../traversal/step/branch/RepeatStep.java | 20 +- .../traversal/step/branch/UnionStep.java | 10 +- .../graph/traversal/step/filter/AndStep.java | 6 +- .../graph/traversal/step/filter/CoinStep.java | 10 +- .../step/filter/ConjunctionStep.java | 14 +- .../traversal/step/filter/CyclicPathStep.java | 8 +- .../traversal/step/filter/DedupStep.java | 18 +- .../traversal/step/filter/ExceptStep.java | 10 +- .../traversal/step/filter/FilterStep.java | 8 +- .../graph/traversal/step/filter/HasStep.java | 18 +- .../step/filter/HasTraversalStep.java | 16 +- .../graph/traversal/step/filter/IsStep.java | 10 +- .../graph/traversal/step/filter/OrStep.java | 6 +- .../traversal/step/filter/RangeStep.java | 12 +- .../traversal/step/filter/RetainStep.java | 10 +- .../traversal/step/filter/SampleStep.java | 22 +- .../traversal/step/filter/SimplePathStep.java | 8 +- .../traversal/step/filter/TimeLimitStep.java | 10 +- .../traversal/step/filter/WhereStep.java | 12 +- .../graph/traversal/step/map/BackStep.java | 12 +- .../traversal/step/map/CoalesceStep.java | 10 +- .../graph/traversal/step/map/CountStep.java | 12 +- .../step/map/EdgeOtherVertexStep.java | 14 +- .../traversal/step/map/EdgeVertexStep.java | 18 +- .../graph/traversal/step/map/FlatMapStep.java | 8 +- .../graph/traversal/step/map/FoldStep.java | 10 +- .../graph/traversal/step/map/IdStep.java | 8 +- .../graph/traversal/step/map/KeyStep.java | 8 +- .../graph/traversal/step/map/LabelStep.java | 8 +- .../graph/traversal/step/map/MapStep.java | 10 +- .../graph/traversal/step/map/MaxStep.java | 12 +- .../graph/traversal/step/map/MeanStep.java | 12 +- .../graph/traversal/step/map/MinStep.java | 12 +- .../traversal/step/map/OrderGlobalStep.java | 18 +- .../traversal/step/map/OrderLocalStep.java | 16 +- .../graph/traversal/step/map/PathStep.java | 18 +- .../traversal/step/map/PropertiesStep.java | 14 +- .../step/map/PropertyElementStep.java | 10 +- .../traversal/step/map/PropertyMapStep.java | 20 +- .../traversal/step/map/PropertyValueStep.java | 8 +- .../graph/traversal/step/map/SackStep.java | 6 +- .../traversal/step/map/SelectOneStep.java | 8 +- .../graph/traversal/step/map/SelectStep.java | 26 +- .../graph/traversal/step/map/SumStep.java | 12 +- .../graph/traversal/step/map/UnfoldStep.java | 8 +- .../graph/traversal/step/map/VertexStep.java | 16 +- .../traversal/step/map/match/Bindings.java | 2 +- .../step/map/match/CrossJoinEnumerator.java | 2 +- .../traversal/step/map/match/Enumerator.java | 2 +- .../step/map/match/InnerJoinEnumerator.java | 2 +- .../step/map/match/IteratorEnumerator.java | 2 +- .../traversal/step/map/match/MatchStep.java | 22 +- .../step/map/match/SerialEnumerator.java | 2 +- .../step/map/match/SimpleEnumerator.java | 2 +- .../step/sideEffect/AddEdgeStep.java | 14 +- .../step/sideEffect/AggregateStep.java | 30 +-- .../traversal/step/sideEffect/GraphStep.java | 20 +- .../step/sideEffect/GroupCountStep.java | 28 +-- .../traversal/step/sideEffect/GroupStep.java | 36 +-- .../step/sideEffect/IdentityStep.java | 8 +- .../traversal/step/sideEffect/InjectStep.java | 4 +- .../step/sideEffect/ProfileStep.java | 24 +- .../step/sideEffect/SackElementValueStep.java | 10 +- .../step/sideEffect/SackObjectStep.java | 6 +- .../step/sideEffect/SideEffectCapStep.java | 14 +- .../step/sideEffect/SideEffectStep.java | 10 +- .../traversal/step/sideEffect/StartStep.java | 12 +- .../traversal/step/sideEffect/StoreStep.java | 28 +-- .../step/sideEffect/SubgraphStep.java | 24 +- .../traversal/step/sideEffect/TreeStep.java | 32 +-- .../mapreduce/AggregateMapReduce.java | 18 +- .../mapreduce/GroupCountMapReduce.java | 16 +- .../sideEffect/mapreduce/GroupMapReduce.java | 26 +- .../mapreduce/ProfileMapReduce.java | 16 +- .../sideEffect/mapreduce/StoreMapReduce.java | 18 +- .../sideEffect/mapreduce/TreeMapReduce.java | 14 +- .../step/util/CollectingBarrierStep.java | 12 +- .../step/util/ComputerAwareStep.java | 16 +- .../step/util/MarkerIdentityStep.java | 8 +- .../traversal/step/util/PathIdentityStep.java | 10 +- .../step/util/ReducingBarrierStep.java | 16 +- .../step/util/SupplyingBarrierStep.java | 12 +- .../strategy/AbstractTraversalStrategy.java | 6 +- .../ComparatorHolderRemovalStrategy.java | 12 +- .../strategy/ConjunctionStrategy.java | 24 +- .../strategy/DedupOptimizerStrategy.java | 18 +- .../strategy/EngineDependentStrategy.java | 10 +- .../strategy/IdentityRemovalStrategy.java | 10 +- .../strategy/LabeledEndStepStrategy.java | 10 +- .../strategy/MatchWhereStrategy.java | 20 +- .../traversal/strategy/ProfileStrategy.java | 14 +- .../traversal/strategy/ReducingStrategy.java | 16 +- .../strategy/SideEffectCapStrategy.java | 16 +- .../SideEffectRegistrationStrategy.java | 12 +- .../TraversalVerificationStrategy.java | 20 +- .../traversal/util/EmptyGraphTraversal.java | 10 +- .../process/graph/util/HasContainer.java | 15 +- .../gremlin/process/graph/util/Tree.java | 2 +- .../process/traversal/DefaultTraversal.java | 22 +- .../DefaultTraversalSideEffects.java | 12 +- .../traversal/DefaultTraversalStrategies.java | 16 +- .../process/traversal/StepPosition.java | 2 +- .../process/traversal/TraversalMatrix.java | 10 +- .../lambda/AbstractLambdaTraversal.java | 28 +-- .../lambda/ElementValueTraversal.java | 6 +- .../traversal/lambda/FilterTraversal.java | 4 +- .../lambda/FilterTraverserTraversal.java | 4 +- .../traversal/lambda/HasNextTraversal.java | 20 +- .../traversal/lambda/IdentityTraversal.java | 4 +- .../traversal/lambda/MapTraversal.java | 4 +- .../lambda/MapTraverserTraversal.java | 4 +- .../traversal/lambda/OneTraversal.java | 2 +- .../traversal/lambda/TrueTraversal.java | 2 +- .../process/traversal/step/AbstractStep.java | 10 +- .../step/ElementFunctionComparator.java | 4 +- .../step/ElementValueComparator.java | 4 +- .../process/traversal/step/EmptyStep.java | 16 +- .../traversal/step/EngineDependent.java | 4 +- .../step/ExpandableStepIterator.java | 10 +- .../process/traversal/step/MapReducer.java | 4 +- .../process/traversal/step/Reducing.java | 2 +- .../process/traversal/step/Reversible.java | 2 +- .../traversal/step/SideEffectRegistrar.java | 2 +- .../traversal/step/TraversalParent.java | 10 +- .../traversal/util/EmptyTraversal.java | 28 +-- .../util/EmptyTraversalSideEffects.java | 6 +- .../util/EmptyTraversalStrategies.java | 14 +- .../traversal/util/SideEffectHelper.java | 4 +- .../traversal/util/TraversalHelper.java | 24 +- .../process/traversal/util/TraversalRing.java | 6 +- .../process/traversal/util/TraversalUtil.java | 6 +- .../traverser/B_O_PA_S_SE_SL_Traverser.java | 16 +- .../B_O_PA_S_SE_SL_TraverserGenerator.java | 8 +- .../traverser/B_O_P_PA_S_SE_SL_Traverser.java | 8 +- .../B_O_P_PA_S_SE_SL_TraverserGenerator.java | 8 +- .../process/traverser/B_O_Traverser.java | 4 +- .../traverser/B_O_TraverserGenerator.java | 8 +- .../process/traverser/O_Traverser.java | 4 +- .../traverser/O_TraverserGenerator.java | 8 +- .../traverser/TraverserGeneratorFactory.java | 6 +- .../traverser/TraverserRequirement.java | 6 +- .../traverser/util/AbstractPathTraverser.java | 20 +- .../traverser/util/AbstractTraverser.java | 24 +- .../DefaultTraverserGeneratorFactory.java | 18 +- .../traverser/util/EmptyTraverser.java | 16 +- .../gremlin/process/util/BulkSet.java | 2 +- .../gremlin/process/util/MapHelper.java | 2 +- .../gremlin/process/util/TraverserSet.java | 4 +- .../process/util/metric/ImmutableMetrics.java | 2 +- .../gremlin/process/util/metric/Metrics.java | 2 +- .../process/util/metric/MutableMetrics.java | 2 +- .../util/metric/StandardTraversalMetrics.java | 2 +- .../process/util/metric/TraversalMetrics.java | 5 +- .../gremlin/process/util/path/EmptyPath.java | 4 +- .../process/util/path/ImmutablePath.java | 4 +- .../process/util/path/MutablePath.java | 4 +- .../gremlin/process/util/path/SparsePath.java | 4 +- .../tinkerpop/gremlin/structure/Compare.java | 2 +- .../tinkerpop/gremlin/structure/Contains.java | 2 +- .../gremlin/structure/Direction.java | 2 +- .../tinkerpop/gremlin/structure/Edge.java | 6 +- .../tinkerpop/gremlin/structure/Element.java | 8 +- .../tinkerpop/gremlin/structure/Graph.java | 112 ++++----- .../tinkerpop/gremlin/structure/Operator.java | 2 +- .../tinkerpop/gremlin/structure/Order.java | 2 +- .../tinkerpop/gremlin/structure/Property.java | 4 +- .../gremlin/structure/PropertyType.java | 2 +- .../gremlin/structure/Transaction.java | 4 +- .../tinkerpop/gremlin/structure/Vertex.java | 8 +- .../gremlin/structure/VertexProperty.java | 8 +- .../gremlin/structure/io/DefaultIo.java | 4 +- .../gremlin/structure/io/GraphMigrator.java | 10 +- .../gremlin/structure/io/GraphReader.java | 16 +- .../gremlin/structure/io/GraphWriter.java | 12 +- .../gremlin/structure/io/Mapper.java | 2 +- .../structure/io/graphml/GraphMLReader.java | 26 +- .../structure/io/graphml/GraphMLTokens.java | 2 +- .../structure/io/graphml/GraphMLWriter.java | 18 +- .../io/graphml/GraphMLWriterHelper.java | 2 +- .../structure/io/graphson/GraphSONGraph.java | 8 +- .../structure/io/graphson/GraphSONMapper.java | 6 +- .../structure/io/graphson/GraphSONModule.java | 14 +- .../structure/io/graphson/GraphSONReader.java | 30 +-- .../graphson/GraphSONSerializerProvider.java | 2 +- .../structure/io/graphson/GraphSONTokens.java | 2 +- .../structure/io/graphson/GraphSONVertex.java | 10 +- .../io/graphson/GraphSONVertexProperty.java | 10 +- .../structure/io/graphson/GraphSONWriter.java | 16 +- .../io/graphson/LegacyGraphSONReader.java | 20 +- .../structure/io/kryo/EdgeTerminator.java | 2 +- .../structure/io/kryo/EntrySerializer.java | 2 +- .../structure/io/kryo/GraphSerializer.java | 26 +- .../io/kryo/GremlinClassResolver.java | 22 +- .../gremlin/structure/io/kryo/KryoMapper.java | 52 ++-- .../gremlin/structure/io/kryo/KryoReader.java | 18 +- .../gremlin/structure/io/kryo/KryoWriter.java | 16 +- .../structure/io/kryo/URISerializer.java | 2 +- .../structure/io/kryo/UUIDSerializer.java | 2 +- .../io/kryo/VertexByteArrayInputStream.java | 6 +- .../structure/io/kryo/VertexTerminator.java | 2 +- .../structure/server/ClusterAware.java | 2 +- .../structure/server/IntervalVertexRange.java | 2 +- .../gremlin/structure/server/Partition.java | 2 +- .../gremlin/structure/server/VertexRange.java | 2 +- .../structure/strategy/GraphStrategy.java | 222 +++++++++--------- .../structure/strategy/IdStrategy.java | 26 +- .../structure/strategy/IdentityStrategy.java | 4 +- .../structure/strategy/PartitionStrategy.java | 46 ++-- .../structure/strategy/ReadOnlyStrategy.java | 16 +- .../structure/strategy/SequenceStrategy.java | 20 +- .../structure/strategy/StrategyContext.java | 6 +- .../structure/strategy/StrategyEdge.java | 20 +- .../structure/strategy/StrategyElement.java | 6 +- .../structure/strategy/StrategyGraph.java | 32 +-- .../structure/strategy/StrategyProperty.java | 16 +- .../structure/strategy/StrategyVariables.java | 8 +- .../structure/strategy/StrategyVertex.java | 20 +- .../strategy/StrategyVertexProperty.java | 18 +- .../structure/strategy/StrategyWrapped.java | 2 +- .../structure/strategy/SubgraphStrategy.java | 20 +- .../step/sideEffect/StrategyGraphStep.java | 18 +- .../gremlin/structure/util/Comparators.java | 10 +- .../gremlin/structure/util/ElementHelper.java | 68 +++--- .../structure/util/FeatureDescriptor.java | 2 +- .../gremlin/structure/util/GraphFactory.java | 24 +- .../structure/util/GraphVariableHelper.java | 4 +- .../gremlin/structure/util/StringFactory.java | 50 ++-- .../structure/util/batch/BatchFeatures.java | 4 +- .../structure/util/batch/BatchGraph.java | 48 ++-- .../gremlin/structure/util/batch/Exists.java | 8 +- .../structure/util/batch/VertexIdType.java | 12 +- .../batch/cache/AbstractIDVertexCache.java | 4 +- .../util/batch/cache/LongIDVertexCache.java | 4 +- .../util/batch/cache/ObjectIDVertexCache.java | 2 +- .../util/batch/cache/StringCompression.java | 2 +- .../util/batch/cache/StringIDVertexCache.java | 4 +- .../util/batch/cache/URLCompression.java | 2 +- .../util/batch/cache/VertexCache.java | 4 +- .../structure/util/detached/Attachable.java | 6 +- .../structure/util/detached/DetachedEdge.java | 24 +- .../util/detached/DetachedElement.java | 10 +- .../util/detached/DetachedFactory.java | 14 +- .../structure/util/detached/DetachedPath.java | 14 +- .../util/detached/DetachedProperty.java | 16 +- .../util/detached/DetachedVertex.java | 22 +- .../util/detached/DetachedVertexProperty.java | 18 +- .../structure/util/empty/EmptyGraph.java | 22 +- .../structure/util/empty/EmptyProperty.java | 8 +- .../util/empty/EmptyVertexProperty.java | 12 +- .../structure/util/wrapped/WrappedEdge.java | 2 +- .../util/wrapped/WrappedElement.java | 2 +- .../structure/util/wrapped/WrappedGraph.java | 2 +- .../util/wrapped/WrappedProperty.java | 2 +- .../util/wrapped/WrappedVariables.java | 2 +- .../structure/util/wrapped/WrappedVertex.java | 2 +- .../util/wrapped/WrappedVertexProperty.java | 2 +- .../tinkerpop/gremlin/util/Gremlin.java | 2 +- .../tinkerpop/gremlin/util/Serializer.java | 2 +- .../tinkerpop/gremlin/util/StreamFactory.java | 2 +- .../tinkerpop/gremlin/util/TimeUtil.java | 2 +- .../util/config/YamlConfiguration.java | 2 +- .../gremlin/util/function/FunctionUtils.java | 2 +- .../util/function/ThrowingBiConsumer.java | 2 +- .../util/function/ThrowingConsumer.java | 2 +- .../util/function/ThrowingFunction.java | 2 +- .../util/function/ThrowingSupplier.java | 2 +- .../util/function/TraversableLambda.java | 4 +- .../gremlin/util/function/TriConsumer.java | 2 +- .../gremlin/util/function/TriFunction.java | 2 +- .../gremlin/util/iterator/ArrayIterator.java | 4 +- .../gremlin/util/iterator/DoubleIterator.java | 4 +- .../gremlin/util/iterator/IteratorUtils.java | 4 +- .../gremlin/util/iterator/MultiIterator.java | 4 +- .../gremlin/util/iterator/SingleIterator.java | 4 +- .../gremlin/util/tools/MultiMap.java | 2 +- .../gremlin/util/tools/TimeUtils.java | 2 +- gremlin-driver/pom.xml | 6 +- .../tinkerpop/gremlin/driver/Channelizer.java | 12 +- .../tinkerpop/gremlin/driver/Client.java | 10 +- .../tinkerpop/gremlin/driver/Cluster.java | 4 +- .../tinkerpop/gremlin/driver/ClusterInfo.java | 2 +- .../tinkerpop/gremlin/driver/Connection.java | 8 +- .../gremlin/driver/ConnectionPool.java | 6 +- .../tinkerpop/gremlin/driver/Handler.java | 8 +- .../tinkerpop/gremlin/driver/Host.java | 2 +- .../gremlin/driver/LoadBalancingStrategy.java | 4 +- .../gremlin/driver/MessageSerializer.java | 14 +- .../gremlin/driver/ResponseQueue.java | 6 +- .../tinkerpop/gremlin/driver/Result.java | 10 +- .../tinkerpop/gremlin/driver/ResultSet.java | 6 +- .../tinkerpop/gremlin/driver/Settings.java | 4 +- .../tinkerpop/gremlin/driver/Tokens.java | 2 +- .../driver/exception/ConnectionException.java | 2 +- .../driver/exception/ResponseException.java | 4 +- .../handler/NioGremlinRequestEncoder.java | 8 +- .../handler/NioGremlinResponseDecoder.java | 4 +- .../handler/WebSocketClientHandler.java | 2 +- .../WebSocketGremlinRequestEncoder.java | 8 +- .../WebSocketGremlinResponseDecoder.java | 6 +- .../driver/message/RequestMessage.java | 4 +- .../driver/message/ResponseMessage.java | 2 +- .../driver/message/ResponseResult.java | 2 +- .../driver/message/ResponseStatus.java | 2 +- .../driver/message/ResponseStatusCode.java | 4 +- .../AbstractJsonMessageSerializerV1d0.java | 14 +- .../driver/ser/JsonBuilderKryoSerializer.java | 2 +- .../ser/JsonMessageSerializerGremlinV1d0.java | 4 +- .../driver/ser/JsonMessageSerializerV1d0.java | 10 +- .../driver/ser/KryoMessageSerializerV1d0.java | 18 +- .../driver/ser/MessageTextSerializer.java | 8 +- .../gremlin/driver/ser/SerTokens.java | 2 +- .../driver/ser/SerializationException.java | 2 +- .../gremlin/driver/ser/Serializers.java | 8 +- .../gremlin/driver/simple/NioClient.java | 14 +- .../gremlin/driver/simple/SimpleClient.java | 8 +- .../driver/simple/WebSocketClient.java | 16 +- .../tinkerpop/gremlin/driver/HostTest.java | 2 +- .../gremlin/driver/RequestMessageTest.java | 4 +- .../tinkerpop/gremlin/driver/ResultTest.java | 16 +- .../benchmark/ProfilingApplication.java | 6 +- .../JsonMessageSerializerGremlinV1d0Test.java | 26 +- .../ser/JsonMessageSerializerV1d0Test.java | 26 +- .../ser/KryoMessageSerializerV1d0Test.java | 30 +-- gremlin-groovy-test/pom.xml | 6 +- .../groovy/loaders/GremlinLoaderTest.groovy | 4 +- .../groovy/loaders/SugarLoaderTest.groovy | 12 +- .../groovy/util/SugarTestHelper.groovy | 4 +- .../gremlin/process/ComputerTestHelper.groovy | 10 +- .../computer/GroovyGraphComputerTest.groovy | 8 +- .../step/branch/GroovyBranchTest.groovy | 12 +- .../step/branch/GroovyChooseTest.groovy | 14 +- .../step/branch/GroovyLocalTest.groovy | 18 +- .../step/branch/GroovyRepeatTest.groovy | 18 +- .../step/branch/GroovyUnionTest.groovy | 14 +- .../step/filter/GroovyAndTest.groovy | 24 +- .../step/filter/GroovyCoinTest.groovy | 10 +- .../step/filter/GroovyCyclicPathTest.groovy | 12 +- .../step/filter/GroovyDedupTest.groovy | 12 +- .../step/filter/GroovyExceptTest.groovy | 16 +- .../step/filter/GroovyFilterTest.groovy | 12 +- .../step/filter/GroovyHasNotTest.groovy | 10 +- .../step/filter/GroovyHasTest.groovy | 22 +- .../traversal/step/filter/GroovyIsTest.groovy | 14 +- .../traversal/step/filter/GroovyOrTest.groovy | 24 +- .../step/filter/GroovyRangeTest.groovy | 12 +- .../step/filter/GroovyRetainTest.groovy | 10 +- .../step/filter/GroovySampleTest.groovy | 14 +- .../step/filter/GroovySimplePathTest.groovy | 16 +- .../step/filter/GroovyWhereTest.groovy | 14 +- .../traversal/step/map/GroovyBackTest.groovy | 16 +- .../step/map/GroovyCoalesceTest.groovy | 16 +- .../traversal/step/map/GroovyCountTest.groovy | 12 +- .../traversal/step/map/GroovyFoldTest.groovy | 10 +- .../traversal/step/map/GroovyMapTest.groovy | 10 +- .../traversal/step/map/GroovyMatchTest.groovy | 16 +- .../traversal/step/map/GroovyMaxTest.groovy | 12 +- .../traversal/step/map/GroovyMeanTest.groovy | 10 +- .../traversal/step/map/GroovyMinTest.groovy | 12 +- .../traversal/step/map/GroovyOrderTest.groovy | 16 +- .../traversal/step/map/GroovyPathTest.groovy | 14 +- .../step/map/GroovyPropertiesTest.groovy | 10 +- .../step/map/GroovySelectTest.groovy | 12 +- .../step/map/GroovyUnfoldTest.groovy | 12 +- .../step/map/GroovyValueMapTest.groovy | 10 +- .../step/map/GroovyVertexTest.groovy | 18 +- .../step/sideEffect/GroovyAddEdgeTest.groovy | 8 +- .../sideEffect/GroovyAggregateTest.groovy | 12 +- .../sideEffect/GroovyGroupCountTest.groovy | 12 +- .../step/sideEffect/GroovyGroupTest.groovy | 12 +- .../step/sideEffect/GroovyInjectTest.groovy | 10 +- .../step/sideEffect/GroovyProfileTest.groovy | 16 +- .../step/sideEffect/GroovySackTest.groovy | 14 +- .../sideEffect/GroovySideEffectCapTest.groovy | 14 +- .../sideEffect/GroovySideEffectTest.groovy | 8 +- .../step/sideEffect/GroovyStoreTest.groovy | 12 +- .../step/sideEffect/GroovySubgraphTest.groovy | 12 +- .../step/sideEffect/GroovyTreeTest.groovy | 14 +- .../GroovyEnvironmentIntegrateSuite.java | 14 +- .../groovy/GroovyEnvironmentSuite.java | 22 +- .../groovy/engine/GremlinExecutorTest.java | 12 +- .../engine/GroovyTraversalScriptTest.java | 8 +- ...remlinGroovyScriptEngineIntegrateTest.java | 8 +- .../jsr223/GremlinGroovyScriptEngineTest.java | 30 +-- .../process/GroovyProcessComputerSuite.java | 22 +- .../process/GroovyProcessStandardSuite.java | 20 +- .../META-INF/javax.script.ScriptEngineFactory | 2 +- .../services/javax.script.ScriptEngineFactory | 2 +- .../groovy/engine/GremlinExecutorInit.groovy | 0 .../DefaultImportCustomizerProviderTest.java | 4 +- gremlin-groovy/pom.xml | 6 +- .../groovy/loaders/GremlinLoader.groovy | 18 +- .../groovy/loaders/ObjectLoader.groovy | 2 +- .../gremlin/groovy/loaders/StepLoader.groovy | 8 +- .../gremlin/groovy/loaders/SugarLoader.groovy | 16 +- .../groovy/util/DependencyGrabber.groovy | 4 +- .../groovy/util/MetaRegistryUtil.groovy | 2 +- .../AbstractImportCustomizerProvider.java | 68 +++--- .../groovy/CompilerCustomizerProvider.java | 2 +- .../DefaultImportCustomizerProvider.java | 2 +- .../groovy/EmptyImportCustomizerProvider.java | 4 +- .../groovy/ImportCustomizerProvider.java | 2 +- .../groovy/NoImportCustomizerProvider.java | 2 +- .../groovy/SecurityCustomizerProvider.java | 2 +- .../groovy/engine/GremlinExecutor.java | 9 +- .../groovy/engine/GroovyTraversalScript.java | 26 +- .../gremlin/groovy/engine/ScriptEngines.java | 18 +- .../gremlin/groovy/function/GComparator.java | 2 +- .../gremlin/groovy/function/GFunction.java | 2 +- .../groovy/jsr223/DependencyManager.java | 16 +- .../jsr223/GremlinGroovyClassLoader.java | 2 +- .../jsr223/GremlinGroovyScriptEngine.java | 21 +- .../GremlinGroovyScriptEngineFactory.java | 4 +- .../jsr223/ManagedConcurrentValueMap.java | 2 +- .../jsr223/ScriptEnginePluginAcceptor.java | 6 +- .../gremlin/groovy/jsr223/ScriptExecutor.java | 2 +- .../groovy/plugin/AbstractGremlinPlugin.java | 4 +- .../gremlin/groovy/plugin/Artifact.java | 2 +- .../gremlin/groovy/plugin/GremlinPlugin.java | 4 +- .../groovy/plugin/GremlinPluginException.java | 2 +- .../plugin/IllegalEnvironmentException.java | 2 +- .../gremlin/groovy/plugin/PluginAcceptor.java | 2 +- .../plugin/PluginInitializationException.java | 2 +- .../gremlin/groovy/plugin/RemoteAcceptor.java | 8 +- .../groovy/plugin/RemoteException.java | 4 +- .../groovy/plugin/SugarGremlinPlugin.java | 4 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 - ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 + .../conf/gremlin-server-classic.yaml | 4 +- gremlin-server/conf/gremlin-server-min.yaml | 4 +- .../conf/gremlin-server-modern.yaml | 4 +- gremlin-server/conf/gremlin-server-neo4j.yaml | 10 +- .../conf/gremlin-server-rest-modern.yaml | 6 +- gremlin-server/conf/gremlin-server.yaml | 12 +- gremlin-server/conf/log4j-server.properties | 4 +- gremlin-server/conf/neo4j-empty.properties | 2 +- .../conf/tinkergraph-empty.properties | 2 +- gremlin-server/pom.xml | 14 +- .../src/main/bin/gremlin-server.bat | 4 +- gremlin-server/src/main/bin/gremlin-server.sh | 4 +- .../gremlin/server/AbstractChannelizer.java | 17 +- .../tinkerpop/gremlin/server/Channelizer.java | 7 +- .../tinkerpop/gremlin/server/Context.java | 8 +- .../tinkerpop/gremlin/server/Graphs.java | 10 +- .../gremlin/server/GremlinServer.java | 8 +- .../tinkerpop/gremlin/server/OpProcessor.java | 6 +- .../tinkerpop/gremlin/server/Settings.java | 10 +- .../server/channel/HttpChannelizer.java | 17 +- .../server/channel/NioChannelizer.java | 16 +- .../server/channel/WebSocketChannelizer.java | 18 +- .../handler/HttpGremlinEndpointHandler.java | 22 +- .../server/handler/IteratorHandler.java | 12 +- .../NioGremlinBinaryRequestDecoder.java | 10 +- .../handler/NioGremlinResponseEncoder.java | 14 +- .../server/handler/OpExecutorHandler.java | 16 +- .../server/handler/OpSelectorHandler.java | 26 +- .../gremlin/server/handler/StateKey.java | 6 +- .../WsGremlinBinaryRequestDecoder.java | 10 +- .../handler/WsGremlinResponseEncoder.java | 16 +- .../handler/WsGremlinTextRequestDecoder.java | 10 +- .../server/op/AbstractEvalOpProcessor.java | 30 +-- .../tinkerpop/gremlin/server/op/OpLoader.java | 6 +- .../server/op/OpProcessorException.java | 4 +- .../server/op/control/ControlOpProcessor.java | 22 +- .../gremlin/server/op/control/ControlOps.java | 18 +- .../gremlin/server/op/session/Session.java | 10 +- .../server/op/session/SessionOpProcessor.java | 22 +- .../gremlin/server/op/session/SessionOps.java | 18 +- .../op/standard/StandardOpProcessor.java | 10 +- .../server/op/standard/StandardOps.java | 12 +- .../server/util/GremlinServerInstall.java | 6 +- .../gremlin/server/util/MetricManager.java | 2 +- .../com.tinkerpop.gremlin.server.OpProcessor | 3 - ...pache.tinkerpop.gremlin.server.OpProcessor | 3 + .../AbstractGremlinServerIntegrationTest.java | 2 +- .../AbstractGremlinServerPerformanceTest.java | 2 +- .../tinkerpop/gremlin/server/GraphsTest.java | 6 +- .../GremlinAdditionPerformanceTest.java | 10 +- .../server/GremlinDriverIntegrateTest.java | 26 +- .../GremlinServerHttpIntegrateTest.java | 4 +- .../server/GremlinServerIntegrateTest.java | 34 +-- .../GremlinTraversalPerformanceTest.java | 8 +- .../server/gremlin-server-integration.yaml | 10 +- .../server/gremlin-server-performance.yaml | 8 +- .../GremlinServerAdditionSimulation.scala | 4 +- gremlin-test/pom.xml | 6 +- .../gremlin/AbstractGraphProvider.java | 10 +- .../gremlin/AbstractGremlinSuite.java | 16 +- .../gremlin/AbstractGremlinTest.java | 18 +- .../tinkerpop/gremlin/ExceptionCoverage.java | 2 +- .../gremlin/ExceptionCoverageSet.java | 2 +- .../tinkerpop/gremlin/FeatureRequirement.java | 4 +- .../gremlin/FeatureRequirementSet.java | 8 +- .../gremlin/FeatureRequirements.java | 2 +- .../tinkerpop/gremlin/GraphManager.java | 2 +- .../tinkerpop/gremlin/GraphProvider.java | 68 +++--- .../tinkerpop/gremlin/LoadGraphWith.java | 20 +- .../apache}/tinkerpop/gremlin/TestHelper.java | 2 +- .../generator/AbstractGeneratorTest.java | 10 +- .../generator/CommunityGeneratorTest.java | 16 +- .../generator/DistributionGeneratorTest.java | 16 +- .../process/AbstractGremlinProcessTest.java | 6 +- .../gremlin/process/ProcessComputerSuite.java | 30 +-- .../process/ProcessPerformanceSuite.java | 14 +- .../gremlin/process/ProcessStandardSuite.java | 38 +-- .../process/TraversalPerformanceTest.java | 8 +- .../process/computer/GraphComputerTest.java | 24 +- .../ranking/PageRankVertexProgramTest.java | 12 +- .../util/ComputerDataStrategyTest.java | 10 +- .../traversal/step/branch/BranchTest.java | 14 +- .../traversal/step/branch/ChooseTest.java | 20 +- .../traversal/step/branch/LocalTest.java | 24 +- .../traversal/step/branch/RepeatTest.java | 22 +- .../traversal/step/branch/UnionTest.java | 14 +- .../graph/traversal/step/filter/AndTest.java | 24 +- .../graph/traversal/step/filter/CoinTest.java | 12 +- .../traversal/step/filter/CyclicPathTest.java | 14 +- .../traversal/step/filter/DedupTest.java | 16 +- .../traversal/step/filter/ExceptTest.java | 20 +- .../traversal/step/filter/FilterTest.java | 14 +- .../traversal/step/filter/HasNotTest.java | 16 +- .../graph/traversal/step/filter/HasTest.java | 28 +-- .../graph/traversal/step/filter/IsTest.java | 16 +- .../graph/traversal/step/filter/OrTest.java | 24 +- .../traversal/step/filter/RangeTest.java | 14 +- .../traversal/step/filter/RetainTest.java | 12 +- .../traversal/step/filter/SampleTest.java | 16 +- .../traversal/step/filter/SimplePathTest.java | 16 +- .../traversal/step/filter/WhereTest.java | 16 +- .../graph/traversal/step/map/BackTest.java | 16 +- .../traversal/step/map/CoalesceTest.java | 22 +- .../graph/traversal/step/map/CountTest.java | 16 +- .../graph/traversal/step/map/FoldTest.java | 13 +- .../graph/traversal/step/map/MapTest.java | 12 +- .../graph/traversal/step/map/MatchTest.java | 44 ++-- .../graph/traversal/step/map/MaxTest.java | 14 +- .../graph/traversal/step/map/MeanTest.java | 12 +- .../graph/traversal/step/map/MinTest.java | 14 +- .../graph/traversal/step/map/OrderTest.java | 20 +- .../graph/traversal/step/map/PathTest.java | 16 +- .../traversal/step/map/PropertiesTest.java | 12 +- .../graph/traversal/step/map/SelectTest.java | 18 +- .../graph/traversal/step/map/UnfoldTest.java | 14 +- .../traversal/step/map/ValueMapTest.java | 12 +- .../graph/traversal/step/map/VertexTest.java | 22 +- .../step/sideEffect/AddEdgeTest.java | 18 +- .../step/sideEffect/AggregateTest.java | 18 +- .../step/sideEffect/GroupCountTest.java | 14 +- .../traversal/step/sideEffect/GroupTest.java | 14 +- .../traversal/step/sideEffect/InjectTest.java | 16 +- .../step/sideEffect/ProfileTest.java | 26 +- .../traversal/step/sideEffect/SackTest.java | 16 +- .../step/sideEffect/SideEffectCapTest.java | 16 +- .../step/sideEffect/SideEffectTest.java | 12 +- .../traversal/step/sideEffect/StoreTest.java | 16 +- .../step/sideEffect/SubgraphTest.java | 24 +- .../traversal/step/sideEffect/TreeTest.java | 18 +- .../step/util/TraversalSideEffectsTest.java | 12 +- .../TraversalVerificationStrategyTest.java | 12 +- .../process/traversal/CoreTraversalTest.java | 34 +-- .../traversal/DefaultTraversalTest.java | 9 +- .../gremlin/process/util/PathTest.java | 14 +- .../gremlin/structure/BatchTest.java | 22 +- .../tinkerpop/gremlin/structure/EdgeTest.java | 18 +- .../gremlin/structure/FeatureSupportTest.java | 58 ++--- .../structure/GraphConstructionTest.java | 14 +- .../structure/GraphReadPerformanceTest.java | 10 +- .../gremlin/structure/GraphTest.java | 28 +-- .../structure/GraphWritePerformanceTest.java | 14 +- .../tinkerpop/gremlin/structure/IoTest.java | 62 ++--- .../gremlin/structure/MockSerializable.java | 2 +- .../gremlin/structure/PropertyTest.java | 38 +-- .../gremlin/structure/SerializationTest.java | 14 +- .../structure/StructurePerformanceSuite.java | 18 +- .../structure/StructureStandardSuite.java | 38 +-- .../gremlin/structure/TransactionTest.java | 20 +- .../gremlin/structure/VariablesTest.java | 26 +- .../gremlin/structure/VertexPropertyTest.java | 18 +- .../gremlin/structure/VertexTest.java | 32 +-- .../io/graphml/GraphMLResourceAccess.java | 2 +- .../io/graphson/GraphSONResourceAccess.java | 2 +- .../structure/io/kryo/KryoResourceAccess.java | 2 +- .../io/script/ScriptResourceAccess.java | 2 +- .../structure/strategy/IdStrategyTest.java | 22 +- .../strategy/PartitionStrategyTest.java | 15 +- .../strategy/ReadOnlyStrategyTest.java | 28 +-- .../strategy/SequenceStrategyTest.java | 26 +- .../structure/strategy/StrategyGraphTest.java | 36 +-- .../strategy/SubgraphStrategyTest.java | 16 +- .../util/detached/DetachedEdgeTest.java | 24 +- .../util/detached/DetachedPropertyTest.java | 20 +- .../detached/DetachedVertexPropertyTest.java | 14 +- .../util/detached/DetachedVertexTest.java | 22 +- .../structure/io/graphml/graph-types.xml | 0 .../structure/io/graphml/graphml-1.1.xsd | 0 .../structure/io/graphml/grateful-dead.xml | 0 .../graphml/tinkerpop-classic-normalized.xml | 0 .../io/graphml/tinkerpop-classic.xml | 0 .../structure/io/graphml/tinkerpop-modern.xml | 0 .../io/graphson/grateful-dead-vertices.ldjson | 0 .../structure/io/graphson/grateful-dead.json | 0 .../io/graphson/tinkerpop-classic-legacy.json | 0 .../tinkerpop-classic-normalized.json | 0 .../io/graphson/tinkerpop-classic-typed.json | 0 .../tinkerpop-classic-vertices.ldjson | 0 .../io/graphson/tinkerpop-classic.json | 0 .../io/graphson/tinkerpop-crew-typed.json | 0 .../structure/io/graphson/tinkerpop-crew.json | 0 .../graphson/tinkerpop-modern-normalized.json | 0 .../io/graphson/tinkerpop-modern-typed.json | 0 .../io/graphson/tinkerpop-modern.json | 0 .../io/kryo/grateful-dead-vertices.gio | Bin .../structure/io/kryo/grateful-dead.gio | Bin .../io/kryo/tinkerpop-classic-vertices.gio | Bin .../structure/io/kryo/tinkerpop-classic.gio | Bin .../io/kryo/tinkerpop-crew-vertices.gio | Bin .../structure/io/kryo/tinkerpop-crew.gio | Bin .../io/kryo/tinkerpop-modern-vertices.gio | Bin .../structure/io/kryo/tinkerpop-modern.gio | Bin .../structure/io/script/script-input.groovy | 0 .../structure/io/script/script-output.groovy | 0 .../structure/io/script/tinkerpop-classic.txt | 0 .../process/TraversalStrategiesTest.java | 6 +- .../process/graph/step/util/TreeTest.java | 4 +- .../traversal/GraphTraversalMethodsTest.java | 9 +- .../gremlin/process/util/BulkSetTest.java | 2 +- .../process/util/TraversalHelperTest.java | 28 +-- .../gremlin/structure/CompareTest.java | 2 +- .../structure/ExceptionCoverageTest.java | 16 +- .../structure/FeaturesConventionTest.java | 4 +- .../gremlin/structure/GraphHiddenTest.java | 2 +- .../structure/io/kryo/KryoMapperTest.java | 2 +- .../structure/util/ElementHelperTest.java | 16 +- .../util/config/YamlConfigurationTest.java | 2 +- .../util/function/TriConsumerTest.java | 2 +- .../util/function/TriFunctionTest.java | 2 +- .../conf/hadoop-graphson.properties | 8 +- hadoop-gremlin/conf/hadoop-kryo.properties | 10 +- hadoop-gremlin/pom.xml | 12 +- .../hadoop/groovy/plugin/HadoopLoader.groovy | 16 +- .../tinkerpop/gremlin/hadoop/Constants.java | 4 +- .../groovy/plugin/HadoopGremlinPlugin.java | 36 +-- .../groovy/plugin/HadoopRemoteAcceptor.java | 22 +- .../process/computer/HadoopCombine.java | 8 +- .../hadoop/process/computer/HadoopMap.java | 10 +- .../hadoop/process/computer/HadoopReduce.java | 8 +- .../computer/example/TraversalSupplier1.java | 6 +- .../computer/example/TraversalSupplier2.java | 6 +- .../computer/example/TraversalSupplier3.java | 6 +- .../computer/giraph/EmptyOutEdges.java | 2 +- .../computer/giraph/GiraphComputeVertex.java | 40 ++-- .../computer/giraph/GiraphGraphComputer.java | 38 +-- .../process/computer/giraph/GiraphMemory.java | 18 +- .../giraph/GiraphMessageCombiner.java | 10 +- .../computer/giraph/GiraphMessenger.java | 24 +- .../computer/giraph/GiraphWorkerContext.java | 10 +- .../computer/giraph/MemoryAggregator.java | 2 +- .../process/computer/giraph/RuleWritable.java | 4 +- .../giraph/io/GiraphVertexInputFormat.java | 6 +- .../giraph/io/GiraphVertexOutputFormat.java | 6 +- .../giraph/io/GiraphVertexReader.java | 6 +- .../giraph/io/GiraphVertexWriter.java | 6 +- .../mapreduce/MapReduceGraphComputer.java | 2 +- .../computer/util/MapReduceHelper.java | 26 +- .../computer/util/MemoryMapReduce.java | 22 +- .../strategy/HadoopElementStepStrategy.java | 26 +- .../hadoop/structure/HadoopConfiguration.java | 8 +- .../gremlin/hadoop/structure/HadoopEdge.java | 14 +- .../hadoop/structure/HadoopElement.java | 12 +- .../gremlin/hadoop/structure/HadoopGraph.java | 70 +++--- .../structure/HadoopGraphVariables.java | 8 +- .../hadoop/structure/HadoopProperty.java | 8 +- .../hadoop/structure/HadoopVertex.java | 16 +- .../structure/HadoopVertexProperty.java | 18 +- .../hadoop/structure/hdfs/HDFSTools.java | 2 +- .../structure/hdfs/HadoopEdgeIterator.java | 14 +- .../structure/hdfs/HadoopElementIterator.java | 12 +- .../structure/hdfs/HadoopVertexIterator.java | 12 +- .../structure/hdfs/HiddenFileFilter.java | 2 +- .../hadoop/structure/hdfs/TextIterator.java | 4 +- .../structure/io/CommonFileOutputFormat.java | 2 +- .../hadoop/structure/io/ObjectWritable.java | 4 +- .../io/ObjectWritableComparator.java | 6 +- .../structure/io/ObjectWritableIterator.java | 8 +- .../hadoop/structure/io/VertexWritable.java | 20 +- .../io/graphson/GraphSONInputFormat.java | 4 +- .../io/graphson/GraphSONOutputFormat.java | 6 +- .../io/graphson/GraphSONRecordReader.java | 20 +- .../io/graphson/GraphSONRecordWriter.java | 8 +- .../structure/io/kryo/KryoInputFormat.java | 4 +- .../structure/io/kryo/KryoOutputFormat.java | 6 +- .../structure/io/kryo/KryoRecordReader.java | 6 +- .../structure/io/kryo/KryoRecordWriter.java | 8 +- .../io/kryo/VertexStreamIterator.java | 22 +- .../io/script/ScriptInputFormat.java | 4 +- .../io/script/ScriptOutputFormat.java | 6 +- .../io/script/ScriptRecordReader.java | 18 +- .../io/script/ScriptRecordWriter.java | 6 +- .../hadoop/structure/util/ConfUtil.java | 2 +- .../hadoop/structure/util/HadoopHelper.java | 6 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 - .../services/javax.script.ScriptEngineFactory | 2 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 + .../gremlin/hadoop/HadoopGraphProvider.java | 36 +-- .../HadoopGraphProcessStandardTest.java | 8 +- ...aphGroovyProcessComputerIntegrateTest.java | 10 +- .../HadoopGraphGroovyProcessStandardTest.java | 10 +- .../io/HadoopGraphStructureStandardTest.java | 8 +- .../GraphSONRecordReaderWriterTest.java | 10 +- .../io/graphson/VertexStreamIteratorTest.java | 14 +- .../io/kryo/KryoRecordReaderWriterTest.java | 10 +- .../script/ScriptRecordReaderWriterTest.java | 10 +- .../computer/giraph/zookeeper-3.3.3.jar | Bin neo4j-gremlin/pom.xml | 10 +- .../groovy/plugin/Neo4jGremlinPlugin.java | 12 +- .../step/sideEffect/Neo4jGraphStep.java | 38 +-- .../step/util/Neo4jCypherIterator.java | 8 +- .../strategy/Neo4jGraphStepStrategy.java | 18 +- .../gremlin/neo4j/structure/Neo4jEdge.java | 18 +- .../gremlin/neo4j/structure/Neo4jElement.java | 14 +- .../gremlin/neo4j/structure/Neo4jGraph.java | 38 +-- .../neo4j/structure/Neo4jGraphVariables.java | 8 +- .../gremlin/neo4j/structure/Neo4jHelper.java | 4 +- .../neo4j/structure/Neo4jProperty.java | 12 +- .../gremlin/neo4j/structure/Neo4jVertex.java | 28 +-- .../neo4j/structure/Neo4jVertexProperty.java | 24 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 - ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 + .../neo4j/AbstractNeo4jGraphProvider.java | 22 +- .../gremlin/neo4j/BaseNeo4jGraphTest.java | 4 +- .../neo4j/DefaultNeo4jGraphProvider.java | 8 +- ...NoMetaMultiPropertyNeo4jGraphProvider.java | 6 +- .../neo4j/process/Neo4jCypherStartTest.java | 8 +- .../Neo4jGraphProcessStandardTest.java | 8 +- .../Neo4jGraphGroovyProcessStandardTest.java | 10 +- .../Neo4jGraphStructureStandardTest.java | 6 +- .../neo4j/structure/Neo4jGraphTest.java | 22 +- ...4jGraphStructureStandardIntegrateTest.java | 6 +- pom.xml | 2 +- tinkergraph-gremlin/pom.xml | 14 +- .../plugin/TinkerGraphGremlinPlugin.java | 16 +- .../process/computer/TinkerGraphComputer.java | 26 +- .../process/computer/TinkerGraphView.java | 22 +- .../process/computer/TinkerMapEmitter.java | 6 +- .../process/computer/TinkerMemory.java | 16 +- .../process/computer/TinkerMessageBoard.java | 4 +- .../process/computer/TinkerMessenger.java | 24 +- .../process/computer/TinkerReduceEmitter.java | 6 +- .../process/computer/TinkerWorkerPool.java | 6 +- .../traversal/sideEffect/TinkerGraphStep.java | 20 +- .../strategy/TinkerElementStepStrategy.java | 24 +- .../strategy/TinkerGraphStepStrategy.java | 20 +- .../tinkergraph/structure/TinkerEdge.java | 22 +- .../tinkergraph/structure/TinkerElement.java | 12 +- .../tinkergraph/structure/TinkerFactory.java | 20 +- .../tinkergraph/structure/TinkerGraph.java | 48 ++-- .../structure/TinkerGraphVariables.java | 8 +- .../tinkergraph/structure/TinkerHelper.java | 20 +- .../tinkergraph/structure/TinkerIndex.java | 10 +- .../tinkergraph/structure/TinkerProperty.java | 12 +- .../tinkergraph/structure/TinkerVertex.java | 22 +- .../structure/TinkerVertexProperty.java | 12 +- ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 - ...kerpop.gremlin.groovy.plugin.GremlinPlugin | 1 + .../structure/GroovyTinkerGraphTest.groovy | 10 +- .../tinkergraph/TinkerGraphGraphProvider.java | 20 +- .../TinkerGraphProcessComputerTest.java | 8 +- .../TinkerGraphProcessPerformanceTest.java | 10 +- .../TinkerGraphProcessStandardTest.java | 8 +- .../TinkerGraphGroovyProcessComputerTest.java | 12 +- .../TinkerGraphGroovyProcessStandardTest.java | 12 +- .../TinkerGraphStructurePerformanceTest.java | 8 +- .../TinkerGraphStructureStandardTest.java | 6 +- .../structure/TinkerGraphTest.java | 30 +-- ...erGraphGroovyEnvironmentIntegrateTest.java | 12 +- .../TinkerGraphGroovyEnvironmentTest.java | 12 +- 903 files changed, 5282 insertions(+), 5300 deletions(-) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java (95%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java (97%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java (96%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/Distribution.java (97%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java (96%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/Generator.java (95%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java (97%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java (97%) rename gremlin-algorithm/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/SizableIterable.java (98%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/Console.groovy (96%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy (93%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/Mediator.groovy (94%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/commands/InstallCommand.groovy (97%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/commands/PluginCommand.groovy (96%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/commands/RemoteCommand.groovy (94%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/commands/SubmitCommand.groovy (93%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/commands/UninstallCommand.groovy (95%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy (92%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy (96%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/plugin/PluggedIn.groovy (93%) rename gremlin-console/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/console/util/ArrayIterator.groovy (91%) rename gremlin-console/src/main/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java (74%) rename gremlin-console/src/main/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java (92%) rename gremlin-console/src/main/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java (74%) rename gremlin-console/src/main/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java (87%) delete mode 100644 gremlin-console/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin create mode 100644 gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/commands/InstallCommand.properties (100%) rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/commands/PluginCommand.properties (100%) rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/commands/RemoteCommand.properties (100%) rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/commands/SubmitCommand.properties (100%) rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/commands/UninstallCommand.properties (100%) rename gremlin-console/src/main/resources/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy (89%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java (93%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java (95%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java (95%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java (93%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java (95%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java (83%) rename gremlin-console/src/test/java/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java (86%) delete mode 100644 gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/remote.yaml rename gremlin-console/src/test/resources/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml (63%) create mode 100644 gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml rename gremlin-console/src/test/resources/{com => org/apache}/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/FastNoSuchElementException.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/Path.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/Scope.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/Step.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/T.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/Traversal.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalEngine.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalSideEffects.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalStrategies.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalStrategy.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/Traverser.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraverserGenerator.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/ComputerResult.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/GraphComputer.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/KeyValue.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/MapReduce.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/Memory.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/MessageCombiner.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/MessageScope.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/Messenger.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/VertexProgram.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java (76%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java (80%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/LambdaHolder.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/MapMemory.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/MemoryHelper.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/__.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java (75%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java (80%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java (80%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java (76%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java (76%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java (79%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java (80%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java (84%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/util/HasContainer.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/util/Tree.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/DefaultTraversal.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/StepPosition.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/TraversalMatrix.java (83%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/AbstractStep.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/EmptyStep.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/EngineDependent.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/MapReducer.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/Reducing.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/Reversible.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/step/TraversalParent.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java (82%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/TraversalRing.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_Traverser.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/O_Traverser.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/TraverserRequirement.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java (77%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/BulkSet.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/MapHelper.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/TraverserSet.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/metric/Metrics.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/metric/MutableMetrics.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/path/EmptyPath.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/path/ImmutablePath.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/path/MutablePath.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/path/SparsePath.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Compare.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Contains.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Direction.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Edge.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Element.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Graph.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Operator.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Order.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Property.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/PropertyType.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Transaction.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/Vertex.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/VertexProperty.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/DefaultIo.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/GraphMigrator.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/GraphReader.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/GraphWriter.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/Mapper.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java (86%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/KryoReader.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/URISerializer.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/server/ClusterAware.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/server/IntervalVertexRange.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/server/Partition.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/server/VertexRange.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/GraphStrategy.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/IdStrategy.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyContext.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyEdge.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyElement.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyGraph.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyProperty.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyVariables.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyVertex.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java (72%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/Comparators.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/ElementHelper.java (85%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/FeatureDescriptor.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/GraphFactory.java (80%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/GraphVariableHelper.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/StringFactory.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/BatchGraph.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/Exists.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/VertexIdType.java (78%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/Attachable.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedElement.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedPath.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java (88%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java (90%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java (81%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java (89%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java (87%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java (93%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/Gremlin.java (96%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/Serializer.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/StreamFactory.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/TimeUtil.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/config/YamlConfiguration.java (99%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/FunctionUtils.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/ThrowingConsumer.java (95%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/ThrowingFunction.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/ThrowingSupplier.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/TraversableLambda.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/TriConsumer.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/function/TriFunction.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/iterator/ArrayIterator.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/iterator/DoubleIterator.java (92%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/iterator/IteratorUtils.java (98%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/iterator/MultiIterator.java (94%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/iterator/SingleIterator.java (91%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/tools/MultiMap.java (97%) rename gremlin-core/src/main/java/{com => org/apache}/tinkerpop/gremlin/util/tools/TimeUtils.java (96%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Channelizer.java (94%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Client.java (95%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Cluster.java (99%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ClusterInfo.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Connection.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ConnectionPool.java (99%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Handler.java (92%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Host.java (98%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/LoadBalancingStrategy.java (96%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/MessageSerializer.java (87%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ResponseQueue.java (92%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Result.java (90%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ResultSet.java (96%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Settings.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/Tokens.java (98%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/exception/ConnectionException.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/exception/ResponseException.java (90%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java (90%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java (93%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java (98%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java (91%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java (92%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/message/RequestMessage.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/message/ResponseMessage.java (98%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/message/ResponseResult.java (96%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/message/ResponseStatus.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/message/ResponseStatusCode.java (95%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java (95%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java (94%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java (94%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java (95%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java (87%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/SerTokens.java (97%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/SerializationException.java (95%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/Serializers.java (86%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/simple/NioClient.java (89%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/simple/SimpleClient.java (84%) rename gremlin-driver/src/main/java/{com => org/apache}/tinkerpop/gremlin/driver/simple/WebSocketClient.java (90%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/HostTest.java (96%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/RequestMessageTest.java (95%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/ResultTest.java (91%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java (96%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java (93%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java (95%) rename gremlin-driver/src/test/java/{com => org/apache}/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java (93%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy (91%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy (94%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy (92%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/ComputerTestHelper.groovy (82%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy (97%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy (87%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy (91%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy (92%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy (90%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy (74%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy (82%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy (83%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy (90%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy (91%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy (84%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy (91%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy (87%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy (75%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy (90%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy (87%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy (81%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy (81%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy (88%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy (93%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy (87%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy (88%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy (85%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy (90%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy (94%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy (81%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy (80%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy (81%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy (92%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy (87%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy (85%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy (93%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy (82%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy (95%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy (83%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy (90%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy (89%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy (78%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy (84%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy (83%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy (86%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy (88%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy (80%) rename gremlin-groovy-test/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy (86%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java (86%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java (80%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java (98%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java (90%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java (93%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java (96%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java (86%) rename gremlin-groovy-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java (87%) rename gremlin-groovy-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/groovy/engine/GremlinExecutorInit.groovy (100%) rename gremlin-groovy-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java (96%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy (78%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy (96%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy (84%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy (93%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy (98%) rename gremlin-groovy/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java (74%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java (95%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java (98%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java (94%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java (98%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java (82%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/engine/ScriptEngines.java (95%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/function/GComparator.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/function/GFunction.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java (77%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java (98%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java (93%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java (95%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/Artifact.java (98%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java (95%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java (97%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java (96%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java (86%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/RemoteException.java (89%) rename gremlin-groovy/src/main/java/{com => org/apache}/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java (93%) delete mode 100644 gremlin-groovy/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin create mode 100644 gremlin-groovy/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/AbstractChannelizer.java (94%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/Channelizer.java (89%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/Context.java (90%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/Graphs.java (90%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinServer.java (98%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/OpProcessor.java (89%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/Settings.java (97%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/channel/HttpChannelizer.java (81%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/channel/NioChannelizer.java (80%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java (87%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java (95%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/IteratorHandler.java (93%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java (91%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java (92%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/OpExecutorHandler.java (85%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/OpSelectorHandler.java (82%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/StateKey.java (87%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java (92%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java (92%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java (86%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java (90%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/OpLoader.java (91%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/OpProcessorException.java (91%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java (91%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/control/ControlOps.java (89%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/session/Session.java (95%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java (77%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/session/SessionOps.java (85%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java (81%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/op/standard/StandardOps.java (83%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/util/GremlinServerInstall.java (91%) rename gremlin-server/src/main/java/{com => org/apache}/tinkerpop/gremlin/server/util/MetricManager.java (99%) delete mode 100644 gremlin-server/src/main/resources/META-INF/services/com.tinkerpop.gremlin.server.OpProcessor create mode 100644 gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java (98%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java (98%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GraphsTest.java (90%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java (93%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java (95%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java (99%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java (93%) rename gremlin-server/src/test/java/{com => org/apache}/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java (95%) rename gremlin-server/src/test/resources/{com => org/apache}/tinkerpop/gremlin/server/gremlin-server-integration.yaml (63%) rename gremlin-server/src/test/resources/{com => org/apache}/tinkerpop/gremlin/server/gremlin-server-performance.yaml (74%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/AbstractGraphProvider.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/AbstractGremlinSuite.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/AbstractGremlinTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/ExceptionCoverage.java (98%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/ExceptionCoverageSet.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/FeatureRequirement.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/FeatureRequirementSet.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/FeatureRequirements.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/GraphManager.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/GraphProvider.java (79%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/LoadGraphWith.java (87%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/TestHelper.java (99%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/ProcessComputerSuite.java (87%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/ProcessPerformanceSuite.java (77%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/ProcessStandardSuite.java (83%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalPerformanceTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/GraphComputerTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java (90%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java (90%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java (88%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java (82%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java (88%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java (86%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java (80%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java (87%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java (86%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java (90%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java (84%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java (84%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java (84%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java (87%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java (90%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java (90%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java (92%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java (85%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java (83%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java (88%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java (85%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/process/util/PathTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/BatchTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/EdgeTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/FeatureSupportTest.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/GraphConstructionTest.java (85%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/GraphTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java (91%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/IoTest.java (98%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/MockSerializable.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/PropertyTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/SerializationTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/StructurePerformanceSuite.java (71%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/StructureStandardSuite.java (71%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/TransactionTest.java (98%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/VariablesTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/VertexPropertyTest.java (98%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/VertexTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java (94%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java (95%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java (87%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java (98%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java (96%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java (97%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java (89%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java (93%) rename gremlin-test/src/main/java/{com => org/apache}/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java (95%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/graph-types.xml (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/graphml-1.1.xsd (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/grateful-dead.xml (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic-normalized.xml (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/grateful-dead-vertices.ldjson (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-legacy.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-vertices.ldjson (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/grateful-dead-vertices.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic-vertices.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew-vertices.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern-vertices.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern.gio (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/script/script-input.groovy (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/script/script-output.groovy (100%) rename gremlin-test/src/main/resources/{com => org/apache}/tinkerpop/gremlin/structure/io/script/tinkerpop-classic.txt (100%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/process/TraversalStrategiesTest.java (95%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/process/graph/step/util/TreeTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java (96%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/process/util/BulkSetTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/process/util/TraversalHelperTest.java (86%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/CompareTest.java (98%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/ExceptionCoverageTest.java (86%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/FeaturesConventionTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/GraphHiddenTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java (95%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/structure/util/ElementHelperTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/util/config/YamlConfigurationTest.java (98%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/util/function/TriConsumerTest.java (97%) rename gremlin-test/src/test/java/{com => org/apache}/tinkerpop/gremlin/util/function/TriFunctionTest.java (96%) rename hadoop-gremlin/src/main/groovy/{com => org/apache}/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy (91%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/Constants.java (96%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java (76%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java (85%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java (92%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java (89%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java (92%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java (85%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java (85%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java (96%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java (79%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java (89%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java (93%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java (80%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java (98%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java (96%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java (92%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java (92%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java (90%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java (90%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java (93%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java (89%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java (84%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java (69%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java (93%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java (85%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopElement.java (87%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java (83%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java (87%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java (89%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java (98%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java (86%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java (90%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java (87%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java (95%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java (95%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java (97%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java (96%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java (94%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java (92%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java (81%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java (94%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java (88%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java (81%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java (88%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java (94%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java (88%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java (95%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java (87%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java (88%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java (94%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java (88%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java (90%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java (94%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java (98%) rename hadoop-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java (90%) delete mode 100644 hadoop-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin create mode 100644 hadoop-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java (82%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java (81%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java (77%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java (77%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java (81%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java (93%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java (85%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java (93%) rename hadoop-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java (94%) rename hadoop-gremlin/src/test/resources/{com => org/apache}/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar (100%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java (79%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java (91%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java (89%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java (77%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java (84%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java (89%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java (94%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java (95%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java (96%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java (88%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java (94%) rename neo4j-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java (92%) delete mode 100644 neo4j-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin create mode 100644 neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java (91%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java (97%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java (88%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java (91%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java (95%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java (82%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java (77%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java (85%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java (98%) rename neo4j-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java (85%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java (76%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java (90%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java (87%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java (93%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java (90%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java (91%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java (83%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java (90%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java (94%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java (86%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java (70%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java (77%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java (86%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java (91%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java (93%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java (86%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java (87%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java (92%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java (94%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java (85%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java (90%) rename tinkergraph-gremlin/src/main/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java (91%) delete mode 100644 tinkergraph-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin create mode 100644 tinkergraph-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename tinkergraph-gremlin/src/test/groovy/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy (81%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java (74%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java (81%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java (77%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java (81%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java (73%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java (73%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java (81%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java (85%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java (96%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java (73%) rename tinkergraph-gremlin/src/test/java/{com => org/apache}/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java (73%) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 159faeb8371..3cf839e259f 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -107,7 +107,7 @@ TinkerPop 3.0.0.M7 (Release Date: January 19, 2015) * Added `RepeatStep` as the new looping construct supporting do/while, while/do, and emit semantics. * Moved `Traversal.sideEffects()` to `Traversal.Admin.getSideEffects()` as `cap()` should be used to access the sideEffect data of a traversal. * Renamed vendor `XXXTraversal` to `XXXGraphTraversal` (interface) and `XXXGraphTraversal` to `DefaultXXXGraphTraversal` (implementation class). -* Modified packaging for console plugins to be more consistent by moving them to the `com.tinkerpop.gremlin.console.groovy.plugin` namespace. +* Modified packaging for console plugins to be more consistent by moving them to the `org.apache.tinkerpop.gremlin.console.groovy.plugin` namespace. * Removed all TinkerPop specific dependencies to Guava to avoid user version conflicts. * Added support for `-e` (script file execution) and `-v` (version display) options on `gremlin.sh`. * GraphSON supports the assignment of multiple custom serialization modules. diff --git a/README.asciidoc b/README.asciidoc index a16a48e75da..7cdfd613f52 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -14,9 +14,9 @@ Building and Testing ~~~~~~~~~~~~~~~~~~~~ * Build Project: `mvn clean install` -** Specify specific tests in a TinkerPop Suite to run: `mvn test -Dgremlin.tests={test class 1, test class 2...}` - note that including a specific test may require its inner class implementation (e.g. `com.tinkerpop.gremlin....UnionTest$ComputerTest`) +** Specify specific tests in a TinkerPop Suite to run: `mvn test -Dgremlin.tests={test class 1, test class 2...}` - note that including a specific test may require its inner class implementation (e.g. `org.apache.tinkerpop.gremlin....UnionTest$ComputerTest`) ** Fast-build (does not run `neo4j-gremlin` tests - use with caution): `mvn clean install -DfeelingLucky` -** Clean the `.groovy/grapes/com.tinkerpop` directory on build: `mvn clean install -DcleanGrapes` +** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes` * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory * Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc` * Build JavaDocs: `mvn process-resources -Djavadoc` diff --git a/bin/clean-grapes.sh b/bin/clean-grapes.sh index 3467db25d0a..50b613741de 100755 --- a/bin/clean-grapes.sh +++ b/bin/clean-grapes.sh @@ -19,7 +19,7 @@ # under the License. # -# This script removes the com.tinkerpop directory from the "grapes" directory. This +# This script removes the org.apache.tinkerpop directory from the "grapes" directory. This # script assumes that an environment variable of GROOVY_GRAPES is set with the location # of the grapes directory. Otherwise, it will set that value to the standard location # of ~/.groovy/grapes which is common for most installations. Usage: @@ -30,6 +30,6 @@ if [ -z "${GROOVY_GRAPES:-}" ]; then GROOVY_GRAPES=~/.groovy/grapes fi -GRAPES_TP="$GROOVY_GRAPES/com.tinkerpop" +GRAPES_TP="$GROOVY_GRAPES/org.apache.tinkerpop" rm -rf $GRAPES_TP \ No newline at end of file diff --git a/docs/preprocessor/processor.groovy b/docs/preprocessor/processor.groovy index c05f4988ba5..8c383cc0ace 100644 --- a/docs/preprocessor/processor.groovy +++ b/docs/preprocessor/processor.groovy @@ -1,9 +1,9 @@ /** * @author Daniel Kuppitz (http://gremlin.guru) */ -import com.tinkerpop.gremlin.process.computer.util.ScriptEngineCache -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph +import org.apache.tinkerpop.gremlin.process.computer.util.ScriptEngineCache +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph import javax.script.ScriptContext @@ -14,13 +14,13 @@ def STATEMENT_PREFIX = "gremlin> " def STATEMENT_CONTINUATION_PREFIX = " " def header = """ - import com.tinkerpop.gremlin.process.graph.traversal.strategy.* - import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.SocialTraversal - import com.tinkerpop.gremlin.tinkergraph.structure.* + import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.* + import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.SocialTraversal + import org.apache.tinkerpop.gremlin.tinkergraph.structure.* import static java.util.Comparator.* """ -def imports = new com.tinkerpop.gremlin.console.ConsoleImportCustomizerProvider() +def imports = new org.apache.tinkerpop.gremlin.console.ConsoleImportCustomizerProvider() def skipNextRead = false def inCodeSection = false def engine diff --git a/docs/src/gremlin-applications.asciidoc b/docs/src/gremlin-applications.asciidoc index c6b5c4a00d6..27ba60d6d40 100644 --- a/docs/src/gremlin-applications.asciidoc +++ b/docs/src/gremlin-applications.asciidoc @@ -120,8 +120,8 @@ gremlin> :plugin list <1> ==>tinkerpop.tinkergraph[active] gremlin> :plugin use tinkerpop.sugar <2> ==>tinkerpop.sugar activated -gremlin> :install com.tinkerpop neo4j-gremlin x.y.z <3> -==>loaded: [com.tinkerpop, neo4j-gremlin, x.y.z] +gremlin> :install org.apache.tinkerpop neo4j-gremlin x.y.z <3> +==>loaded: [org.apache.tinkerpop, neo4j-gremlin, x.y.z] gremlin> :plugin list <4> ==>tinkerpop.server[active] ==>tinkerpop.gephi @@ -182,9 +182,9 @@ $ bin/gremlin-server.sh conf/gremlin-server-modern.yaml -----oOOo-(3)-oOOo----- [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server-modern.yaml -[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=com.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics -[INFO] GremlinServer$WebSocketServerInitializer - Configured application/vnd.gremlin-v1.0+kryo with com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 -[INFO] GremlinServer$WebSocketServerInitializer - Configured application/vnd.gremlin-v1.0+kryo-stringd with com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 +[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics +[INFO] GremlinServer$WebSocketServerInitializer - Configured application/vnd.gremlin-v1.0+kryo with org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 +[INFO] GremlinServer$WebSocketServerInitializer - Configured application/vnd.gremlin-v1.0+kryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 [INFO] Graphs - Graph [g] was successfully configured via [config/tinkergraph-empty.properties]. [INFO] GremlinExecutor - Getting dependencies for [[org.apache.commons, commons-math3, 3.2]] [INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/generate-modern.groovy @@ -294,7 +294,7 @@ Connecting via Java [source,xml] ---- - com.tinkerpop + org.apache.tinkerpop gremlin-driver x.y.z @@ -346,7 +346,7 @@ image:gremlin-rexster.png[width=225,float=left] While the default behavior for G Gremlin Server provides for a single REST endpoint - a Gremlin evaluator - which allows the submission of a Gremlin script as a request. For each request, it returns a response containing the serialized results of that script. To enable this endpoint, Gremlin Server needs to be configured with the `HttpChannelizer`, which replaces the default `WebSocketChannelizer`, in the configuration file: [source,yaml] -channelizer: com.tinkerpop.gremlin.server.channel.HttpChannelizer +channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer This setting is already configured in the `gremlin-server-rest-modern.yaml` file that is packaged with the Gremlin Server distribution. To utilize it, start Gremlin Server as follows: @@ -413,7 +413,7 @@ The `gremlin-server.sh` file also serves a second purpose. It can be used to "i [source,text] ---- -bin/gremlin-server.sh -i com.tinkerpop neo4j-gremlin x.y.z +bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z ---- This command will "grab" the appropriate dependencies and copy them to the `ext` directory of Gremlin Server, which will then allow them to be "used" the next time the server is started. To uninstall dependencies, simply delete them from the `ext` directory. @@ -637,29 +637,29 @@ Plugins provide a way to expand the features of Gremlin Console and Gremlin Serv [source,java] ---- -include::{basedir}/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java[] +include::{basedir}/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java[] ---- The most simple plugin and the one most commonly implemented will likely be one that just provides a list of classes to import to the Gremlin Console. This type of plugin is the easiest way for implementers of the TinkerPop Structure and Process APIs to make their implementations available to users. The Neo4j implementation currently maintained by TinkerPop has just such a plugin: [source,java] ---- -include::{basedir}/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java[] +include::{basedir}/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java[] ---- Note that the plugin provides a unique name for the plugin which follows a namespaced pattern as _namespace_._plugin-name_ (e.g. "tinkerpop.hadoop" - "tinkerpop" is the reserved namespace for TinkerPop maintained plugins). To make Neo4j classes available to the Console, the `PluginAcceptor` is given a `Set` of imports to provide to the plugin host. The `PluginAcceptor` essentially behaves as an abstraction to the "host" that is handling the `GremlinPlugin`. `GremlinPlugin` implementations maybe hosted by the Console as well as the `ScriptEngine` in Gremlin Server. Obviously, registering new commands and other operations that are specific to the Groovy Shell don't make sense there. Write the code for the plugin defensively by checking the `GremlinPlugin.env` key in the `PluginAcceptor.environment()` to understand which environment the plugin is being used in. -There is one other step to follow to ensure that the `GremlinPlugin` is visible to its hosts. `GremlinPlugin` implementations are loaded via link:http://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html[ServiceLoader] and therefore need a resource file added to the jar file where the plugin exists. Add a file called `com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin` to `META-INF.services`. In the case of the Neo4j plugin above, that file will have this line in it: +There is one other step to follow to ensure that the `GremlinPlugin` is visible to its hosts. `GremlinPlugin` implementations are loaded via link:http://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html[ServiceLoader] and therefore need a resource file added to the jar file where the plugin exists. Add a file called `org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin` to `META-INF.services`. In the case of the Neo4j plugin above, that file will have this line in it: [source,java] ---- -include::{basedir}/neo4j-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin[] +include::{basedir}/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin[] ---- Once the plugin is packaged, there are two ways to test it out: . Copy the jar and its dependencies to the Gremlin Console path and start it. -. Start Gremlin Console and try the `:install` command. For the case of the Neo4j plugin, it would look like this: `:install com.tinkerpop neo4j-gremlin x.y.z`. +. Start Gremlin Console and try the `:install` command. For the case of the Neo4j plugin, it would look like this: `:install org.apache.tinkerpop neo4j-gremlin x.y.z`. In either case, once one of these two approaches is taken, the jars and their dependencies are available to the Console. The next step is to "activate" the plugin by doing `:plugin use neo4j`, where "neo4j" refers to the name of the plugin to activate. @@ -679,7 +679,7 @@ TIP: Consider binding the plugin's minor version to the TinkerPop minor version [source,java] ---- -include::{basedir}/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java[] +include::{basedir}/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java[] ---- The `RemoteAcceptor` implementation ties to a `GremlinPlugin` and will only be executed when in use with the Gremlin Console plugin host. Simply instantiate and return a `RemoteAcceptor` in the `GremlinPlugin.remoteAcceptor()` method of the plugin implementation. Generally speaking, each call to `remoteAcceptor()` should produce a new instance of a `RemoteAcceptor`. It will likely be necessary that you provide context from the `GremlinPlugin` to the `RemoteAcceptor` plugin. For example, the `RemoteAcceptor` implementation might require an instance of `Groovysh` to provide a way to dynamically evaluate a script provided to it so that it can process the results in a different way. @@ -965,10 +965,10 @@ Flat: % cumulative self self total self total self total time seconds seconds calls ms/call ms/call min ms min ms max ms max ms name -61.8 0.02 0.02 1 22.60 22.60 22.60 22.60 22.60 22.60 com.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate -23.5 0.03 0.00 1 8.62 8.62 8.62 8.62 8.62 8.62 com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V +61.8 0.02 0.02 1 22.60 22.60 22.60 22.60 22.60 22.60 org.apache.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate +23.5 0.03 0.00 1 8.62 8.62 8.62 8.62 8.62 8.62 org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V 13.4 0.03 0.00 1 4.93 36.57 4.93 36.57 4.93 36.57 groovysh_evaluate$_run_closure1.doCall - 1.0 0.03 0.00 1 0.38 0.40 0.38 0.40 0.38 0.40 com.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep + 1.0 0.03 0.00 1 0.38 0.40 0.38 0.40 0.38 0.40 org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep 0.0 0.03 0.00 1 0.01 0.01 0.01 0.01 0.01 0.01 java.util.HashSet.contains Call graph: @@ -976,21 +976,21 @@ Call graph: index % time self children calls name 0.00 0.03 1/1 [1] 100.0 0.00 0.03 1 groovysh_evaluate$_run_closure1.doCall [1] - 0.02 0.00 1/1 com.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate [2] - 0.00 0.00 1/1 com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V [3] - 0.00 0.00 1/1 com.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] + 0.02 0.00 1/1 org.apache.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate [2] + 0.00 0.00 1/1 org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V [3] + 0.00 0.00 1/1 org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] -------------------------------------------------------------------------------------------------------------------------- 0.02 0.00 1/1 groovysh_evaluate$_run_closure1.doCall [1] -[2] 61.8 0.02 0.00 1 com.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate [2] +[2] 61.8 0.02 0.00 1 org.apache.tinkerpop.gremlin.tinkergraph.process.graph.TinkerGraphTraversal.iterate [2] -------------------------------------------------------------------------------------------------------------------------- 0.00 0.00 1/1 groovysh_evaluate$_run_closure1.doCall [1] -[3] 23.5 0.00 0.00 1 com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V [3] +[3] 23.5 0.00 0.00 1 org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.V [3] -------------------------------------------------------------------------------------------------------------------------- 0.00 0.00 1/1 groovysh_evaluate$_run_closure1.doCall [1] -[4] 1.1 0.00 0.00 1 com.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] +[4] 1.1 0.00 0.00 1 org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] 0.00 0.00 1/1 java.util.HashSet.contains [5] -------------------------------------------------------------------------------------------------------------------------- - 0.00 0.00 1/1 com.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] + 0.00 0.00 1/1 org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader.isStep [4] [5] 0.0 0.00 0.00 1 java.util.HashSet.contains [5] -------------------------------------------------------------------------------------------------------------------------- ==>null @@ -1006,18 +1006,18 @@ A good implementation of the Gremlin APIs will validate their features against t ---- gremlin> describeGraph(HadoopGraph) ==> -IMPLEMENTATION - com.tinkerpop.gremlin.hadoop.structure.HadoopGraph +IMPLEMENTATION - org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph TINKERPOP TEST SUITE - Compliant with (4 of 8 suites) -> com.tinkerpop.gremlin.process.ProcessStandardSuite -> com.tinkerpop.gremlin.process.ProcessComputerSuite -> com.tinkerpop.gremlin.process.GroovyProcessStandardSuite -> com.tinkerpop.gremlin.process.GroovyProcessComputerSuite +> org.apache.tinkerpop.gremlin.process.ProcessStandardSuite +> org.apache.tinkerpop.gremlin.process.ProcessComputerSuite +> org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite +> org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite - Opts out of 12 individual tests -> com.tinkerpop.gremlin.process.graph.step.map.MatchTest$StandardTest#g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX +> org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$StandardTest#g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute." ... -> com.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest#g_V_matchXa_inXsungByX_b__a_inXsungByX_c__b_outXwrittenByX_d__c_outXwrittenByX_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX +> org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest#g_V_matchXa_inXsungByX_b__a_inXsungByX_c__b_outXwrittenByX_d__c_outXwrittenByX_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute." - NOTE - diff --git a/docs/src/implementations.asciidoc b/docs/src/implementations.asciidoc index 500cd83145d..215a4d9a9b3 100644 --- a/docs/src/implementations.asciidoc +++ b/docs/src/implementations.asciidoc @@ -220,7 +220,7 @@ Validating with Gremlin-Test [source,xml] - com.tinkerpop + org.apache.tinkerpop gremlin-test x.y.z @@ -272,19 +272,19 @@ There are times when there may be a specific test in the suite that the implemen @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD) @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER) @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest", + test = "org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest", method = "g_V_matchXa_hasXname_GarciaX__a_inXwrittenByX_b__a_inXsungByX_bX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest", + test = "org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest", method = "g_V_matchXa_inXsungByX_b__a_inXsungByX_c__b_outXwrittenByX_d__c_outXwrittenByX_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", + test = "org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", method = "shouldNotAllowBadMemoryKeys", reason = "Hadoop does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", + test = "org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", method = "shouldRequireRegisteringMemoryKeys", reason = "Hadoop does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.") public class HadoopGraph implements Graph { @@ -333,8 +333,8 @@ With the above plugin implementations, users can now download respective binarie gremlin> g = Neo4jGraph.open('/tmp/neo4j') No such property: Neo4jGraph for class: groovysh_evaluate Display stack trace? [yN] -gremlin> :install com.tinkerpop neo4j-gremlin x.y.z -==>loaded: [com.tinkerpop, neo4j-gremlin, …] +gremlin> :install org.apache.tinkerpop neo4j-gremlin x.y.z +==>loaded: [org.apache.tinkerpop, neo4j-gremlin, …] gremlin> :plugin use tinkerpop.neo4j ==>tinkerpop.neo4j activated gremlin> g = Neo4jGraph.open('/tmp/neo4j') @@ -356,7 +356,7 @@ TinkerGraph-Gremlin [source,xml] ---- - com.tinkerpop + org.apache.tinkerpop tinkergraph-gremlin x.y.z @@ -413,7 +413,7 @@ Neo4j-Gremlin [source,xml] ---- - com.tinkerpop + org.apache.tinkerpop neo4j-gremlin x.y.z @@ -425,8 +425,8 @@ CAUTION: Unless under a commercial agreement with Neo Technology, Neo4j is licen [source,groovy] ---- -gremlin> :install com.tinkerpop neo4j-gremlin x.y.z -==>loaded: [com.tinkerpop, neo4j-gremlin, x.y.z] +gremlin> :install org.apache.tinkerpop neo4j-gremlin x.y.z +==>loaded: [org.apache.tinkerpop, neo4j-gremlin, x.y.z] gremlin> :plugin use tinkerpop.neo4j ==>tinkerpop.neo4j activated gremlin> g = Neo4jGraph.open('/tmp/neo4j') @@ -437,7 +437,7 @@ For those leveraging Neo4j High Availability, configure `Neo4jGraph` for "HA mod IMPORTANT: `Neo4jGraph` supports both meta- and multi-properties (see <<_vertex_properties,vertex properties>>). However, these are implemented by making use of "hidden" Neo4j nodes. For example, when a vertex has multiple "name" properties, each property is a new node (multi-properties) which can have properties attached to it (meta-properties). As such, the underlying representation may become difficult to query directly using another graph language such as Cypher. The default setting is to disable multi- and meta-properties. However, if this feature is desired, then it can be activated via `gremlin.neo4j.metaProperties` and `gremlin.neo4j.multiProperties` configurations being set to `true`. Once the configuration is set, it can not be changed for the lifetime of the graph. -TIP: To host Neo4j in Gremlin Server, the dependencies must first be "installed" or otherwise copied to the Gremlin Server path. The automated method for doing this would be to execute `bin/gremlin-server.sh -i com.tinkerpop neo4j-gremlin x.y.z`. +TIP: To host Neo4j in Gremlin Server, the dependencies must first be "installed" or otherwise copied to the Gremlin Server path. The automated method for doing this would be to execute `bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z`. Indices ~~~~~~~ @@ -593,7 +593,7 @@ Hadoop-Gremlin [source,xml] ---- - com.tinkerpop + org.apache.tinkerpop hadoop-gremlin x.y.z @@ -623,8 +623,8 @@ $ bin/gremlin.sh plugin activated: tinkerpop.server plugin activated: tinkerpop.utilities plugin activated: tinkerpop.tinkergraph -gremlin> :install com.tinkerpop hadoop-gremlin x.y.z -==>loaded: [com.tinkerpop, hadoop-gremlin, x.y.z] - restart the console to use [tinkerpop.hadoop] +gremlin> :install org.apache.tinkerpop hadoop-gremlin x.y.z +==>loaded: [org.apache.tinkerpop, hadoop-gremlin, x.y.z] - restart the console to use [tinkerpop.hadoop] gremlin> :q $ bin/gremlin.sh @@ -645,15 +645,15 @@ Properties Files `HadoopGraph` makes heavy use of properties files which ultimately get turned into Apache Configurations and Hadoop configurations. The properties file presented below is located at `conf/hadoop-kryo.properties'. [source,text] -gremlin.graph=com.tinkerpop.gremlin.hadoop.structure.HadoopGraph +gremlin.graph=org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph gremlin.hadoop.inputLocation=tinkerpop-modern-vertices.gio -gremlin.hadoop.graphInputFormat=com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat +gremlin.hadoop.graphInputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat gremlin.hadoop.outputLocation=output -gremlin.hadoop.graphOutputFormat=com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat +gremlin.hadoop.graphOutputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat gremlin.hadoop.memoryOutputFormat=org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat -gremlin.vertexProgram=com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram +gremlin.vertexProgram=org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram gremlin.traversalVertexProgram.traversalSupplier.type=CLASS -gremlin.traversalVertexProgram.traversalSupplier.object=com.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 +gremlin.traversalVertexProgram.traversalSupplier.object=org.apache.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 gremlin.hadoop.jarsInDistributedCache=true gremlin.hadoop.deriveMemory=false giraph.minWorkers=2 @@ -736,32 +736,32 @@ WARNING: The maximum number of workers can be no larger than the number of map-s gremlin> :remote connect tinkerpop.hadoop ../../../hadoop-gremlin/conf/hadoop-kryo.properties ==>hadoopgraph[kryoinputformat->kryooutputformat] gremlin> :> g.V().count() -INFO com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), CountStep, SideEffectCapStep] +INFO org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), CountStep, SideEffectCapStep] INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0037 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... -INFO com.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: CountMapReduce +INFO org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: CountMapReduce INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0038 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... ==>6 gremlin> :> g.V().out().out().values('name') -INFO com.tinkerpop.gremlin.giraph.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), VertexStep(OUT), VertexStep(OUT), ElementValueStep(name)] +INFO org.apache.tinkerpop.gremlin.giraph.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), VertexStep(OUT), VertexStep(OUT), ElementValueStep(name)] INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0031 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... -INFO com.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: TraversalResultMapReduce +INFO org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: TraversalResultMapReduce INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0032 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... ==>ripple ==>lop gremlin> :> g.V().group('a').by{it.value('name')[1]}.by{it.value('name')} -INFO com.tinkerpop.gremlin.giraph.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), GroupByStep@a, SideEffectCapStep(a)] +INFO org.apache.tinkerpop.gremlin.giraph.process.computer.giraph.GiraphGraphComputer - HadoopGremlin(Giraph): TraversalVertexProgram[HadoopGraphStep(vertex), GroupByStep@a, SideEffectCapStep(a)] INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0039 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... -INFO com.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: GroupByMapReduce[a] +INFO org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph - HadoopGremlin: GroupByMapReduce[a] INFO org.apache.hadoop.mapred.JobClient - Running job: job_201407281259_0040 INFO org.apache.hadoop.mapred.JobClient - map 0% reduce 0% ... @@ -787,7 +787,7 @@ The `TraversalSupplier1` class mentioned in the `hadoop-kryo.properties` file is [source,java] ---- // gremlin.traversalVertexProgram.traversalSupplier.type=CLASS -// gremlin.traversalVertexProgram.traversalSupplier.object=com.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 +// gremlin.traversalVertexProgram.traversalSupplier.object=org.apache.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 public class TraversalSupplier1 implements SSupplier { public Traversal get() { @@ -859,7 +859,7 @@ $ hadoop fs -copyFromLocal data/tinkerpop-modern-vertices.ldjson tinkerpop-moder $ hadoop fs -ls Found 2 items -rw-r--r-- 1 marko supergroup 2356 2014-07-28 13:00 /user/marko/tinkerpop-modern-vertices.ldjson -$ hadoop jar target/hadoop-gremlin-x.y.z-job.jar com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer conf/hadoop-graphson.properties +$ hadoop jar target/hadoop-gremlin-x.y.z-job.jar org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer conf/hadoop-graphson.properties 14/07/29 12:08:27 INFO giraph.GiraphGraphComputer: HadoopGremlin(Giraph): PageRankVertexProgram[alpha=0.85,iterations=30] 14/07/29 12:08:28 INFO mapred.JobClient: Running job: job_201407281259_0041 14/07/29 12:08:29 INFO mapred.JobClient: map 0% reduce 0% diff --git a/docs/src/intro.asciidoc b/docs/src/intro.asciidoc index d3cffe525e1..301dd7034a6 100644 --- a/docs/src/intro.asciidoc +++ b/docs/src/intro.asciidoc @@ -4,7 +4,7 @@ Introduction to Graph Computing [source,xml] - com.tinkerpop + org.apache.tinkerpop gremlin-core x.y.z diff --git a/docs/src/the-graph.asciidoc b/docs/src/the-graph.asciidoc index 3f859eac133..94c081ac6f8 100644 --- a/docs/src/the-graph.asciidoc +++ b/docs/src/the-graph.asciidoc @@ -206,13 +206,13 @@ gremlin> g.features() >-- Persistence: true ... gremlin> g.tx().onReadWrite(Transaction.READ_WRITE_BEHAVIOR.AUTO) <2> -==>com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph$Neo4jTransaction@1c067c0d +==>org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph$Neo4jTransaction@1c067c0d gremlin> g.addVertex("name","stephen") <3> ==>v[0] gremlin> g.tx().commit() <4> ==>null gremlin> g.tx().onReadWrite(Transaction.READ_WRITE_BEHAVIOR.MANUAL) <5> -==>com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph$Neo4jTransaction@1c067c0d +==>org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph$Neo4jTransaction@1c067c0d gremlin> g.tx().isOpen() ==>false gremlin> g.addVertex("name","marko") <6> @@ -524,7 +524,7 @@ gremlin> g = TinkerFactory.createModern() gremlin> f = new FileOutputStream("vertex-1.json") ==>java.io.FileOutputStream@3bbf9027 gremlin> mapper = g.io().graphSONMapper().embedTypes(true).create() -==>com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper@2ce45a7b +==>org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper@2ce45a7b gremlin> g.io().graphSONWriter().mapper(mapper).create().writeVertex(f, g.V(1).next(), BOTH) ==>null gremlin> f.close() @@ -704,7 +704,7 @@ gremlin> Gremlin.version() gremlin> g = TinkerGraph.open() ==>tinkergraph[vertices:0 edges:0] gremlin> r = LegacyGraphSONReader.build().create() -==>com.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader@64337702 +==>org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader@64337702 gremlin> r.readGraph(new FileInputStream('/tmp/tp2.json'),g) ==>null gremlin> g.E() @@ -824,7 +824,7 @@ gremlin> g = TinkerGraph.open() gremlin> sg = g.strategy(ReadOnlyStrategy.instance()) ==>readonlystrategy[tinkergraph[vertices:0 edges:0]] gremlin> sg.addVertex("name","stephen") -Graph uses class com.tinkerpop.gremlin.structure.strategy.ReadOnlyStrategy and is therefore unmodifiable +Graph uses class org.apache.tinkerpop.gremlin.structure.strategy.ReadOnlyStrategy and is therefore unmodifiable Display stack trace? [yN] SequenceStrategy diff --git a/docs/src/the-graphcomputer.asciidoc b/docs/src/the-graphcomputer.asciidoc index a07c537cfc4..e13d259006a 100644 --- a/docs/src/the-graphcomputer.asciidoc +++ b/docs/src/the-graphcomputer.asciidoc @@ -309,7 +309,7 @@ The same OLAP traversal can be executed using the standard `g.compute()` model, [gremlin-groovy,modern] ---- -result = g.compute().program(TraversalVertexProgram.build().traversal("com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.open().V().both().hasLabel('person').values('age').groupCount('a')").create()).submit().get() +result = g.compute().program(TraversalVertexProgram.build().traversal("org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.open().V().both().hasLabel('person').values('age').groupCount('a')").create()).submit().get() result.memory().a result.memory().iteration result.memory().runtime diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc index a3ee279bd7e..6856b16f966 100644 --- a/docs/src/the-traversal.asciidoc +++ b/docs/src/the-traversal.asciidoc @@ -534,8 +534,8 @@ You have two options to get around this limitation. Either explicitly apply all [gremlin-groovy,modern] ---- -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.graph.traversal.strategy.* +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.* TraversalStrategies.GlobalCache.registerStrategies(__, <1> TraversalStrategies.GlobalCache.getStrategies(__).addStrategies( SideEffectCapStrategy.instance(), @@ -548,8 +548,8 @@ inject(software).unfold().groupCount().by('lang') [gremlin-groovy,modern] ---- -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.graph.traversal.strategy.* +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.* software = g.V().hasLabel('software').toList() t = inject(software).unfold().groupCount().by("lang"); null <1> t.getStrategies().addStrategies( @@ -1615,7 +1615,7 @@ This traversal definition can now be used as follows. [gremlin-groovy,modern] ---- -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.SocialTraversal +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.SocialTraversal g.of(SocialTraversal).people("marko").knows().name() ---- diff --git a/gremlin-algorithm/pom.xml b/gremlin-algorithm/pom.xml index 2a096d7253b..e81f76da78d 100644 --- a/gremlin-algorithm/pom.xml +++ b/gremlin-algorithm/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -28,7 +28,7 @@ limitations under the License. Gremlin Algorithms: Graph Computing Algorithms for TinkerPop3 - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java similarity index 95% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java index 9dd3684e439..86116eae288 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGenerator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Map; import java.util.Optional; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java similarity index 97% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java index cd3f8f99ce6..27fef256e93 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGenerator.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java similarity index 96% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java index 8a3cdec24c6..cd7e487ee22 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CopyDistribution.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; import java.util.Random; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Distribution.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Distribution.java similarity index 97% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Distribution.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Distribution.java index 46bae25a482..c047581b248 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Distribution.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Distribution.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; import java.util.Random; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java similarity index 96% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java index 35ae0da9a8c..8fa66f0f953 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGenerator.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Generator.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Generator.java similarity index 95% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Generator.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Generator.java index fc2ac41008f..8604e6f0bf4 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/Generator.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/Generator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; /** * Interface for Graph generators. diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java similarity index 97% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java index 3a9f391334f..58188310cf1 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/NormalDistribution.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; import java.util.Random; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java similarity index 97% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java index d1975612d1e..b658ffccf2c 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/PowerLawDistribution.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; import java.util.Random; diff --git a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/SizableIterable.java b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/SizableIterable.java similarity index 98% rename from gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/SizableIterable.java rename to gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/SizableIterable.java index 4fed416cd19..4c408fd1de6 100644 --- a/gremlin-algorithm/src/main/java/com/tinkerpop/gremlin/algorithm/generator/SizableIterable.java +++ b/gremlin-algorithm/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/SizableIterable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; import java.util.Collection; import java.util.Iterator; diff --git a/gremlin-console/conf/remote-objects.yaml b/gremlin-console/conf/remote-objects.yaml index 225e28c6c20..a7329b37ddb 100644 --- a/gremlin-console/conf/remote-objects.yaml +++ b/gremlin-console/conf/remote-objects.yaml @@ -1,3 +1,3 @@ hosts: [localhost] port: 8182 -serializer: { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0} \ No newline at end of file +serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0} \ No newline at end of file diff --git a/gremlin-console/conf/remote.yaml b/gremlin-console/conf/remote.yaml index 078607c2e09..c1addb94e14 100644 --- a/gremlin-console/conf/remote.yaml +++ b/gremlin-console/conf/remote.yaml @@ -1,3 +1,3 @@ hosts: [localhost] port: 8182 -serializer: { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} \ No newline at end of file +serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} \ No newline at end of file diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index d0711ba2f39..a5441bb5403 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -20,19 +20,19 @@ limitations under the License. 4.0.0 tinkerpop - com.tinkerpop + org.apache.tinkerpop 3.0.0-SNAPSHOT gremlin-console Gremlin Console: Gremlin Groovy REPL - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} - com.tinkerpop + org.apache.tinkerpop tinkergraph-gremlin ${project.version} @@ -48,7 +48,7 @@ limitations under the License. - com.tinkerpop + org.apache.tinkerpop gremlin-driver ${project.version} @@ -76,13 +76,13 @@ limitations under the License. test - com.tinkerpop + org.apache.tinkerpop gremlin-server ${project.version} test - com.tinkerpop + org.apache.tinkerpop gremlin-test ${project.version} test @@ -129,7 +129,7 @@ limitations under the License. warn - com.tinkerpop.gremlin.console.Console + org.apache.tinkerpop.gremlin.console.Console diff --git a/gremlin-console/src/assembly/standalone.xml b/gremlin-console/src/assembly/standalone.xml index 96c519a0e3d..2bc9b642ec0 100644 --- a/gremlin-console/src/assembly/standalone.xml +++ b/gremlin-console/src/assembly/standalone.xml @@ -59,8 +59,8 @@ limitations under the License. false compile - com.tinkerpop:gremlin-groovy - com.tinkerpop:tinkergraph-gremlin + org.apache.tinkerpop:gremlin-groovy + org.apache.tinkerpop:tinkergraph-gremlin @@ -68,7 +68,7 @@ limitations under the License. false compile - com.tinkerpop:tinkergraph-gremlin + org.apache.tinkerpop:tinkergraph-gremlin @@ -76,7 +76,7 @@ limitations under the License. false compile - com.tinkerpop:gremlin-groovy + org.apache.tinkerpop:gremlin-groovy diff --git a/gremlin-console/src/main/bin/gremlin.bat b/gremlin-console/src/main/bin/gremlin.bat index fd74bce65c3..d5db4eb24ff 100644 --- a/gremlin-console/src/main/bin/gremlin.bat +++ b/gremlin-console/src/main/bin/gremlin.bat @@ -27,7 +27,7 @@ if "%1" == "-v" goto version :console -java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; com.tinkerpop.gremlin.console.Console %* +java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.console.Console %* set CLASSPATH=%OLD_CLASSPATH% goto :eof @@ -40,11 +40,11 @@ FOR %%X IN (%*) DO ( CALL :concat %%X %1 %2 ) -java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; com.tinkerpop.gremlin.groovy.jsr223.ScriptExecutor %strg% +java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.groovy.jsr223.ScriptExecutor %strg% goto :eof :version -java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; com.tinkerpop.gremlin.util.Gremlin +java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.util.Gremlin goto :eof diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh index adf33a4cad9..e3fb9f21f67 100755 --- a/gremlin-console/src/main/bin/gremlin.sh +++ b/gremlin-console/src/main/bin/gremlin.sh @@ -64,10 +64,10 @@ if [ -z "${SCRIPT_DEBUG:-}" ]; then fi # Process options -MAIN_CLASS=com.tinkerpop.gremlin.console.Console +MAIN_CLASS=org.apache.tinkerpop.gremlin.console.Console while getopts "elv" opt; do case "$opt" in - e) MAIN_CLASS=com.tinkerpop.gremlin.groovy.jsr223.ScriptExecutor + e) MAIN_CLASS=org.apache.tinkerpop.gremlin.groovy.jsr223.ScriptExecutor # For compatibility with behavior pre-Titan-0.5.0, stop # processing gremlin.sh arguments as soon as the -e switch is # seen; everything following -e becomes arguments to the @@ -80,7 +80,7 @@ while getopts "elv" opt; do SCRIPT_DEBUG=y fi ;; - v) MAIN_CLASS=com.tinkerpop.gremlin.util.Gremlin + v) MAIN_CLASS=org.apache.tinkerpop.gremlin.util.Gremlin esac done diff --git a/gremlin-console/src/main/ext/plugins.txt b/gremlin-console/src/main/ext/plugins.txt index 999492fecdc..2b1a2e71449 100644 --- a/gremlin-console/src/main/ext/plugins.txt +++ b/gremlin-console/src/main/ext/plugins.txt @@ -1,3 +1,3 @@ -com.tinkerpop.gremlin.console.groovy.plugin.DriverGremlinPlugin -com.tinkerpop.gremlin.console.groovy.plugin.UtilitiesGremlinPlugin -com.tinkerpop.gremlin.tinkergraph.groovy.plugin.TinkerGraphGremlinPlugin \ No newline at end of file +org.apache.tinkerpop.gremlin.console.groovy.plugin.DriverGremlinPlugin +org.apache.tinkerpop.gremlin.console.groovy.plugin.UtilitiesGremlinPlugin +org.apache.tinkerpop.gremlin.tinkergraph.groovy.plugin.TinkerGraphGremlinPlugin \ No newline at end of file diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy similarity index 96% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Console.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy index 0b0b1409102..69a0b67ab1c 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Console.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console +package org.apache.tinkerpop.gremlin.console -import com.tinkerpop.gremlin.console.commands.* -import com.tinkerpop.gremlin.console.plugin.PluggedIn -import com.tinkerpop.gremlin.console.util.ArrayIterator -import com.tinkerpop.gremlin.groovy.loaders.GremlinLoader -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +import org.apache.tinkerpop.gremlin.console.commands.* +import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn +import org.apache.tinkerpop.gremlin.console.util.ArrayIterator +import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin import jline.console.history.FileHistory import org.codehaus.groovy.tools.shell.ExitNotification import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy similarity index 93% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy index aa8f88d3e8c..f5898cfdf54 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console +package org.apache.tinkerpop.gremlin.console -import com.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider +import org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider import groovy.sql.Sql import groovyx.net.http.HTTPBuilder diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Mediator.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy similarity index 94% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Mediator.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy index 6990b628f89..c1b4ed1794c 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/Mediator.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console +package org.apache.tinkerpop.gremlin.console -import com.tinkerpop.gremlin.console.plugin.PluggedIn -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor +import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor import java.util.concurrent.CompletableFuture diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/InstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy similarity index 97% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/InstallCommand.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy index 7adabca8acd..94253a75be7 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/InstallCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.commands +package org.apache.tinkerpop.gremlin.console.commands -import com.tinkerpop.gremlin.console.Mediator -import com.tinkerpop.gremlin.console.plugin.PluggedIn -import com.tinkerpop.gremlin.groovy.plugin.Artifact -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +import org.apache.tinkerpop.gremlin.console.Mediator +import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn +import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin import groovy.grape.Grape import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/PluginCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy similarity index 96% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/PluginCommand.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy index 0d368df3547..ee69b15670d 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/PluginCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.commands +package org.apache.tinkerpop.gremlin.console.commands -import com.tinkerpop.gremlin.console.Mediator +import org.apache.tinkerpop.gremlin.console.Mediator import org.codehaus.groovy.tools.shell.ComplexCommandSupport import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy similarity index 94% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/RemoteCommand.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy index 75ec2dcf00f..c490df7476b 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/RemoteCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.commands +package org.apache.tinkerpop.gremlin.console.commands -import com.tinkerpop.gremlin.console.Mediator -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor -import com.tinkerpop.gremlin.groovy.plugin.RemoteException +import org.apache.tinkerpop.gremlin.console.Mediator +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException import org.codehaus.groovy.tools.shell.ComplexCommandSupport import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/SubmitCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy similarity index 93% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/SubmitCommand.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy index 41135fe79d3..502145804f0 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/SubmitCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.commands +package org.apache.tinkerpop.gremlin.console.commands -import com.tinkerpop.gremlin.console.Mediator +import org.apache.tinkerpop.gremlin.console.Mediator import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/UninstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy similarity index 95% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/UninstallCommand.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy index e7b37906c7c..ea2565d0131 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/commands/UninstallCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.commands +package org.apache.tinkerpop.gremlin.console.commands -import com.tinkerpop.gremlin.console.Mediator +import org.apache.tinkerpop.gremlin.console.Mediator import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy similarity index 92% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy index 5a8f89fb7b2..54bd119f0bb 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.plugin +package org.apache.tinkerpop.gremlin.console.plugin -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.IO diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy similarity index 96% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy index 31d11b9bddf..255a429adb1 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.plugin - -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor -import com.tinkerpop.gremlin.groovy.plugin.RemoteException -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Graph -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.console.plugin + +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.structure.Vertex import groovy.json.JsonSlurper import groovyx.net.http.HTTPBuilder import org.codehaus.groovy.tools.shell.Groovysh diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/PluggedIn.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy similarity index 93% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/PluggedIn.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy index e804b9ed705..f35d1ed424a 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/plugin/PluggedIn.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.plugin +package org.apache.tinkerpop.gremlin.console.plugin -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.IO diff --git a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/util/ArrayIterator.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/util/ArrayIterator.groovy similarity index 91% rename from gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/util/ArrayIterator.groovy rename to gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/util/ArrayIterator.groovy index 2a92059ee77..b6503ef0d0b 100644 --- a/gremlin-console/src/main/groovy/com/tinkerpop/gremlin/console/util/ArrayIterator.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/util/ArrayIterator.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.util +package org.apache.tinkerpop.gremlin.console.util -import com.tinkerpop.gremlin.process.FastNoSuchElementException +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java similarity index 74% rename from gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java rename to gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java index 9d5dbe44cfb..b8f7cd4bab1 100644 --- a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java +++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPlugin.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.exception.ConnectionException; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.SerTokens; -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.SerTokens; +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; import java.util.HashSet; import java.util.Optional; diff --git a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java similarity index 92% rename from gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java rename to gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java index 6e3aac18260..0d662a1610f 100644 --- a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java +++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; - -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.Result; -import com.tinkerpop.gremlin.driver.exception.ResponseException; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.RemoteException; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; + +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.Result; +import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException; import org.apache.commons.lang.exception.ExceptionUtils; import org.codehaus.groovy.tools.shell.Groovysh; diff --git a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java similarity index 74% rename from gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java rename to gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java index a09a91f1245..6977aa83d1f 100644 --- a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java +++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiGremlinPlugin.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.console.plugin.GephiRemoteAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; +import org.apache.tinkerpop.gremlin.console.plugin.GephiRemoteAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; import java.util.Optional; diff --git a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java similarity index 87% rename from gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java rename to gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java index f2d676f6d27..59c2b1a1004 100644 --- a/gremlin-console/src/main/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java +++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPlugin.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; import groovyx.gbench.Benchmark; import groovyx.gbench.BenchmarkStaticExtension; import groovyx.gprof.ProfileStaticExtension; diff --git a/gremlin-console/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/gremlin-console/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin deleted file mode 100644 index d2ca8498b7c..00000000000 --- a/gremlin-console/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +++ /dev/null @@ -1,3 +0,0 @@ -com.tinkerpop.gremlin.console.groovy.plugin.DriverGremlinPlugin -com.tinkerpop.gremlin.console.groovy.plugin.GephiGremlinPlugin -com.tinkerpop.gremlin.console.groovy.plugin.UtilitiesGremlinPlugin \ No newline at end of file diff --git a/gremlin-console/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/gremlin-console/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory index 38d436c02e8..74b951cc26b 100644 --- a/gremlin-console/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory +++ b/gremlin-console/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory @@ -1 +1 @@ -com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory \ No newline at end of file +org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory \ No newline at end of file diff --git a/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin new file mode 100644 index 00000000000..a74add49f23 --- /dev/null +++ b/gremlin-console/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin @@ -0,0 +1,3 @@ +org.apache.tinkerpop.gremlin.console.groovy.plugin.DriverGremlinPlugin +org.apache.tinkerpop.gremlin.console.groovy.plugin.GephiGremlinPlugin +org.apache.tinkerpop.gremlin.console.groovy.plugin.UtilitiesGremlinPlugin \ No newline at end of file diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/InstallCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.properties similarity index 100% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/InstallCommand.properties rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.properties diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/PluginCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.properties similarity index 100% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/PluginCommand.properties rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.properties diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/RemoteCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties similarity index 100% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/RemoteCommand.properties rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/SubmitCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties similarity index 100% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/SubmitCommand.properties rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/UninstallCommand.properties b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.properties similarity index 100% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/commands/UninstallCommand.properties rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.properties diff --git a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy similarity index 89% rename from gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy rename to gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy index 0bcb84ff882..95b968fdb9a 100644 --- a/gremlin-console/src/main/resources/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy +++ b/gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginScript.groovy @@ -23,10 +23,10 @@ * @author Stephen Mallette (http://stephen.genoprime.com) */ -describeGraph = { Class c -> +describeGraph = { Class c -> def lf = System.getProperty("line.separator") - def optIns = c.getAnnotationsByType(com.tinkerpop.gremlin.structure.Graph.OptIn) - def optOuts = c.getAnnotationsByType(com.tinkerpop.gremlin.structure.Graph.OptOut) + def optIns = c.getAnnotationsByType(org.apache.tinkerpop.gremlin.structure.Graph.OptIn) + def optOuts = c.getAnnotationsByType(org.apache.tinkerpop.gremlin.structure.Graph.OptOut) def optInCount = optIns != null ? optIns.size() : 0 def optOutCount = optOuts != null ? optOuts.size() : 0 diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java similarity index 93% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java index 7565b86c7ab..4e0660ef51b 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/AbstractGremlinServerIntegrationTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.Settings; import org.junit.After; import org.junit.Before; diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java similarity index 95% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java index f960d825d05..b30af7b9d50 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverGremlinPluginTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.IO; @@ -41,7 +41,7 @@ public void shouldPluginToAndDoImports() throws Exception { plugin.pluginTo(spy); assertEquals(4, spy.getImports().size()); - spy.getImports().forEach(importString -> assertThat(importString, containsString("com.tinkerpop.gremlin.driver"))); + spy.getImports().forEach(importString -> assertThat(importString, containsString("org.apache.tinkerpop.gremlin.driver"))); } @Test diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java similarity index 95% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java index c2faa57040c..c1710c41fbf 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.driver.Result; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.driver.Result; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.codehaus.groovy.tools.shell.Groovysh; import org.junit.After; import org.junit.Before; diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java similarity index 93% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java index 9ba667c4c3b..cea92e5f384 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.groovy.plugin.RemoteException; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException; import org.codehaus.groovy.tools.shell.Groovysh; import org.junit.After; import org.junit.Before; diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java similarity index 95% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java index b6684c521e4..dae34cad09f 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SpyPluginAcceptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; import javax.script.ScriptException; import java.util.HashMap; diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java similarity index 83% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java index 900c5b2d1fd..bddb81c8199 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/SugarGremlinPluginTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.groovy.plugin.SugarGremlinPlugin; -import com.tinkerpop.gremlin.groovy.util.MetaRegistryUtil; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.groovy.plugin.SugarGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.util.MetaRegistryUtil; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.IO; import org.junit.Test; diff --git a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java similarity index 86% rename from gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java rename to gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java index 99f1af7f1ad..3cb398f2c80 100644 --- a/gremlin-console/src/test/java/com/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/UtilitiesGremlinPluginTest.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.console.groovy.plugin; +package org.apache.tinkerpop.gremlin.console.groovy.plugin; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.IO; -import org.junit.Ignore; import org.junit.Test; import java.util.HashMap; @@ -67,6 +66,6 @@ public void shouldPluginUtilities() throws Exception { final SpyPluginAcceptor spy = new SpyPluginAcceptor(groovysh::execute, () -> env); plugin.pluginTo(spy); - assertThat(groovysh.execute("describeGraph(com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph)").toString(), containsString("IMPLEMENTATION - com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph")); + assertThat(groovysh.execute("describeGraph(org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph)").toString(), containsString("IMPLEMENTATION - org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph")); } } diff --git a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/remote.yaml b/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/remote.yaml deleted file mode 100644 index 078607c2e09..00000000000 --- a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/remote.yaml +++ /dev/null @@ -1,3 +0,0 @@ -hosts: [localhost] -port: 8182 -serializer: { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} \ No newline at end of file diff --git a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml similarity index 63% rename from gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml rename to gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml index cdcb0623ea0..ce8c5dc61e4 100644 --- a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml +++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml @@ -17,12 +17,12 @@ scriptEngines: { imports: [java.lang.Math], staticImports: [java.lang.Math.PI]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;com.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer]}} - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true}} - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer]}} + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true}} + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } processors: - - { className: com.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} + - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml new file mode 100644 index 00000000000..c1addb94e14 --- /dev/null +++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml @@ -0,0 +1,3 @@ +hosts: [localhost] +port: 8182 +serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} \ No newline at end of file diff --git a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties similarity index 91% rename from gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties rename to gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties index f0ad15cbb31..6590d391616 100644 --- a/gremlin-console/src/test/resources/com/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties +++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/tinkergraph-empty.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -gremlin.graph=com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph \ No newline at end of file +gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph \ No newline at end of file diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml index 7dc512d6bcd..7e510ad703b 100644 --- a/gremlin-core/pom.xml +++ b/gremlin-core/pom.xml @@ -18,7 +18,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/FastNoSuchElementException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/FastNoSuchElementException.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/FastNoSuchElementException.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/FastNoSuchElementException.java index 0773791cd78..180252e0996 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/FastNoSuchElementException.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/FastNoSuchElementException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Path.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Path.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Path.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Path.java index f892401406a..e5dfe3ed03b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Path.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Path.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; import org.javatuples.Pair; @@ -29,7 +29,7 @@ import java.util.stream.Stream; /** - * A Path denotes a particular walk through a {@link com.tinkerpop.gremlin.structure.Graph} as defined by a {@link Traverser}. + * A Path denotes a particular walk through a {@link org.apache.tinkerpop.gremlin.structure.Graph} as defined by a {@link Traverser}. * In abstraction, any Path implementation maintains two lists: a list of sets of labels and a list of objects. * The list of labels are the labels of the steps traversed. * The list of objects are the objects traversed. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Scope.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Scope.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Scope.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Scope.java index 3bf881da4ad..0603879ab30 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Scope.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Scope.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Step.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Step.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Step.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Step.java index 6eb4f445a72..a3347b3d621 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Step.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Step.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Iterator; @@ -107,7 +107,7 @@ public interface Step extends Iterator>, Cloneable { /** * Cloning is used to duplicate steps for the purpose of traversal optimization and OLTP replication. * When cloning a step, it is important that the steps, the cloned step is equivalent to the state of the step when reset() is called. - * Moreover, the previous and next steps should be set to {@link com.tinkerpop.gremlin.process.traversal.step.EmptyStep}. + * Moreover, the previous and next steps should be set to {@link org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep}. * * @return The cloned step * @throws CloneNotSupportedException @@ -146,7 +146,7 @@ public interface Step extends Iterator>, Cloneable { public String getId(); /** - * Provide the necessary {@link com.tinkerpop.gremlin.process.traverser.TraverserRequirement} that must be met by the traverser in order for the step to function properly. + * Provide the necessary {@link org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement} that must be met by the traverser in order for the step to function properly. * The provided default implements returns an empty set. * * @return the set of requirements diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/T.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/T.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/T.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/T.java index 9039300c6dc..20d4f92c087 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/T.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/T.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traversal.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traversal.java index f0c73272138..0d3c3064be7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traversal.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; - -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversal; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Graph; +package org.apache.tinkerpop.gremlin.process; + +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.DefaultTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.util.ArrayList; import java.util.Collection; @@ -221,7 +221,7 @@ public interface Admin extends Traversal { /** * Add an iterator of {@link Traverser} objects to the head/start of the traversal. - * Users should typically not need to call this method. For dynamic inject of data, they should use {@link com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep}. + * Users should typically not need to call this method. For dynamic inject of data, they should use {@link org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep}. * * @param starts an iterators of traversers */ @@ -231,7 +231,7 @@ public default void addStarts(final Iterator> starts) { /** * Add a single {@link Traverser} object to the head of the traversal. - * Users should typically not need to call this method. For dynamic inject of data, they should use {@link com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep}. + * Users should typically not need to call this method. For dynamic inject of data, they should use {@link org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep}. * * @param start a traverser to add to the traversal */ @@ -335,7 +335,7 @@ public default Step getEndStep() { /** * Get the {@link TraverserGenerator} associated with this traversal. - * The traversal generator creates {@link Traverser} instances that are respective of the traversal's {@link com.tinkerpop.gremlin.process.traverser.TraverserRequirement}. + * The traversal generator creates {@link Traverser} instances that are respective of the traversal's {@link org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement}. * * @return the generator of traversers */ @@ -408,7 +408,7 @@ public default Traversal.Admin reverse() throws IllegalStateException { public TraversalStrategies getStrategies(); /** - * Set the {@link com.tinkerpop.gremlin.process.traversal.step.TraversalParent} {@link Step} that is the parent of this traversal. + * Set the {@link org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent} {@link Step} that is the parent of this traversal. * Traversals can be nested and this is the means by which the traversal tree is connected. * * @param step the traversal holder parent step @@ -416,7 +416,7 @@ public default Traversal.Admin reverse() throws IllegalStateException { public void setParent(final TraversalParent step); /** - * Get the {@link com.tinkerpop.gremlin.process.traversal.step.TraversalParent} {@link Step} that is the parent of this traversal. + * Get the {@link org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent} {@link Step} that is the parent of this traversal. * Traversals can be nested and this is the means by which the traversal tree is walked. * * @return the traversal holder parent step diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalEngine.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java index ad14db6ca36..276d48357a3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalEngine.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalSideEffects.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalSideEffects.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalSideEffects.java index 9653017b903..1f9551300dd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalSideEffects.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Optional; import java.util.Set; @@ -176,9 +176,9 @@ public default void forEach(final BiConsumer biConsumer) { } /** - * In a distributed {@link com.tinkerpop.gremlin.process.computer.GraphComputer} traversal, the sideEffects of the traversal are not a single object within a single JVM. + * In a distributed {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer} traversal, the sideEffects of the traversal are not a single object within a single JVM. * Instead, the sideEffects are distributed across the graph and the pieces are stored on the computing vertices. - * This method is necessary to call when the {@link com.tinkerpop.gremlin.process.Traversal} is processing the {@link com.tinkerpop.gremlin.process.Traverser}s at a particular {@link com.tinkerpop.gremlin.structure.Vertex}. + * This method is necessary to call when the {@link org.apache.tinkerpop.gremlin.process.Traversal} is processing the {@link org.apache.tinkerpop.gremlin.process.Traverser}s at a particular {@link org.apache.tinkerpop.gremlin.structure.Vertex}. * * @param vertex the vertex where the traversal is currently executing. */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java index 7984c2645ad..b701a7e271e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; - -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.ComparatorHolderRemovalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.ConjunctionStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.DedupOptimizerStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.EngineDependentStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.IdentityRemovalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.LabeledEndStepStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.MatchWhereStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.ProfileStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.ReducingStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.SideEffectCapStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.SideEffectRegistrationStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategy; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversalStrategies; -import com.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.tools.MultiMap; +package org.apache.tinkerpop.gremlin.process; + +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.ComparatorHolderRemovalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.ConjunctionStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.DedupOptimizerStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.EngineDependentStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.IdentityRemovalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.LabeledEndStepStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.MatchWhereStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.ProfileStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.ReducingStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.SideEffectCapStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.SideEffectRegistrationStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.DefaultTraversalStrategies; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.tools.MultiMap; import java.util.ArrayList; import java.util.Collections; @@ -105,7 +105,7 @@ public interface TraversalStrategies extends Cloneable { public void setTraverserGeneratorFactory(final TraverserGeneratorFactory traverserGeneratorFactory); /** - * Sorts the list of provided strategies such that the {@link com.tinkerpop.gremlin.process.TraversalStrategy#applyPost()} + * Sorts the list of provided strategies such that the {@link org.apache.tinkerpop.gremlin.process.TraversalStrategy#applyPost()} * and {@link TraversalStrategy#applyPrior()} dependencies are respected. *

* Note, that the order may not be unique. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java index 40b90d6cb01..4843854b65c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traverser.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traverser.java index dfa2ae95051..eeb828f7e86 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/Traverser.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.detached.Attachable; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.Attachable; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraverserGenerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraverserGenerator.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraverserGenerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraverserGenerator.java index e0ca21700a4..28563dba524 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraverserGenerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraverserGenerator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Iterator; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ComputerResult.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ComputerResult.java index f7f79365b17..3e8abc558dc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ComputerResult.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; /** * The result of the {@link GraphComputer}'s computation. This is returned in a {@link java.util.concurrent.Future} by GraphComputer.submit(). diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputer.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputer.java index d99b79da5ed..932b518e99d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputer.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; import java.util.concurrent.Future; /** * The {@link GraphComputer} is responsible for the execution of a {@link VertexProgram} and then a set of {@link MapReduce} jobs - * over the vertices in the {@link com.tinkerpop.gremlin.structure.Graph}. It is up to the {@link GraphComputer} implementation to determine the + * over the vertices in the {@link org.apache.tinkerpop.gremlin.structure.Graph}. It is up to the {@link GraphComputer} implementation to determine the * appropriate memory structures given the computing substrate. {@link GraphComputer} implementations also * maintains levels of memory {@link Isolation}: Bulk Synchronous and Dirty Bulk Synchronous. * diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/KeyValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/KeyValue.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/KeyValue.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/KeyValue.java index ca2af61f279..7c24a2389c5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/KeyValue.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/KeyValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java index 14d54c05db4..a73b0dc5aa5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.io.IOException; @@ -32,7 +32,7 @@ /** * A MapReduce is composed of map(), combine(), and reduce() stages. - * The map() stage processes the vertices of the {@link com.tinkerpop.gremlin.structure.Graph} in a logically parallel manner. + * The map() stage processes the vertices of the {@link org.apache.tinkerpop.gremlin.structure.Graph} in a logically parallel manner. * The combine() stage aggregates the values of a particular map emitted key prior to sending across the cluster. * The reduce() stage aggregates the values of the combine/map emitted keys for the keys that hash to the current machine in the cluster. * The interface presented here is nearly identical to the interface popularized by Hadoop save the the map() is over the vertices of the graph. @@ -213,7 +213,7 @@ public interface MapEmitter { public void emit(final K key, final V value); /** - * A default method that assumes the key is {@link com.tinkerpop.gremlin.process.computer.MapReduce.NullObject}. + * A default method that assumes the key is {@link org.apache.tinkerpop.gremlin.process.computer.MapReduce.NullObject}. * * @param value the value to emit. */ @@ -233,7 +233,7 @@ public interface ReduceEmitter { public void emit(final OK key, OV value); /** - * A default method that assumes the key is {@link com.tinkerpop.gremlin.process.computer.MapReduce.NullObject}. + * A default method that assumes the key is {@link org.apache.tinkerpop.gremlin.process.computer.MapReduce.NullObject}. * * @param value the value to emit. */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Memory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Memory.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Memory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Memory.java index 8d573eaa69c..fb0c97719e8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Memory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Memory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; -import com.tinkerpop.gremlin.process.computer.util.ImmutableMemory; +import org.apache.tinkerpop.gremlin.process.computer.util.ImmutableMemory; import org.javatuples.Pair; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageCombiner.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageCombiner.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageCombiner.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageCombiner.java index c2d7535a472..b9d96c9c8e7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageCombiner.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageCombiner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; /** * A MessageCombiner allows two messages in route to the same vertex to be aggregated into a single message. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageScope.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageScope.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageScope.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageScope.java index 75e4965cdac..d232c531819 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MessageScope.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MessageScope.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Arrays; import java.util.function.BiFunction; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Messenger.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Messenger.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Messenger.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Messenger.java index 087b61ae26f..6190f2883a9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/Messenger.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/Messenger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; /** * The {@link Messenger} serves as the routing system for messages between vertices. For distributed systems, diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/VertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/VertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java index c207465203a..ada56bb610a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/VertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.java @@ -17,9 +17,9 @@ * under the License. */ -package com.tinkerpop.gremlin.process.computer; +package org.apache.tinkerpop.gremlin.process.computer; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.lang.reflect.Constructor; @@ -129,7 +129,7 @@ public default void workerIterationEnd(final Memory memory) { } /** - * The {@link com.tinkerpop.gremlin.structure.Element} properties that will be mutated during the computation. + * The {@link org.apache.tinkerpop.gremlin.structure.Element} properties that will be mutated during the computation. * All properties in the graph are readable, but only the keys specified here are writable. * The default is an empty set. * diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java index 8d39f643be6..5f625d550a7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterCountMapReduce.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.clustering.peerpressure; - -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure; + +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.Configuration; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java index a8a400dfd6f..e172738fae5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/ClusterPopulationMapReduce.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.clustering.peerpressure; +package org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.Configuration; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java index 37270f6d2b1..30dfc9e0b19 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.clustering.peerpressure; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; -import com.tinkerpop.gremlin.process.computer.util.LambdaHolder; -import com.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; -import com.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; +import org.apache.tinkerpop.gremlin.process.computer.util.LambdaHolder; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.Configuration; import org.javatuples.Pair; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java index 13caa2f8fd2..5c356560ab9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaMapReduce.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.lambda; - -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; -import com.tinkerpop.gremlin.process.computer.util.LambdaHolder; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.TriConsumer; +package org.apache.tinkerpop.gremlin.process.computer.lambda; + +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; +import org.apache.tinkerpop.gremlin.process.computer.util.LambdaHolder; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.TriConsumer; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java index 45bd9b9efa6..a971588ffa4 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/lambda/LambdaVertexProgram.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.lambda; - -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; -import com.tinkerpop.gremlin.process.computer.util.LambdaHolder; -import com.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; -import com.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.TriConsumer; +package org.apache.tinkerpop.gremlin.process.computer.lambda; + +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; +import org.apache.tinkerpop.gremlin.process.computer.util.LambdaHolder; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.TriConsumer; import org.apache.commons.configuration.Configuration; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java index c29bdb8eae5..861adaf4598 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMapReduce.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.ranking.pagerank; +package org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.Configuration; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java index 43eae715c03..13ddd9bbb60 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankMessageCombiner.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.ranking.pagerank; +package org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java index ee3595f8a76..09f04d12a5c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.ranking.pagerank; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; -import com.tinkerpop.gremlin.process.computer.util.LambdaHolder; -import com.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; -import com.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; +import org.apache.tinkerpop.gremlin.process.computer.util.LambdaHolder; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramHelper; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.Configuration; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java index af1437a5ffa..c3ca8819b1f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScript.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal; +package org.apache.tinkerpop.gremlin.process.computer.traversal; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.util.concurrent.Future; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java index 0020c179d44..1a5b5d5f422 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java @@ -16,34 +16,34 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce; -import com.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; -import com.tinkerpop.gremlin.process.computer.util.LambdaHolder; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.TraversalMatrix; -import com.tinkerpop.gremlin.process.util.TraverserSet; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.process.computer.traversal; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce; +import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder; +import org.apache.tinkerpop.gremlin.process.computer.util.LambdaHolder; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.TraversalMatrix; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.Configuration; import java.util.*; @@ -51,8 +51,8 @@ /** - * TraversalVertexProgram enables the evaluation of a {@link Traversal} on a {@link com.tinkerpop.gremlin.process.computer.GraphComputer}. - * At the start of the computation, each {@link Vertex} (or {@link com.tinkerpop.gremlin.structure.Edge}) is assigned a single {@link Traverser}. + * TraversalVertexProgram enables the evaluation of a {@link Traversal} on a {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer}. + * At the start of the computation, each {@link Vertex} (or {@link org.apache.tinkerpop.gremlin.structure.Edge}) is assigned a single {@link Traverser}. * For each traverser that is local to the vertex, the vertex looks up its current location in the traversal and processes that step. * If the outputted traverser of the step references a local structure on the vertex (e.g. the vertex, an incident edge, its properties, or an arbitrary object), * then the vertex continues to compute the next traverser. If the traverser references another location in the graph, @@ -83,7 +83,7 @@ private TraversalVertexProgram() { /** * A helper method to yield a {@link Supplier} of {@link Traversal} from the {@link Configuration}. - * The supplier is either a {@link Class}, {@link com.tinkerpop.gremlin.process.computer.util.ScriptEngineLambda}, or a direct Java8 lambda. + * The supplier is either a {@link Class}, {@link org.apache.tinkerpop.gremlin.process.computer.util.ScriptEngineLambda}, or a direct Java8 lambda. * * @param configuration The configuration containing the public static TRAVERSAL_SUPPLIER key. * @return the traversal supplier in the configuration diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java index 0adc693cadf..533e6199d61 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgramMessageCombiner.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal; +package org.apache.tinkerpop.gremlin.process.computer.traversal; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; -import com.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java index 62856fce20c..5a56b80737f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal; +package org.apache.tinkerpop.gremlin.process.computer.traversal; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.traversal.TraversalMatrix; -import com.tinkerpop.gremlin.process.util.TraverserSet; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.util.detached.DetachedElement; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.traversal.TraversalMatrix; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java index bde04eb40e1..96fb7d48865 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal; +package org.apache.tinkerpop.gremlin.process.computer.traversal; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Collections; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java similarity index 76% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java index 54b119ec32d..c4be46b0b90 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.detached.Attachable; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.detached.Attachable; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.HashMap; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java index 2127df54ce9..0d35dc403c6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.util.TraverserSet; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.Configuration; import java.util.Comparator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java index b0d17469af6..dd5cfe4d83a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/AbstractVertexProgramBuilder.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; import org.apache.commons.configuration.BaseConfiguration; /** diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java similarity index 80% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java index 8bc42392994..b756c0b9af2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategy.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.structure.strategy.StrategyContext; -import com.tinkerpop.gremlin.structure.strategy.StrategyGraph; -import com.tinkerpop.gremlin.structure.strategy.StrategyVertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyContext; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraph; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyVertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.HashSet; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java index e1d75abbf98..edb2a3e3126 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/GraphComputerHelper.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.lang.reflect.Method; import java.util.Comparator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java index 29794873573..c04d231f452 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ImmutableMemory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/LambdaHolder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/LambdaHolder.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/LambdaHolder.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/LambdaHolder.java index 8a629d4fc8a..e149457bb8c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/LambdaHolder.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/LambdaHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; import org.apache.commons.configuration.Configuration; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MapMemory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MapMemory.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MapMemory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MapMemory.java index 6dc56fe6787..d9a0c06f212 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MapMemory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MapMemory.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.io.Serializable; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MemoryHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MemoryHelper.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MemoryHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MemoryHelper.java index c5d5a2d61b0..51be2ef821c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/MemoryHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/MemoryHelper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.Memory; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java index 1d99870796d..c9e77513fe0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineCache.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java index 80abda198e0..a3f70dcadc7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambda.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.util.function.TriConsumer; +import org.apache.tinkerpop.gremlin.util.function.TriConsumer; import javax.script.Bindings; import javax.script.ScriptEngine; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java index 7af51ecce68..9a9a6f3846e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticMapReduce.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.Configuration; /** diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java index 541e5e4e0b1..b0c0362a33f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/StaticVertexProgram.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; import org.apache.commons.configuration.Configuration; /** diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java index b2a5f97168e..a177876ee60 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.util.Serializer; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.util.Serializer; import org.apache.commons.configuration.Configuration; import java.io.IOException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java index ffd1e9e560d..44bc92ac0a2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/DefaultGraphTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; +package org.apache.tinkerpop.gremlin.process.graph.traversal; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.DefaultTraversal; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java index 00a5397f5e7..39f7f26207d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/EdgeTraversal.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; +package org.apache.tinkerpop.gremlin.process.graph.traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java index 0b9c17a823f..ec8d3c9c4fe 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Scope; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Scope; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Collection; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java index 3c8ee4a3047..82a6aca40af 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java @@ -16,107 +16,107 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Scope; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; -import com.tinkerpop.gremlin.process.graph.traversal.lambda.LoopTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; -import com.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.ChooseStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.AndStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTraversalStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.IsStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.OrStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.RangeStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.TimeLimitStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.BackStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.CoalesceStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.CountStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeOtherVertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.FlatMapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.FoldStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.IdStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.KeyStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.LabelStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MaxStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MeanStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MinStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.OrderGlobalStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.OrderLocalStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PathStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyMapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyValueStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.SackStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.SelectOneStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.SelectStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.SumStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.UnfoldStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AddEdgeStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackElementValueStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackObjectStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SubgraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.PathIdentityStep; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; -import com.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.MapTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal; -import com.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal; -import com.tinkerpop.gremlin.process.traversal.step.ElementFunctionComparator; -import com.tinkerpop.gremlin.process.traversal.step.ElementValueComparator; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Order; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.PropertyType; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Scope; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.lambda.LoopTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.ChooseStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.AndStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTraversalStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.IsStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.OrStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RangeStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.TimeLimitStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.BackStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CoalesceStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeOtherVertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.FlatMapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.FoldStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.IdStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.KeyStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.LabelStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MaxStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MeanStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MinStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderGlobalStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderLocalStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyMapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyValueStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SackStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SelectOneStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SelectStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SumStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.UnfoldStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AddEdgeStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackElementValueStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackObjectStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SubgraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.PathIdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.ElementFunctionComparator; +import org.apache.tinkerpop.gremlin.process.traversal.step.ElementValueComparator; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.PropertyType; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Arrays; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java index be0f2932beb..9c8cf2d1c46 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexPropertyTraversal.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; +package org.apache.tinkerpop.gremlin.process.graph.traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java index 9bc0c9b23f9..55ec6c4c29b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/VertexTraversal.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; +package org.apache.tinkerpop.gremlin.process.graph.traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import java.util.List; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/__.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java index 813e9373e62..138e13cdf3d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/__.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Scope; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Scope; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Collection; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java index d9176a6b983..fdc03fa247e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.graph.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.lambda.AbstractLambdaTraversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.AbstractLambdaTraversal; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java index 01f9514c024..474c9943f1b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/ComparatorHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step; import java.util.Comparator; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java index ab726b5eec6..8b4d3579d90 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/HasContainerHolder.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java index 9946bb1b5a7..6263b96c423 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/Ranging.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java index ccb5c462750..9ad7d874a6d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/SideEffectCapable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java index b6575f3a1bd..dbea36ab511 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/TraversalOptionParent.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java index ed261ee5dea..365b37bd1f9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.*; import java.util.stream.Collectors; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java index e9b69f07f8b..d692b47db59 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.lambda.HasNextTraversal; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.HasNextTraversal; /** * A step which offers a choice of two or more Traversals to take. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java index b88988361f1..20c74a7b4b5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java index 1abbcb0feb9..055818f2b73 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java index 29acc09b3f9..226ab0c5a0b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; -import com.tinkerpop.gremlin.process.traversal.lambda.MapTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java index 6c0a2907386..9044b4c3834 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java index e9d51b19536..73297243562 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Random; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java index ca242f5d6a3..e870e223e03 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.ArrayList; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java index 7eda0703c54..4ce1856285d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java index 66af4f5b8b6..f6facd81ea0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupStep.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.HashSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java index ae37ca1f821..09b633bb5e8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collection; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java index 10888e77bb4..fa539a0ddbc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.function.Predicate; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java similarity index 75% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java index 9971c3378d5..3b38ea55d80 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Element; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java similarity index 80% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java index a51d929b5d3..e69569f595e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java index 463e5917dbb..1b7e3d0a5aa 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java index deaa89d2e39..a5c183e86da 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java index 388db278ae8..f18c28f975e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.Ranging; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.Ranging; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java index bbc4fa2338b..5fe7bee9763 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collection; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java index f0af2d6aef2..1000d55b5ef 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleStep.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.lambda.OneTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.OneTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java index 8343465b038..1c26a30cfe0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java index b2ee1f190a7..e7d8fa0a271 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/TimeLimitStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java index 3968ce679c3..ff567f4006e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java index 50d4df79f83..43c1a76d06c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java index 71c3873c397..30597414b52 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.ArrayList; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java index 6d6c2dbbf11..7bcd956002a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java index b54de6704c6..96bc336a98d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeOtherVertexStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java index eef72ba25ce..997e720d94f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/EdgeVertexStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java index b7dcaa55713..aef25e491b2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FlatMapStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java index 4fccce29386..cc3777a3422 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.ArrayList; import java.util.EnumSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java index 05d665fbaf0..eefe97015b6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/IdStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java index cdbe29feb9e..b8074073e0a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/KeyStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Property; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java index 5691c25d1e2..f91bf67d73b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/LabelStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java index ee6f7bd7751..17041774d46 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java index a60e2a30209..96bcb7e62b6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java index 500c58d731c..ae09995525e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java index 783f2520f8b..984088f3341 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java index 17f34c68c3b..431998185f2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderGlobalStep.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Order; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java index 97de8dd5b6a..9b9feb29d56 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderLocalStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Order; import java.util.ArrayList; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java index 240156a202f..824dc4df633 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathStep.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalRing; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.path.MutablePath; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalRing; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.path.MutablePath; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java index 901a82f4f41..7f09bf6ce92 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.PropertyType; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.PropertyType; import java.util.Arrays; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java index 88c8d12edb7..4b5032856a0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyElementStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java index 6ca980c8596..1c746a96d8e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyMapStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.PropertyType; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.PropertyType; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.util.Arrays; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java index 65070ae28c3..114da3aa207 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertyValueStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Property; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java index 120450fa7fa..6da50da7d71 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SackStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java index 61ba72d9e87..7d93155dc92 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectOneStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Map; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java index d5562b0df4c..99b4f30a5c8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectStep.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalRing; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalRing; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java similarity index 80% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java index 8f2d745ce57..c840dd5a85b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java index 1e3054dbfdd..b8e83b12856 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java index 74a644c9298..1932971cb94 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexStep.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Arrays; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java index 89a9f205535..44ff69e36d2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.Comparator; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java index 782f7d6baeb..3285eafe93d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/CrossJoinEnumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.function.BiConsumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java index d374d014be6..169f76ba60a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/Enumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.function.BiConsumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java index 03200f86fdf..6cc3099d3b3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/InnerJoinEnumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.ArrayList; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java index 86879286c75..f974dafe7b6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/IteratorEnumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.ArrayList; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java index 7928345b813..91b10ac94be 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; - -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; + +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java index 42570a393b0..ce0739d8fec 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SerialEnumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.ArrayList; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java index 4f1dd8e33bc..37443f4a040 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/match/SimpleEnumerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map.match; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match; import java.util.Iterator; import java.util.function.BiConsumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java index 92d47213e6a..c138334b4af 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java similarity index 76% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java index edcdefcdb3a..26a3847eca8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateStep.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.AggregateMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.AggregateMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; import java.util.Collection; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java index bc280f268a7..89384e8ddde 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Arrays; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java index 44e6ffe9e17..d507ffb30d7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountStep.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupCountMapReduce; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupCountMapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; import java.util.Collections; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java index b05bdbdce6a..4bf39db1b4b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupStep.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupMapReduce; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.BulkSet; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupMapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; import java.util.Arrays; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java index 1afa1cb5db5..d572bc2f246 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/IdentityStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java index 753c12dc1d5..5b138c1b692 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectStep.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traversal; import java.util.Arrays; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java index baee37395d0..98876a22651 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileStep.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.ProfileMapReduce; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.ProfileMapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java index a0caaecb1a3..a1f84a5bcaf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java index a802455a53a..0559111a539 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java index 4d93b355da3..637868579e3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.SupplyingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.SupplyingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.*; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java index be794581d70..ec589873c8f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.function.Consumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java index 12be68a68e3..97fb96a54c1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Iterator; import java.util.stream.Stream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java similarity index 76% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java index fc7cecdd8ed..8aab655efe9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreStep.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.StoreMapReduce; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.StoreMapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; import java.util.Collection; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java index 3bd47a6172f..b27e8e98fdc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.util.GraphFactory; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; import java.util.*; @@ -47,7 +47,7 @@ public final class SubgraphStep extends SideEffectStep implements SideEffe private String sideEffectKey; private static final Map DEFAULT_CONFIGURATION = new HashMap() {{ - put(Graph.GRAPH, "com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph"); // hard coded because TinkerGraph is not part of gremlin-core + put(Graph.GRAPH, "org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph"); // hard coded because TinkerGraph is not part of gremlin-core }}; // TODO: add support for side-effecting out an edge list. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java index 70b8cbbc556..1732e12c85a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeStep.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.traversal.step.MapReducer; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.TreeMapReduce; -import com.tinkerpop.gremlin.process.graph.util.Tree; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.process.traversal.util.TraversalRing; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.TreeMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.util.Tree; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalRing; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.List; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java index 28dd066c132..fe0655ae5f1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/AggregateMapReduce.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateStep; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateStep; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java index 09148e47db5..b3d3bca9871 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupCountMapReduce.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; - -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountStep; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; + +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountStep; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java index 04d9c7f9154..ec93490affb 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupStep; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.process.traversal.TraversalMatrix; -import com.tinkerpop.gremlin.process.traversal.util.TraversalUtil; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupStep; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.process.traversal.TraversalMatrix; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java index 45712203b2f..3399b9aa6f4 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/ProfileMapReduce.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java index 163be4bd532..8080b71fc05 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/StoreMapReduce.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreStep; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreStep; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java index 488e751390a..bdf34777f4b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/TreeMapReduce.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeStep; -import com.tinkerpop.gremlin.process.graph.util.Tree; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeStep; +import org.apache.tinkerpop.gremlin.process.graph.util.Tree; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java index e8501589eb1..1ab5c5b329c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/CollectingBarrierStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java index eb2afe987d5..71f38ef4d9e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ComputerAwareStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java index ca81ff96897..379fa4e7704 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/MarkerIdentityStep.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java index 1f1b851ed56..4b39aa639d8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/PathIdentityStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; import java.util.Collections; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java index 4b807edefff..aa33aaeceba 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/ReducingBarrierStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.function.BiFunction; import java.util.function.Supplier; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java index 4153c85be1f..cb9415f39cf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/SupplyingBarrierStep.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.function.Supplier; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java index 2ca13da72a5..44ce828a62e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/AbstractTraversalStrategy.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java index aa3363647c4..b0fc730cbf9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java index dc7f5520734..63082078f96 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.AndStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.ConjunctionStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.OrStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.AndStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.ConjunctionStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.OrStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java similarity index 79% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java index 775c336925e..781ecdee1d9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.OrderGlobalStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderGlobalStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Arrays; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java index b79dd7e9d67..11cfda0bf33 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.traversal.step.EngineDependent; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java index 9b59805f51b..0aa0f89a803 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java index 9d1ed816cc5..ae10ddc0cd9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.MarkerIdentityStep; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.MarkerIdentityStep; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java similarity index 80% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java index 332374875f4..134edfb1978 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.SelectStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SelectStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.HashSet; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java index 6f84465dda7..4e183411818 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.HashSet; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java index 6d0aafe8542..f58ea33fd0b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.Reducing; -import com.tinkerpop.gremlin.process.traversal.step.AbstractStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reducing; +import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java index 3627ba3dd8d..2fdae925d79 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java index 5d506e9b865..6b7afe04eb2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java index bf74148ec61..e89cc0e2487 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.SupplyingBarrierStep; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ComputerAwareStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.SupplyingBarrierStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java similarity index 84% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java index 88018f41d8c..f0f14761252 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/util/EmptyGraphTraversal.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.util; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/HasContainer.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/HasContainer.java index b4dfe372642..3bcbbb18779 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/HasContainer.java @@ -16,15 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.util; +package org.apache.tinkerpop.gremlin.process.graph.util; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import java.util.Iterator; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/Tree.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/Tree.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/Tree.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/Tree.java index 04d05840304..bfb225a28f8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/Tree.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/util/Tree.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.util; +package org.apache.tinkerpop.gremlin.process.graph.util; import java.io.Serializable; import java.util.*; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java index 4a3284bcfaf..4a319ff9d00 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +package org.apache.tinkerpop.gremlin.process.traversal; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java index 68c44bbcca5..b2bda5f3e1c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalSideEffects.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.process.traversal; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.traversal.util.SideEffectHelper; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.traversal.util.SideEffectHelper; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Collections; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java index c6fa9f020a5..22f8754b09d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.process.traversal; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; -import com.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/StepPosition.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/StepPosition.java index 0d87a2a0c2a..c8857f80ae6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/StepPosition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.process.traversal; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/TraversalMatrix.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java similarity index 83% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/TraversalMatrix.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java index 90d84ad6b24..ed68cd289f1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/TraversalMatrix.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.process.traversal; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,7 @@ /** * A TraversalMatrix provides random, non-linear access to the steps of a traversal by their step id. * This is useful in situations where traversers becomes detached from their traversal (and step) and later need to be re-attached. - * A classic use case is {@link com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram} on {@link com.tinkerpop.gremlin.process.computer.GraphComputer}. + * A classic use case is {@link org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram} on {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer}. * * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java index d2b230de4d4..99851788232 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traverser.O_TraverserGenerator; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversalSideEffects; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversalStrategies; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traverser.O_TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversalStrategies; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java index 285018e5a09..98f0fe065cc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.structure.Element; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java index 61bc598d65b..0ab2455040e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.util.function.Predicate; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java index 39f75b9761a..3ac002b5de1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/FilterTraverserTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.util.function.Predicate; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java index 830fb1ed1ee..a1d6ff6c9fa 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/HasNextTraversal.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.List; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java index b251685f624..7b85784fc56 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/IdentityTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java index 82625ac6cde..b7baeeee45a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java index a459f1ab4ae..9675b74c228 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/MapTraverserTraversal.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java index 71e6aec073e..2d153ba5a38 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/OneTraversal.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java index da1b40e9655..fe111215962 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TrueTraversal.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.lambda; +package org.apache.tinkerpop.gremlin.process.traversal.lambda; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/AbstractStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/AbstractStep.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/AbstractStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/AbstractStep.java index f1d3d84f763..83748e0f58a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/AbstractStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/AbstractStep.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java index 6e75f60db17..49e97e7ecb3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.Comparator; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java index f95c30eec12..03aa4a28666 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Element; import java.util.Comparator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EmptyStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EmptyStep.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EmptyStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EmptyStep.java index 7c97fc510cb..d71a2c6886d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EmptyStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EmptyStep.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; - -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +package org.apache.tinkerpop.gremlin.process.traversal.step; + +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EngineDependent.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EngineDependent.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EngineDependent.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EngineDependent.java index a945956a2a7..7853fa79e58 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/EngineDependent.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/EngineDependent.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java index 14fc2bdb89b..59d6e36a9e2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ExpandableStepIterator.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.util.iterator.MultiIterator; -import com.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.util.iterator.MultiIterator; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/MapReducer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/MapReducer.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/MapReducer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/MapReducer.java index 75d4a5af6cc..b23b4ee3bc4 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/MapReducer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/MapReducer.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reducing.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reducing.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reducing.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reducing.java index 2692923336a..4e2149ed990 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reducing.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reducing.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; import java.util.function.BiFunction; import java.util.function.Supplier; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reversible.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reversible.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reversible.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reversible.java index f8fdafad487..b2857e5edff 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/Reversible.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Reversible.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java index 0e0a9a5a8e7..949c8620a77 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/SideEffectRegistrar.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/TraversalParent.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/TraversalParent.java index efd9dc8467a..99d7f98f1e3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/TraversalParent.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.step; +package org.apache.tinkerpop.gremlin.process.traversal.step; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Collections; import java.util.EnumSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java similarity index 82% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java index 79e484bc062..e368918cacf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; +package org.apache.tinkerpop.gremlin.process.traversal.util; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java index a37681f2a96..0891c4e8a3e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Collections; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java index 9fbb7bc9346..df53f692a0c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; -import com.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; import java.util.Collections; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java index b3ff159d580..f35a8f6e388 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/SideEffectHelper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java index a1b11272f70..f1515075910 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.step.Reversible; -import com.tinkerpop.gremlin.process.traversal.step.TraversalParent; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; -import com.tinkerpop.gremlin.process.traversal.StepPosition; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; +import org.apache.tinkerpop.gremlin.process.traversal.StepPosition; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.ArrayList; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalRing.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalRing.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java index bc451c5a699..9aa823e3502 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalRing.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal; import java.util.ArrayList; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java index b4ccb38b473..89a67038087 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalUtil.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal.util; +package org.apache.tinkerpop.gremlin.process.traversal.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java index e4fe7a13c90..35ce7007f9b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_Traverser.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.traverser.util.AbstractPathTraverser; -import com.tinkerpop.gremlin.process.util.path.SparsePath; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.util.AbstractPathTraverser; +import org.apache.tinkerpop.gremlin.process.util.path.SparsePath; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Map; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java index ac7b829c1a5..4a2d8e11a2a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java index a9b20cdea3b..4ea4a2f1dad 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_Traverser.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.traverser.util.AbstractPathTraverser; -import com.tinkerpop.gremlin.process.util.path.ImmutablePath; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.traverser.util.AbstractPathTraverser; +import org.apache.tinkerpop.gremlin.process.util.path.ImmutablePath; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java index b1deb47bdda..caf3ab9a7c7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_Traverser.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_Traverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_Traverser.java index 7b7e25d13ca..4a2be9270f5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_Traverser.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java index d940ae42b6f..6c6aa1f285c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; import java.util.EnumSet; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_Traverser.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_Traverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_Traverser.java index 8cc65d72461..b28d9b88b86 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_Traverser.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.traverser.util.AbstractTraverser; +import org.apache.tinkerpop.gremlin.process.traverser.util.AbstractTraverser; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java index cec31b5ea26..e0c7dd36cd6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/O_TraverserGenerator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; import java.util.Collections; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java index cba2f531155..2b23d9a311c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserGeneratorFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserRequirement.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserRequirement.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserRequirement.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserRequirement.java index 6648f9bed7e..e37f83d06c0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/TraverserRequirement.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/TraverserRequirement.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser; +package org.apache.tinkerpop.gremlin.process.traverser; /** - * A {@link TraverserRequirement} is a list of requirements that a {@link com.tinkerpop.gremlin.process.Traversal} requires of a {@link com.tinkerpop.gremlin.process.Traverser}. + * A {@link TraverserRequirement} is a list of requirements that a {@link org.apache.tinkerpop.gremlin.process.Traversal} requires of a {@link org.apache.tinkerpop.gremlin.process.Traverser}. * The less requirements, the simpler the traverser can be (both in terms of space and time constraints). - * Every {@link com.tinkerpop.gremlin.process.Step} provides its specific requirements via {@link com.tinkerpop.gremlin.process.Step#getRequirements()}. + * Every {@link org.apache.tinkerpop.gremlin.process.Step} provides its specific requirements via {@link org.apache.tinkerpop.gremlin.process.Step#getRequirements()}. * * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java index 0b16643382e..5d69875efb9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractPathTraverser.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser.util; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedElement; -import com.tinkerpop.gremlin.structure.util.detached.DetachedFactory; -import com.tinkerpop.gremlin.structure.util.detached.DetachedProperty; +package org.apache.tinkerpop.gremlin.process.traverser.util; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty; import java.util.Optional; import java.util.function.UnaryOperator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java index b505ad6c6af..650d9e81bcf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/AbstractTraverser.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser.util; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.util.path.EmptyPath; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversalSideEffects; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedElement; -import com.tinkerpop.gremlin.structure.util.detached.DetachedFactory; -import com.tinkerpop.gremlin.structure.util.detached.DetachedProperty; +package org.apache.tinkerpop.gremlin.process.traverser.util; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.util.path.EmptyPath; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversalSideEffects; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java similarity index 77% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java index 8f1752b0e5b..341fcd56fb5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/DefaultTraverserGeneratorFactory.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser.util; +package org.apache.tinkerpop.gremlin.process.traverser.util; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraverserGenerator; -import com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_TraverserGenerator; -import com.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_TraverserGenerator; -import com.tinkerpop.gremlin.process.traverser.B_O_TraverserGenerator; -import com.tinkerpop.gremlin.process.traverser.O_TraverserGenerator; -import com.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; -import com.tinkerpop.gremlin.process.traverser.TraverserRequirement; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traverser.O_TraverserGenerator; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement; import java.util.Set; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java index 8ce146e8e08..3d591804ad7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traverser/util/EmptyTraverser.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traverser.util; - -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.util.path.EmptyPath; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.traverser.util; + +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.util.path.EmptyPath; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/BulkSet.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/BulkSet.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/BulkSet.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/BulkSet.java index 3691ecfa39c..70be9cca537 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/BulkSet.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/BulkSet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; +package org.apache.tinkerpop.gremlin.process.util; import java.io.Serializable; import java.util.AbstractSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/MapHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/MapHelper.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/MapHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/MapHelper.java index 04ed533fb1d..98d3c537fd8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/MapHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/MapHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; +package org.apache.tinkerpop.gremlin.process.util; import java.util.ArrayList; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/TraverserSet.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/TraverserSet.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/TraverserSet.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/TraverserSet.java index 6227cfff0fe..8a57a849843 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/TraverserSet.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/TraverserSet.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; +package org.apache.tinkerpop.gremlin.process.util; -import com.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.Traverser; import java.io.Serializable; import java.util.AbstractSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java index f4db632dca5..d1bbea795f3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/ImmutableMetrics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.metric; +package org.apache.tinkerpop.gremlin.process.util.metric; import java.io.Serializable; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/Metrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/Metrics.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/Metrics.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/Metrics.java index c114b796c72..ed17f1ce219 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/Metrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/Metrics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.metric; +package org.apache.tinkerpop.gremlin.process.util.metric; import java.util.Collection; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java index 0687c3ce20a..a6a2b2ae4b4 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.metric; +package org.apache.tinkerpop.gremlin.process.util.metric; import java.util.Arrays; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java index 96ec65bb5c3..ad3e5313ea1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.metric; +package org.apache.tinkerpop.gremlin.process.util.metric; import org.apache.commons.lang.StringUtils; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java index 5c4c5b322ff..d44035c3600 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/TraversalMetrics.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.metric; +package org.apache.tinkerpop.gremlin.process.util.metric; -import com.tinkerpop.gremlin.process.util.metric.Metrics; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.util.Collection; import java.util.concurrent.TimeUnit; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/EmptyPath.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/EmptyPath.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/EmptyPath.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/EmptyPath.java index 09886ea5ae6..41672f7adaa 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/EmptyPath.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/EmptyPath.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.path; +package org.apache.tinkerpop.gremlin.process.util.path; -import com.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Path; import java.io.Serializable; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/ImmutablePath.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/ImmutablePath.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/ImmutablePath.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/ImmutablePath.java index a0cc6763090..c1bc14c1704 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/ImmutablePath.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/ImmutablePath.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.path; +package org.apache.tinkerpop.gremlin.process.util.path; -import com.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Path; import java.io.Serializable; import java.util.ArrayList; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/MutablePath.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/MutablePath.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/MutablePath.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/MutablePath.java index c3afc3eb2ea..fdcec38a378 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/MutablePath.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/MutablePath.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.path; +package org.apache.tinkerpop.gremlin.process.util.path; -import com.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Path; import java.io.Serializable; import java.util.ArrayList; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/SparsePath.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/SparsePath.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/SparsePath.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/SparsePath.java index 1b3a8709600..e9e058e9375 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/path/SparsePath.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/path/SparsePath.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util.path; +package org.apache.tinkerpop.gremlin.process.util.path; -import com.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Path; import java.io.Serializable; import java.util.ArrayList; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Compare.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java index 2f101753f9d..9e95cf17b64 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Compare.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.util.List; import java.util.function.BiPredicate; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Contains.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Contains.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Contains.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Contains.java index e51a819e9c1..a543c44ddce 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Contains.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Contains.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.util.Collection; import java.util.function.BiPredicate; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Direction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Direction.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Direction.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Direction.java index 9a95932ca8c..b52b83b9a41 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Direction.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Direction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; /** * {@link Direction} is used to denote the direction of an {@link Edge} or location of a {@link Vertex} on an diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Edge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Edge.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java index 6551fb94095..f750b55cd67 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Edge.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.process.graph.traversal.EdgeTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.EdgeTraversal; import java.util.Iterator; @@ -55,7 +55,7 @@ public interface Edge extends Element, EdgeTraversal { /** * An interface that provides access to iterators over properties and vertices, without constructing a - * {@link com.tinkerpop.gremlin.process.Traversal} object. + * {@link org.apache.tinkerpop.gremlin.process.Traversal} object. */ public interface Iterators extends Element.Iterators { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Element.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Element.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java index 86f4a1d3620..23c14a5b3ce 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Element.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Collections; import java.util.HashSet; @@ -103,14 +103,14 @@ public default V value(final String key) throws NoSuchElementException { /** * Gets the iterators for the {@code Element}. Iterators provide low-level access to the data associated with - * an {@code Element} as they do not come with the overhead of {@link com.tinkerpop.gremlin.process.Traversal} + * an {@code Element} as they do not come with the overhead of {@link org.apache.tinkerpop.gremlin.process.Traversal} * construction. Use iterators in places where performance is most crucial. */ public Element.Iterators iterators(); /** * An interface that provides access to iterators over properties of an {@code Element}, without constructing a - * {@link com.tinkerpop.gremlin.process.Traversal} object. + * {@link org.apache.tinkerpop.gremlin.process.Traversal} object. */ public interface Iterators { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Graph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java index 7f1c32875fe..d48ae980a59 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Graph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.structure.io.DefaultIo; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; -import com.tinkerpop.gremlin.structure.io.kryo.KryoMapper; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.structure.strategy.SequenceStrategy; -import com.tinkerpop.gremlin.structure.strategy.StrategyGraph; -import com.tinkerpop.gremlin.structure.util.FeatureDescriptor; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.structure.io.DefaultIo; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.structure.strategy.SequenceStrategy; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraph; +import org.apache.tinkerpop.gremlin.structure.util.FeatureDescriptor; import org.apache.commons.configuration.Configuration; import org.javatuples.Pair; @@ -212,7 +212,7 @@ public default StrategyGraph strategy(final GraphStrategy... strategies) { /** * Get the {@link org.apache.commons.configuration.Configuration} associated with the construction of this graph. - * Whatever configuration was passed to {@link com.tinkerpop.gremlin.structure.util.GraphFactory#open(org.apache.commons.configuration.Configuration)} + * Whatever configuration was passed to {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory#open(org.apache.commons.configuration.Configuration)} * is what should be returned by this method. * * @return the configuration used during graph construction. @@ -228,7 +228,7 @@ public default StrategyGraph strategy(final GraphStrategy... strategies) { /** * An interface that provides access to iterators over {@link Vertex} objects and {@link Edge} objects of the graph - * without constructing a {@link com.tinkerpop.gremlin.process.Traversal} object. + * without constructing a {@link org.apache.tinkerpop.gremlin.process.Traversal} object. */ public interface Iterators { /** @@ -250,15 +250,15 @@ public interface Iterators { /** * Provides access to functions related to reading and writing graph data. Implementers can override these - * methods to provider mapper configurations to the default {@link com.tinkerpop.gremlin.structure.io.GraphReader} - * and {@link com.tinkerpop.gremlin.structure.io.GraphWriter} implementations (i.e. to register mapper + * methods to provider mapper configurations to the default {@link org.apache.tinkerpop.gremlin.structure.io.GraphReader} + * and {@link org.apache.tinkerpop.gremlin.structure.io.GraphWriter} implementations (i.e. to register mapper * serialization classes). */ public interface Io { /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphReader} builder for Kryo serializations. This + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphReader} builder for Kryo serializations. This * method calls the {@link Io#kryoMapper} method to supply to - * {@link com.tinkerpop.gremlin.structure.io.kryo.KryoReader.Builder#mapper} which means that implementers + * {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader.Builder#mapper} which means that implementers * should usually just override {@link Io#kryoMapper} to append in their mapper classes. */ public default KryoReader.Builder kryoReader() { @@ -266,9 +266,9 @@ public default KryoReader.Builder kryoReader() { } /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphWriter} builder for Kryo serializations. This + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphWriter} builder for Kryo serializations. This * method calls the {@link Io#kryoMapper} method to supply to - * {@link com.tinkerpop.gremlin.structure.io.kryo.KryoWriter.Builder#mapper} which means that implementers + * {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter.Builder#mapper} which means that implementers * should usually just override {@link Io#kryoMapper} to append in their mapper classes. */ public default KryoWriter.Builder kryoWriter() { @@ -286,16 +286,16 @@ public default KryoWriter.Builder kryoWriter() { public void readKryo(final String file) throws IOException; /** - * By default, this method creates an instance of the most current version of {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper} which is + * By default, this method creates an instance of the most current version of {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper} which is * used to serialize data to and from the graph. Implementers with mapper classes (e.g. a non-primitive * class returned from {@link Element#id}) should override this method with those classes automatically - * registered to the returned {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper}. + * registered to the returned {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper}. *
* Implementers should respect versions. Once a class is registered, the order of its registration should be * maintained. Note that registering such classes will reduce the portability of the graph data as data - * written with {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper} will not be readable without this serializer configuration. It is + * written with {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper} will not be readable without this serializer configuration. It is * considered good practice to make serialization classes generally available so that users may - * register these classes themselves if necessary when building up a mapper {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper} + * register these classes themselves if necessary when building up a mapper {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper} * instance. *
* Note that this method is meant to return current versions for serialization operations. Users wishing @@ -306,7 +306,7 @@ public default KryoMapper.Builder kryoMapper() { } /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphReader} builder for GraphML serializations. GraphML + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphReader} builder for GraphML serializations. GraphML * is the most portable of all the formats, but comes at the price of the least flexibility. * {@code Graph} implementations that have mapper classes that need to be serialized will not be able * to properly use this format effectively. @@ -316,7 +316,7 @@ public default GraphMLReader.Builder graphMLReader() { } /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphWriter} builder for GraphML serializations. GraphML + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphWriter} builder for GraphML serializations. GraphML * is the most portable of all the formats, but comes at the price of the least flexibility. * {@code Graph} implementations that have mapper classes that need to be serialized will not be able * to properly use this format effectively. @@ -336,9 +336,9 @@ public default GraphMLWriter.Builder graphMLWriter() { public void readGraphML(final String file) throws IOException; /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphReader} builder for GraphSON serializations. + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphReader} builder for GraphSON serializations. * GraphSON is forgiving for implementers and will typically do a "reasonable" job in serializing most - * mapper classes. This method by default uses the {@link com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} created by + * mapper classes. This method by default uses the {@link org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} created by * {@link #graphSONMapper}. That method enables implementers to register mapper serialization * modules for classes that do not serialize nicely by the default JSON serializers or completely * fail to do so. @@ -348,9 +348,9 @@ public default GraphSONReader.Builder graphSONReader() { } /** - * Creates a {@link com.tinkerpop.gremlin.structure.io.GraphWriter} builder for GraphML serializations. + * Creates a {@link org.apache.tinkerpop.gremlin.structure.io.GraphWriter} builder for GraphML serializations. * GraphSON is forgiving for implementers and will typically do a "reasonable" job in serializing most - * mapper classes. This method by default uses the {@link com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} created by + * mapper classes. This method by default uses the {@link org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} created by * {@link #graphSONMapper}. That method enables implementers to register mapper serialization * modules for classes that do not serialize nicely by the default JSON serializers or completely * fail to do so. @@ -371,17 +371,17 @@ public default GraphSONWriter.Builder graphSONWriter() { /** * By default, this method creates an instance of the most current version of - * {@link com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder} which is can produce a - * {@link com.tinkerpop.gremlin.structure.io.Mapper} implementation for GraphSON to + * {@link org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder} which is can produce a + * {@link org.apache.tinkerpop.gremlin.structure.io.Mapper} implementation for GraphSON to * serialize data to and from the graph. Implementers with custom classes (e.g. a * non-primitive class returned from {@link Element#id}) should override this method with serialization * modules added. *
* It is considered good practice to make serialization classes generally available so that users may - * register these classes themselves if necessary when building up a mapper {@link com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} + * register these classes themselves if necessary when building up a mapper {@link org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper} * instance. *
- * Note that this method is meant to return a {@link com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder} with default configuration + * Note that this method is meant to return a {@link org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder} with default configuration * for the current {@link Graph}. Users can adjust and override such settings by altering the builder * settings. */ @@ -500,7 +500,7 @@ public interface GraphFeatures extends FeatureSet { /** * Determines if the {@code Graph} implementation supports - * {@link com.tinkerpop.gremlin.process.computer.GraphComputer} based processing. + * {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer} based processing. */ @FeatureDescriptor(name = FEATURE_COMPUTER) public default boolean supportsComputer() { @@ -528,7 +528,7 @@ public default boolean supportsTransactions() { /** * Determines if the {@code Graph} implementation supports threaded transactions which allow a transaction - * to be executed across multiple threads via {@link com.tinkerpop.gremlin.structure.Transaction#create()}. + * to be executed across multiple threads via {@link org.apache.tinkerpop.gremlin.structure.Transaction#create()}. */ @FeatureDescriptor(name = FEATURE_THREADED_TRANSACTIONS) public default boolean supportsThreadedTransactions() { @@ -817,13 +817,13 @@ public default boolean supportsProperties() { } /** - * Features for {@link com.tinkerpop.gremlin.structure.Graph.Variables}. + * Features for {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables}. */ public interface VariableFeatures extends DataTypeFeatures { public static final String FEATURE_VARIABLES = "Variables"; /** - * If any of the features on {@link com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures} is + * If any of the features on {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures} is * true then this value must be true. */ @FeatureDescriptor(name = FEATURE_VARIABLES) @@ -1110,15 +1110,15 @@ public static IllegalArgumentException onlyOneOrNoGraphComputerClass() { @Repeatable(OptIns.class) @Inherited public @interface OptIn { - public static String SUITE_STRUCTURE_STANDARD = "com.tinkerpop.gremlin.structure.StructureStandardSuite"; - public static String SUITE_STRUCTURE_PERFORMANCE = "com.tinkerpop.gremlin.structure.StructurePerformanceSuite"; - public static String SUITE_PROCESS_COMPUTER = "com.tinkerpop.gremlin.process.ProcessComputerSuite"; - public static String SUITE_PROCESS_STANDARD = "com.tinkerpop.gremlin.process.ProcessStandardSuite"; - public static String SUITE_PROCESS_PERFORMANCE = "com.tinkerpop.gremlin.process.ProcessPerformanceSuite"; - public static String SUITE_GROOVY_PROCESS_STANDARD = "com.tinkerpop.gremlin.process.GroovyProcessStandardSuite"; - public static String SUITE_GROOVY_PROCESS_COMPUTER = "com.tinkerpop.gremlin.process.GroovyProcessComputerSuite"; - public static String SUITE_GROOVY_ENVIRONMENT = "com.tinkerpop.gremlin.groovy.GroovyEnvironmentSuite"; - public static String SUITE_GROOVY_ENVIRONMENT_INTEGRATE = "com.tinkerpop.gremlin.groovy.GroovyEnvironmentIntegrateSuite"; + public static String SUITE_STRUCTURE_STANDARD = "org.apache.tinkerpop.gremlin.structure.StructureStandardSuite"; + public static String SUITE_STRUCTURE_PERFORMANCE = "org.apache.tinkerpop.gremlin.structure.StructurePerformanceSuite"; + public static String SUITE_PROCESS_COMPUTER = "org.apache.tinkerpop.gremlin.process.ProcessComputerSuite"; + public static String SUITE_PROCESS_STANDARD = "org.apache.tinkerpop.gremlin.process.ProcessStandardSuite"; + public static String SUITE_PROCESS_PERFORMANCE = "org.apache.tinkerpop.gremlin.process.ProcessPerformanceSuite"; + public static String SUITE_GROOVY_PROCESS_STANDARD = "org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite"; + public static String SUITE_GROOVY_PROCESS_COMPUTER = "org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite"; + public static String SUITE_GROOVY_ENVIRONMENT = "org.apache.tinkerpop.gremlin.groovy.GroovyEnvironmentSuite"; + public static String SUITE_GROOVY_ENVIRONMENT_INTEGRATE = "org.apache.tinkerpop.gremlin.groovy.GroovyEnvironmentIntegrateSuite"; /** * The test suite class to opt in to. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Operator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Operator.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Operator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Operator.java index f3c2bd304da..4fc8c642003 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Operator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Operator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.util.function.BinaryOperator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Order.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Order.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Order.java index a15ea555d50..5a3cc91664d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Order.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Order.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.util.Comparator; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Property.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Property.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java index db5a61053ff..997fe510f43 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Property.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.structure.util.empty.EmptyProperty; +import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyProperty; import java.util.NoSuchElementException; import java.util.function.Consumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/PropertyType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyType.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/PropertyType.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyType.java index 4caced641b4..83e0fb5ca68 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/PropertyType.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; /** * This enumeration allows for the specification of the type of a {@link Property}. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Transaction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Transaction.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java index 7720885d89e..731ebe929fe 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Transaction.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.io.Closeable; import java.util.Collections; @@ -83,7 +83,7 @@ public interface Transaction extends Closeable { public Transaction onReadWrite(final Consumer consumer); /** - * Describes what happens to a transaction on a call to {@link com.tinkerpop.gremlin.structure.Graph#close()}. + * Describes what happens to a transaction on a call to {@link org.apache.tinkerpop.gremlin.structure.Graph#close()}. * This value can be set using standard behavior defined in {@link CLOSE_BEHAVIOR} or a mapper {@link Consumer} * function. */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java index 9b72b3e4d3e..92a179d7616 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.process.graph.traversal.VertexTraversal; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.process.graph.traversal.VertexTraversal; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.util.Iterator; import java.util.Optional; @@ -100,7 +100,7 @@ public default VertexProperty singleProperty(final String key, final V va /** * An interface that provides access to iterators over {@link VertexProperty} objects, {@link Edge} objects * and adjacent vertices, associated with the {@code Vertex}, without constructing a - * {@link com.tinkerpop.gremlin.process.Traversal} object. + * {@link org.apache.tinkerpop.gremlin.process.Traversal} object. */ public interface Iterators extends Element.Iterators { /** diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/VertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/VertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java index 0f4826d554b..99e3c746d0b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/VertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.process.graph.traversal.VertexPropertyTraversal; -import com.tinkerpop.gremlin.structure.util.empty.EmptyVertexProperty; +import org.apache.tinkerpop.gremlin.process.graph.traversal.VertexPropertyTraversal; +import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyVertexProperty; import java.util.Iterator; @@ -81,7 +81,7 @@ public static VertexProperty empty() { /** * An interface that provides access to iterators over properties, without constructing a - * {@link com.tinkerpop.gremlin.process.Traversal} object. + * {@link org.apache.tinkerpop.gremlin.process.Traversal} object. */ public interface Iterators extends Element.Iterators { /** diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/DefaultIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/DefaultIo.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/DefaultIo.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/DefaultIo.java index 3013a767451..cba2e970a33 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/DefaultIo.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/DefaultIo.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io; +package org.apache.tinkerpop.gremlin.structure.io; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphMigrator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphMigrator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java index b92309364c2..e7a7c887dec 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphMigrator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io; +package org.apache.tinkerpop.gremlin.structure.io; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; import java.io.IOException; import java.io.PipedInputStream; @@ -42,7 +42,7 @@ public final class GraphMigrator { * Use Kryo to pipe the data from one graph to another graph. Uses all default settings for reader/writers. * Refer to {@link KryoReader} and {@link KryoWriter} for those settings. To use features like incremental * loading, construct the reader/writers manually and utilize - * {@link #migrateGraph(com.tinkerpop.gremlin.structure.Graph, com.tinkerpop.gremlin.structure.Graph, GraphReader, GraphWriter)} + * {@link #migrateGraph(org.apache.tinkerpop.gremlin.structure.Graph, org.apache.tinkerpop.gremlin.structure.Graph, GraphReader, GraphWriter)} */ public static void migrateGraph(final Graph fromGraph, final Graph toGraph) throws IOException { migrateGraph(fromGraph, toGraph, defaultKryoReader, defaultKryoWriter); diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphReader.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java index 73d218de350..013243b0872 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphReader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io; +package org.apache.tinkerpop.gremlin.structure.io; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import java.io.IOException; import java.io.InputStream; @@ -71,7 +71,7 @@ public Vertex readVertex(final InputStream inputStream, final Direction directio /** * Reads a set of vertices from an {@link InputStream} which were written by - * {@link GraphWriter#writeVertices(java.io.OutputStream, com.tinkerpop.gremlin.process.Traversal)}. This method + * {@link GraphWriter#writeVertices(java.io.OutputStream, org.apache.tinkerpop.gremlin.process.Traversal)}. This method * will read vertex properties as well as edges given the direction supplied as an argument. * * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter} diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphWriter.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java index e5ffa9cbe19..c1dc37967cd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/GraphWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io; +package org.apache.tinkerpop.gremlin.structure.io; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.io.IOException; import java.io.OutputStream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/Mapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Mapper.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/Mapper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Mapper.java index 32b5404f2b5..64f23f3c2cf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/Mapper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Mapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io; +package org.apache.tinkerpop.gremlin.structure.io; /** * Represents a low-level serialization class that can be used to map classes to serializers. These implementation diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java index 226b2ff1c37..9f433ac06f5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphml; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +package org.apache.tinkerpop.gremlin.structure.io.graphml; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; @@ -263,7 +263,7 @@ private Builder() { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into * the {@link Graph}. */ public Builder vertexIdKey(final String vertexIdKey) { @@ -273,7 +273,7 @@ public Builder vertexIdKey(final String vertexIdKey) { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into * the {@link Graph}. */ public Builder edgeIdKey(final String edgeIdKey) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java index bb1298d9068..8ab42979f78 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLTokens.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphml; +package org.apache.tinkerpop.gremlin.structure.io.graphml; /** * A collection of tokens used for GraphML related data. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java index 1cdbca4da13..7607e411462 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphml; +package org.apache.tinkerpop.gremlin.structure.io.graphml; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.io.GraphWriter; -import com.tinkerpop.gremlin.structure.util.Comparators; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.io.GraphWriter; +import org.apache.tinkerpop.gremlin.structure.util.Comparators; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import javax.xml.XMLConstants; import javax.xml.stream.XMLOutputFactory; @@ -402,7 +402,7 @@ public Builder edgeKeyTypes(final Map edgeKeyTypes) { /** * Location of the GraphML schema which is defaulted to - * {@link com.tinkerpop.gremlin.structure.io.graphml.GraphMLTokens#DEFAULT_GRAPHML_SCHEMA_LOCATION}. + * {@link org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLTokens#DEFAULT_GRAPHML_SCHEMA_LOCATION}. */ public Builder xmlSchemaLocation(final String xmlSchemaLocation) { this.xmlSchemaLocation = xmlSchemaLocation; @@ -411,7 +411,7 @@ public Builder xmlSchemaLocation(final String xmlSchemaLocation) { /** * Set the name of the edge label in the GraphML. This value is defaulted to {@link GraphMLTokens#LABEL_E}. - * The value of {@link com.tinkerpop.gremlin.structure.Edge#label()} is written as a data element on the edge + * The value of {@link org.apache.tinkerpop.gremlin.structure.Edge#label()} is written as a data element on the edge * and the appropriate key element is added to define it in the GraphML. It is important that when reading * this GraphML back in with the reader that this label key is set appropriately to properly read the edge * labels. @@ -425,7 +425,7 @@ public Builder edgeLabelKey(final String edgeLabelKey) { /** * Set the name of the vertex label in the GraphML. This value is defaulted to {@link GraphMLTokens#LABEL_V}. - * The value of {@link com.tinkerpop.gremlin.structure.Vertex#label()} is written as a data element on the + * The value of {@link org.apache.tinkerpop.gremlin.structure.Vertex#label()} is written as a data element on the * vertex and the appropriate key element is added to define it in the GraphML. It is important that when * reading this GraphML back in with the reader that this label key is set appropriately to properly read the * vertex labels. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java index 912286d75d5..8f732687d9c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphml; +package org.apache.tinkerpop.gremlin.structure.io.graphml; import org.apache.commons.lang.StringUtils; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java index cbe9570bac1..282fb5f8686 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONGraph.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.Comparators; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.Comparators; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import java.io.IOException; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java index de541e437b1..5613ed9d2bd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider; -import com.tinkerpop.gremlin.structure.io.Mapper; +import org.apache.tinkerpop.gremlin.structure.io.Mapper; import java.util.ArrayList; import java.util.List; /** * An extension to the standard Jackson {@code ObjectMapper} which automatically registers the standard - * {@link GraphSONModule} for serializing {@link com.tinkerpop.gremlin.structure.Graph} elements. This class + * {@link GraphSONModule} for serializing {@link org.apache.tinkerpop.gremlin.structure.Graph} elements. This class * can be used for generalized JSON serialization tasks that require meeting GraphSON standards. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java index 6a512b3fe13..24ade209ca9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; @@ -26,12 +26,12 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.StdKeySerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.util.metric.Metrics; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.util.metric.Metrics; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.io.IOException; import java.util.*; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java index c5103cff129..a8ac641003f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.javatuples.Pair; import java.io.BufferedReader; @@ -53,7 +53,7 @@ * This implementation only supports JSON data types and is therefore lossy with respect to data types (e.g. a * float will become a double, element IDs may not be retrieved in the format they were serialized, etc.). * {@link Edge} and {@link Vertex} objects are serialized to {@code Map} instances. If an - * {@link com.tinkerpop.gremlin.structure.Element} is used as a key, it is coerced to its identifier. Other complex + * {@link org.apache.tinkerpop.gremlin.structure.Element} is used as a key, it is coerced to its identifier. Other complex * objects are converted via {@link Object#toString()} unless there is a mapper serializer supplied. * * @author Stephen Mallette (http://stephen.genoprime.com) @@ -222,7 +222,7 @@ private Builder() { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into * the {@link Graph}. */ public Builder vertexIdKey(final String vertexIdKey) { @@ -232,7 +232,7 @@ public Builder vertexIdKey(final String vertexIdKey) { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into * the {@link Graph}. */ public Builder edgeIdKey(final String edgeIdKey) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java index 089ab63cb88..04b6f0dadfd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java index 16614b00bb4..177a74580bc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java index 12d697a13ab..7a05e492327 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertex.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java index 3ee93fefdfe..f09c2ca4e26 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVertexProperty.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.io.IOException; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java index 4b6a2e554f9..16ade88256c 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.GraphWriter; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.GraphWriter; import java.io.*; @@ -33,7 +33,7 @@ * only supports JSON data types and is therefore lossy with respect to data types (e.g. a float will become a double). * Further note that serialized {@code Map} objects do not support complex types for keys. {@link Edge} and * {@link Vertex} objects are serialized to {@code Map} instances. If an - * {@link com.tinkerpop.gremlin.structure.Element} is used as a key, it is coerced to its identifier. Other complex + * {@link org.apache.tinkerpop.gremlin.structure.Element} is used as a key, it is coerced to its identifier. Other complex * objects are converted via {@link Object#toString()} unless a mapper serializer is supplied. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java index 53b12fd17c2..192418ba6d1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -24,15 +24,15 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import java.io.IOException; import java.io.InputStream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java index d409d16c2f8..17ab9f3ea63 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EdgeTerminator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; /** * Represents the end of an edge list in a serialization stream. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java index a089af9a107..befd18c42db 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/EntrySerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java similarity index 86% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java index eb964b6df6f..dc378e5e372 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GraphSerializer.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedFactory; -import com.tinkerpop.gremlin.structure.util.detached.DetachedPath; -import com.tinkerpop.gremlin.structure.util.detached.DetachedProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath; +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; /** * Class used to serialize graph-based objects such as vertices, edges, properties, and paths. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java index f9d04de4cb5..a7c48b91b98 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/GremlinClassResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.ClassResolver; import com.esotericsoftware.kryo.Kryo; @@ -27,16 +27,16 @@ import com.esotericsoftware.kryo.util.IdentityObjectIntMap; import com.esotericsoftware.kryo.util.IntMap; import com.esotericsoftware.kryo.util.ObjectMap; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedPath; -import com.tinkerpop.gremlin.structure.util.detached.DetachedProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath; +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 static com.esotericsoftware.kryo.util.Util.getWrapperClass; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java index bb31f0fe70e..9a7ddc462c5 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.KryoSerializable; @@ -25,31 +25,31 @@ import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.util.DefaultStreamFactory; import com.esotericsoftware.kryo.util.MapReferenceResolver; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.util.MapMemory; -import com.tinkerpop.gremlin.process.graph.util.Tree; -import com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.traverser.B_O_Traverser; -import com.tinkerpop.gremlin.process.traverser.O_Traverser; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.process.util.metric.MutableMetrics; -import com.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; -import com.tinkerpop.gremlin.process.util.TraverserSet; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.io.Mapper; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedPath; -import com.tinkerpop.gremlin.structure.util.detached.DetachedProperty; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory; +import org.apache.tinkerpop.gremlin.process.graph.util.Tree; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.O_Traverser; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.process.util.metric.MutableMetrics; +import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; +import org.apache.tinkerpop.gremlin.process.util.TraverserSet; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.io.Mapper; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath; +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.javatuples.Triplet; import java.io.IOException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoReader.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoReader.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoReader.java index 25df118c6cc..1d6e1084adf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoReader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoReader.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; import java.io.*; import java.util.*; @@ -362,7 +362,7 @@ public Builder mapper(final KryoMapper kryoMapper) { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into * the {@link Graph}. */ public Builder vertexIdKey(final String vertexIdKey) { @@ -372,7 +372,7 @@ public Builder vertexIdKey(final String vertexIdKey) { /** * The name of the key to supply to - * {@link com.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into + * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into * the {@link Graph}. */ public Builder edgeIdKey(final String edgeIdKey) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java index b1af298a224..7be3e4d156d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoWriter.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.GraphWriter; -import com.tinkerpop.gremlin.structure.util.detached.DetachedFactory; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.GraphWriter; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory; import java.io.IOException; import java.io.OutputStream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/URISerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/URISerializer.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/URISerializer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/URISerializer.java index fd8a59dbdf4..67b19d2a68a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/URISerializer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/URISerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java index f43e503d388..8e5d901d0bd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/UUIDSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java index 2f721f0101d..0fe3d2ce48e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexByteArrayInputStream.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import java.io.ByteArrayOutputStream; import java.io.FilterInputStream; @@ -28,7 +28,7 @@ /** * An {@link InputStream} implementation that can independently process a Gremlin Kryo file written with - * {@link KryoWriter#writeVertices(java.io.OutputStream, com.tinkerpop.gremlin.process.Traversal)}. + * {@link KryoWriter#writeVertices(java.io.OutputStream, org.apache.tinkerpop.gremlin.process.Traversal)}. * * @author Stephen Mallette (http://stephen.genoprime.com) */ @@ -42,7 +42,7 @@ public VertexByteArrayInputStream(final InputStream inputStream) { } /** - * Read the bytes of the next {@link com.tinkerpop.gremlin.structure.Vertex} in the stream. The returned + * Read the bytes of the next {@link org.apache.tinkerpop.gremlin.structure.Vertex} in the stream. The returned * stream can then be passed to {@link KryoReader#readVertex(java.io.InputStream, java.util.function.Function)}. */ public ByteArrayOutputStream readVertexBytes() throws IOException { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java index 36bec631c4e..aee1fa94099 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/VertexTerminator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/ClusterAware.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/ClusterAware.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/ClusterAware.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/ClusterAware.java index 187ab8f018b..ec56c250629 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/ClusterAware.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/ClusterAware.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.server; +package org.apache.tinkerpop.gremlin.structure.server; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/IntervalVertexRange.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/IntervalVertexRange.java index 938813ac057..85eff7e28dc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/IntervalVertexRange.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.server; +package org.apache.tinkerpop.gremlin.structure.server; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/Partition.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/Partition.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/Partition.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/Partition.java index ea182558775..65614d05c03 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/Partition.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/Partition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.server; +package org.apache.tinkerpop.gremlin.structure.server; import java.util.List; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/VertexRange.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/VertexRange.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/VertexRange.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/VertexRange.java index 41049c790fc..e9ac04e4ae1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/VertexRange.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/server/VertexRange.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.server; +package org.apache.tinkerpop.gremlin.structure.server; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/GraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/GraphStrategy.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/GraphStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/GraphStrategy.java index ba9d22c50f9..adf6f06ab62 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/GraphStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/GraphStrategy.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.function.TriFunction; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; import java.util.Iterator; import java.util.Map; @@ -44,8 +44,8 @@ * represents some injection point for new logic in the Gremlin Structure API. A method always accepts a * {@link StrategyContext} which contains the context of the call being made and will have * a different {@link StrategyContext#getCurrent()} object depending on that context (e.g the - * {@link com.tinkerpop.gremlin.structure.Vertex#addEdge(String, com.tinkerpop.gremlin.structure.Vertex, Object...)} method will send the instance of - * the {@link com.tinkerpop.gremlin.structure.Vertex} that was the object of that method call). + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#addEdge(String, org.apache.tinkerpop.gremlin.structure.Vertex, Object...)} method will send the instance of + * the {@link org.apache.tinkerpop.gremlin.structure.Vertex} that was the object of that method call). *

* A method will always return a {@link java.util.function.UnaryOperator} where the argument and return value to it is a function with * the same signature as the calling method where the strategy logic is being injected. The argument passed in to @@ -66,12 +66,12 @@ public interface GraphStrategy { /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Iterators#vertexIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Iterators#vertexIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Graph.Iterators#vertexIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Iterators#vertexIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getGraphIteratorsVertexIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -79,12 +79,12 @@ public default UnaryOperator>> getGraphItera } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Iterators#edgeIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Iterators#edgeIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Graph.Iterators#edgeIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Iterators#edgeIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getGraphIteratorsEdgeIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -92,12 +92,12 @@ public default UnaryOperator>> getGraphIterato } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Variables#keys()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#keys()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Graph.Variables#keys()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#keys()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVariableKeysStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -105,12 +105,12 @@ public default UnaryOperator>> getVariableKeysStrategy(fina } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Variables#asMap()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#asMap()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Graph.Variables#asMap()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#asMap()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVariableAsMapStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -118,11 +118,11 @@ public default UnaryOperator>> getVariableAsMapStra } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Variables#get(String)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#get(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function - * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with {@link com.tinkerpop.gremlin.structure.Graph.Variables#get(String)} signature + * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#get(String)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator>> getVariableGetStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -130,11 +130,11 @@ public default UnaryOperator>> getVariableGetSt } /** - * Construct a {@link java.util.function.BiConsumer} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Variables#set(String, Object)}. + * Construct a {@link java.util.function.BiConsumer} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#set(String, Object)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function - * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.BiConsumer} with {@link com.tinkerpop.gremlin.structure.Graph.Variables#set(String, Object)} signature + * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.BiConsumer} with {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#set(String, Object)} signature * and returns an enhanced strategy {@link java.util.function.BiConsumer} with the same signature */ public default UnaryOperator> getVariableSetStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -142,11 +142,11 @@ public default UnaryOperator> getVariableSetStrategy( } /** - * Construct a {@link java.util.function.Consumer} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph.Variables#remove(String)}. + * Construct a {@link java.util.function.Consumer} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#remove(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function - * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Consumer} with {@link com.tinkerpop.gremlin.structure.Graph.Variables#remove(String)} signature + * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Consumer} with {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#remove(String)} signature * and returns an enhanced strategy {@link java.util.function.BiConsumer} with the same signature */ public default UnaryOperator> getVariableRemoveStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -154,11 +154,11 @@ public default UnaryOperator> getVariableRemoveStrategy(final S } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph#addVertex(Object...)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph#addVertex(Object...)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function - * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with {@link com.tinkerpop.gremlin.structure.Graph#addVertex(Object...)} signature + * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with {@link org.apache.tinkerpop.gremlin.structure.Graph#addVertex(Object...)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator> getAddVertexStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -166,13 +166,13 @@ public default UnaryOperator> getAddVertexStrategy(fi } /** - * Construct a {@link com.tinkerpop.gremlin.util.function.TriFunction} that enhances the features of - * {@link com.tinkerpop.gremlin.structure.Vertex#addEdge(String, com.tinkerpop.gremlin.structure.Vertex, Object...)}. + * Construct a {@link org.apache.tinkerpop.gremlin.util.function.TriFunction} that enhances the features of + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#addEdge(String, org.apache.tinkerpop.gremlin.structure.Vertex, Object...)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function - * @return a {@link java.util.function.Function} that accepts a {@link com.tinkerpop.gremlin.util.function.TriFunction} with - * {@link com.tinkerpop.gremlin.structure.Vertex#addEdge(String, com.tinkerpop.gremlin.structure.Vertex, Object...)} signature + * @return a {@link java.util.function.Function} that accepts a {@link org.apache.tinkerpop.gremlin.util.function.TriFunction} with + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#addEdge(String, org.apache.tinkerpop.gremlin.structure.Vertex, Object...)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator> getAddEdgeStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -180,12 +180,12 @@ public default UnaryOperator> getAdd } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#remove()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#remove()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Edge#remove()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#remove()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getRemoveEdgeStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -193,12 +193,12 @@ public default UnaryOperator> getRemoveEdgeStrategy(final Strateg } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#remove()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#remove()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Vertex#remove()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#remove()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getRemoveVertexStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -206,12 +206,12 @@ public default UnaryOperator> getRemoveVertexStrategy(final Strat } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Property#remove()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Property#remove()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Property#remove()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Property#remove()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getRemovePropertyStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -219,12 +219,12 @@ public default UnaryOperator> getRemovePropertyStrategy(final } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#remove()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#remove()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#remove()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#remove()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getRemoveVertexPropertyStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -232,12 +232,12 @@ public default UnaryOperator> getRemoveVertexPropertyStrategy } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#property(String)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#property(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Vertex#property(String)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#property(String)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator>> getVertexGetPropertyStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -245,12 +245,12 @@ public default UnaryOperator>> getVertexG } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#keys()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#keys()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Vertex#keys()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#keys()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexKeysStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -258,12 +258,12 @@ public default UnaryOperator>> getVertexKeysStrategy(final } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#label()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#label()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Vertex#label()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#label()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexLabelStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -271,12 +271,12 @@ public default UnaryOperator> getVertexLabelStrategy(final Stra } /** - * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#property(String, Object)}. + * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#property(String, Object)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.BiFunction} with - * {@link com.tinkerpop.gremlin.structure.Vertex#property(String, Object)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#property(String, Object)} signature * and returns an enhanced strategy {@link java.util.function.BiFunction} with the same signature */ public default UnaryOperator>> getVertexPropertyStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -284,12 +284,12 @@ public default UnaryOperator>> getVe } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Element.Iterators#propertyIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Element.Iterators#propertyIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Element.Iterators#propertyIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Element.Iterators#propertyIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>>> getVertexIteratorsPropertyIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -297,12 +297,12 @@ public default UnaryOperator>> } /** - * Construct a {@link TriFunction} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#vertexIterator}. + * Construct a {@link TriFunction} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#vertexIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link BiFunction} with - * {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#vertexIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#vertexIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexIteratorsVertexIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -310,12 +310,12 @@ public default UnaryOperator>> } /** - * Construct a {@link TriFunction} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#edgeIterator}. + * Construct a {@link TriFunction} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#edgeIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link BiFunction} with - * {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#edgeIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#edgeIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexIteratorsEdgeIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -323,12 +323,12 @@ public default UnaryOperator>> ge } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#valueIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#valueIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Vertex.Iterators#valueIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex.Iterators#valueIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexIteratorsValueIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -336,12 +336,12 @@ public default UnaryOperator>> getVertexItera } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#id()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#id()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Vertex#id()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#id()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexIdStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -349,14 +349,14 @@ public default UnaryOperator> getVertexIdStrategy(final Strateg } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Vertex#graph()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Vertex#graph()}. * Note that in this case, the {@link Graph} is {@link StrategyGraph} and this would be the expected * type to pass back out. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Vertex#graph()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#graph()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexGraphStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -364,12 +364,12 @@ public default UnaryOperator> getVertexGraphStrategy(final Strat } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Element#value(String)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Element#value(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Element#value(String)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Element#value(String)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator> getVertexValueStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -377,12 +377,12 @@ public default UnaryOperator> getVertexValueStrategy(fin } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#property(String)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#property(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Edge#property(String)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#property(String)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator>> getEdgeGetPropertyStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -390,12 +390,12 @@ public default UnaryOperator>> getEdgeGetProper } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge.Iterators#vertexIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#vertexIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Edge.Iterators#vertexIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#vertexIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getEdgeIteratorsVertexIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -403,12 +403,12 @@ public default UnaryOperator>> getEdgeItera } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge.Iterators#valueIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#valueIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Edge.Iterators#valueIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#valueIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getEdgeIteratorsValueIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -416,12 +416,12 @@ public default UnaryOperator>> getEdgeIterato } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge.Iterators#propertyIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#propertyIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Edge.Iterators#propertyIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge.Iterators#propertyIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>>> getEdgeIteratorsPropertyIteratorStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -429,12 +429,12 @@ public default UnaryOperator>>> getE } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#keys()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#keys()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Edge#keys()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#keys()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getEdgeKeysStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -442,12 +442,12 @@ public default UnaryOperator>> getEdgeKeysStrategy(final St } /** - * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#property(String, Object)}. + * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#property(String, Object)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.BiFunction} with - * {@link com.tinkerpop.gremlin.structure.Edge#property(String, Object)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#property(String, Object)} signature * and returns an enhanced strategy {@link java.util.function.BiFunction} with the same signature */ public default UnaryOperator>> getEdgePropertyStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -455,12 +455,12 @@ public default UnaryOperator>> getEdgeProp } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#value(String)}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#value(String)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Element#value(String)} signature + * {@link org.apache.tinkerpop.gremlin.structure.Element#value(String)} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator> getEdgeValueStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -468,12 +468,12 @@ public default UnaryOperator> getEdgeValueStrategy(final } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#id()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#id()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Edge#id()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#id()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getEdgeIdStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -481,14 +481,14 @@ public default UnaryOperator> getEdgeIdStrategy(final StrategyC } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#graph()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#graph()}. * Note that in this case, the {@link Graph} is {@link StrategyGraph} and this would be the expected * type to pass back out. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Edge#graph()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#graph()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getEdgeGraphStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -496,12 +496,12 @@ public default UnaryOperator> getEdgeGraphStrategy(final Strateg } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Edge#label()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Edge#label()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Edge#label()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Edge#label()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getEdgeLabelStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -509,12 +509,12 @@ public default UnaryOperator> getEdgeLabelStrategy(final Strate } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#id()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#id()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#id()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#id()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyIdStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -522,12 +522,12 @@ public default UnaryOperator> getVertexPropertyIdStrategy(f } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#value()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#value()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Supplier} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#value()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#value()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyValueStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -535,12 +535,12 @@ public default UnaryOperator> getVertexPropertyValueStrategy(fin } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Property#key()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Property#key()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Supplier} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Property#key()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Property#key()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyKeyStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -548,12 +548,12 @@ public default UnaryOperator> getVertexPropertyKeyStrategy( } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty.Iterators#propertyIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty.Iterators#propertyIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty.Iterators#propertyIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty.Iterators#propertyIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>>> getVertexPropertyIteratorsPropertyIteratorStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -561,12 +561,12 @@ public default UnaryOperator>>> g } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty.Iterators#valueIterator}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty.Iterators#valueIterator}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty.Iterators#valueIterator} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty.Iterators#valueIterator} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexPropertyIteratorsValueIteratorStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -574,12 +574,12 @@ public default UnaryOperator>> getVertexPr } /** - * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#property(String, Object)}. + * Construct a {@link java.util.function.BiFunction} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#property(String, Object)}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.BiFunction} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#property(String, Object)} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#property(String, Object)} signature * and returns an enhanced strategy {@link java.util.function.BiFunction} with the same signature */ public default UnaryOperator>> getVertexPropertyPropertyStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -587,14 +587,14 @@ public default UnaryOperator>> getVerte } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#graph()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#graph()}. * Note that in this case, the {@link Graph} is {@link StrategyGraph} and this would be the expected * type to pass back out. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#graph()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#graph()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyGraphStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -602,12 +602,12 @@ public default UnaryOperator> getVertexPropertyGraphStrategy } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#label()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#label()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#label()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#label()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyLabelStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -615,12 +615,12 @@ public default UnaryOperator> getVertexPropertyLabelStrateg } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#keys()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#keys()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#keys()} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#keys()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator>> getVertexPropertyKeysStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -628,12 +628,12 @@ public default UnaryOperator>> getVertexPropertyKeysStr } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.VertexProperty#element}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#element}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.VertexProperty#element} signature + * {@link org.apache.tinkerpop.gremlin.structure.VertexProperty#element} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getVertexPropertyGetElementStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -641,12 +641,12 @@ public default UnaryOperator> getVertexPropertyGetElementSt } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph#close()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph#close()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Supplier} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Graph#close()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph#close()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getGraphCloseStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -654,12 +654,12 @@ public default UnaryOperator> getGraphCloseStrategy(final Strateg } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph#V}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph#V}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Graph#V} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph#V} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator>> getGraphVStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -667,12 +667,12 @@ public default UnaryOperator>> } /** - * Construct a {@link java.util.function.Function} that enhances the features of {@link com.tinkerpop.gremlin.structure.Graph#E}. + * Construct a {@link java.util.function.Function} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Graph#E}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Function} that accepts a {@link java.util.function.Function} with - * {@link com.tinkerpop.gremlin.structure.Graph#E} signature + * {@link org.apache.tinkerpop.gremlin.structure.Graph#E} signature * and returns an enhanced strategy {@link java.util.function.Function} with the same signature */ public default UnaryOperator>> getGraphEStrategy(final StrategyContext ctx, final GraphStrategy composingStrategy) { @@ -680,12 +680,12 @@ public default UnaryOperator>> get } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Property#value()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Property#value()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Supplier} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Property#value()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Property#value()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getPropertyValueStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { @@ -693,12 +693,12 @@ public default UnaryOperator> getPropertyValueStrategy(final Str } /** - * Construct a {@link java.util.function.Supplier} that enhances the features of {@link com.tinkerpop.gremlin.structure.Property#key()}. + * Construct a {@link java.util.function.Supplier} that enhances the features of {@link org.apache.tinkerpop.gremlin.structure.Property#key()}. * * @param ctx the context within which this strategy function is called * @param composingStrategy the strategy that composed this strategy function * @return a {@link java.util.function.Supplier} that accepts a {@link java.util.function.Supplier} with - * {@link com.tinkerpop.gremlin.structure.Property#key()} signature + * {@link org.apache.tinkerpop.gremlin.structure.Property#key()} signature * and returns an enhanced strategy {@link java.util.function.Supplier} with the same signature */ public default UnaryOperator> getPropertyKeyStrategy(final StrategyContext> ctx, final GraphStrategy composingStrategy) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategy.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategy.java index d47b0861de0..1d3379ed22b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategy.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.TriFunction; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; import java.util.ArrayList; import java.util.Arrays; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java index f1a0f5a707f..941feba010b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdentityStrategy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; /** * A pass through implementation of {@link GraphStrategy} where all strategy functions are simply executed as diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java index fe1e5d90c5d..ee25ab3f9b0 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategy.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; -import com.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.function.TriFunction; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.traverser.util.DefaultTraverserGeneratorFactory; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Arrays; import java.util.Collections; @@ -51,8 +51,8 @@ /** * A {@link GraphStrategy} which enables support for logical graph partitioning where the Graph can be blinded to - * different parts of the total {@link com.tinkerpop.gremlin.structure.Graph}. Note that the {@code partitionKey} - * is hidden by this strategy. Use the base {@link com.tinkerpop.gremlin.structure.Graph} to access that. + * different parts of the total {@link org.apache.tinkerpop.gremlin.structure.Graph}. Note that the {@code partitionKey} + * is hidden by this strategy. Use the base {@link org.apache.tinkerpop.gremlin.structure.Graph} to access that. * * @author Stephen Mallette (http://stephen.genoprime.com) * @author Joshua Shinavier (http://fortytwo.net) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java index d76085d0ebc..fee22fceb58 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategy.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.TriFunction; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; import java.util.Collections; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java index 64f472f581e..65ffda09bea 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategy.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.function.TriFunction; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; import java.util.ArrayList; import java.util.Arrays; @@ -352,7 +352,7 @@ private Builder() { /** * Provide the sequence of {@link GraphStrategy} implementations to execute. If this value is not set, * then a {@code SequenceStrategy} is initialized with a single - * {@link com.tinkerpop.gremlin.structure.strategy.IdentityStrategy} instance. + * {@link org.apache.tinkerpop.gremlin.structure.strategy.IdentityStrategy} instance. */ public Builder sequence(final GraphStrategy... strategies) { this.strategies = new ArrayList<>(Arrays.asList(strategies)); diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyContext.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyContext.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyContext.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyContext.java index ce78df10ea8..05828a36786 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyContext.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyContext.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; /** * The {@link StrategyContext} object is provided to the methods of {@link GraphStrategy} so that the strategy functions @@ -46,7 +46,7 @@ public T getCurrent() { } /** - * Gets the current {@link com.tinkerpop.gremlin.structure.strategy.StrategyGraph} instance. + * Gets the current {@link org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraph} instance. */ public StrategyGraph getStrategyGraph() { return g; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyEdge.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyEdge.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyEdge.java index 95174982728..d0fc00e44cd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyEdge.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyEdge.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyElement.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyElement.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyElement.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyElement.java index 46d8fedcdb7..cf742f8e267 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyElement.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyElement.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java index d80391e6bb7..6e7a8dd2a3d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.apache.commons.configuration.Configuration; import java.util.Iterator; @@ -38,8 +38,8 @@ /** * A wrapper class for {@link Graph} instances that host and apply a {@link GraphStrategy}. The wrapper implements * {@link Graph} itself and intercepts calls made to the hosted instance and then applies the strategy. Methods - * that return an extension of {@link com.tinkerpop.gremlin.structure.Element} or a - * {@link com.tinkerpop.gremlin.structure.Property} will be automatically wrapped in a {@link StrategyWrapped} + * that return an extension of {@link org.apache.tinkerpop.gremlin.structure.Element} or a + * {@link org.apache.tinkerpop.gremlin.structure.Property} will be automatically wrapped in a {@link StrategyWrapped} * implementation. * * @author Stephen Mallette (http://stephen.genoprime.com) @@ -73,7 +73,7 @@ public Graph getBaseGraph() { } /** - * Gets the {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy} for the {@link com.tinkerpop.gremlin.structure.Graph}. + * Gets the {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy} for the {@link org.apache.tinkerpop.gremlin.structure.Graph}. */ public GraphStrategy getStrategy() { return this.strategy; @@ -83,7 +83,7 @@ public GraphStrategy getStrategy() { * Return a {@link GraphStrategy} function that takes the base function of the form denoted by {@code T} as * an argument and returns back a function with {@code T}. * - * @param f a function to execute if a {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy}. + * @param f a function to execute if a {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy}. * @param impl the base implementation of an operation. * @return a function that will be applied in the Gremlin Structure implementation */ diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyProperty.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyProperty.java index 09d0c10e996..85b4492cf08 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyProperty.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedProperty; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedProperty; import java.util.NoSuchElementException; import java.util.function.Consumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVariables.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVariables.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVariables.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVariables.java index f492389265b..0e8dae7eadb 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVariables.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVariables.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVariables; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVariables; import java.util.Map; import java.util.Optional; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertex.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertex.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertex.java index 7276b10936f..87c1bc24975 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertex.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertex.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java index cf88a505e02..56e028c4242 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyVertexProperty.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertexProperty; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertexProperty; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java index f9673855db0..aeb0a00faf2 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyWrapped.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; /** * A marker interface for the graph wrapper classes. Classes that are strategy wrappers should implement this diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java index 73e61701e1d..c8e8bd55fac 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategy.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; import java.util.function.BiFunction; @@ -35,7 +35,7 @@ /** * A {@link GraphStrategy} which creates a logical subgraph to selectively include vertices and edges of a - * {@link com.tinkerpop.gremlin.structure.Graph} according to provided criteria. A vertex is in the subgraph if + * {@link org.apache.tinkerpop.gremlin.structure.Graph} according to provided criteria. A vertex is in the subgraph if * it meets the specified {@link #vertexPredicate}. An edge is in the subgraph if it meets the specified * {@link #edgePredicate} and its associated vertices meet the specified {@link #vertexPredicate}. * diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java similarity index 72% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java index af247a9fbfc..af415f6fcf8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/process/graph/step/sideEffect/StrategyGraphStep.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy.process.graph.step.sideEffect; +package org.apache.tinkerpop.gremlin.structure.strategy.process.graph.step.sideEffect; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.strategy.StrategyEdge; -import com.tinkerpop.gremlin.structure.strategy.StrategyGraph; -import com.tinkerpop.gremlin.structure.strategy.StrategyVertex; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyEdge; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraph; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyVertex; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/Comparators.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Comparators.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/Comparators.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Comparators.java index cabe6827652..657c9c7f01a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/Comparators.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Comparators.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; +package org.apache.tinkerpop.gremlin.structure.util; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Comparator; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/ElementHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java similarity index 85% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/ElementHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java index 888e240bbde..92e97dc19fa 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/ElementHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +package org.apache.tinkerpop.gremlin.structure.util; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.javatuples.Pair; import java.util.ArrayList; @@ -41,7 +41,7 @@ import java.util.stream.Stream; /** - * Utility class supporting common functions for {@link com.tinkerpop.gremlin.structure.Element}. + * Utility class supporting common functions for {@link org.apache.tinkerpop.gremlin.structure.Element}. * * @author Marko A. Rodriguez (http://markorodriguez.com) * @author Stephen Mallette (http://stephen.genoprime.com) @@ -104,7 +104,7 @@ public static void validateProperty(final String key, final Object value) throws /** * Determines whether a list of key/values are legal, ensuring that there are an even number of values submitted - * and that the key values in the list of arguments are {@link String} or {@link com.tinkerpop.gremlin.structure.Element} objects. + * and that the key values in the list of arguments are {@link String} or {@link org.apache.tinkerpop.gremlin.structure.Element} objects. * * @param propertyKeyValues a list of key/value pairs * @throws IllegalArgumentException if something in the pairs is illegal @@ -119,11 +119,11 @@ public static void legalPropertyKeyValueArray(final Object... propertyKeyValues) } /** - * Extracts the value of the {@link com.tinkerpop.gremlin.process.T#id} key from the list of arguments. + * Extracts the value of the {@link org.apache.tinkerpop.gremlin.process.T#id} key from the list of arguments. * * @param keyValues a list of key/value pairs - * @return the value associated with {@link com.tinkerpop.gremlin.process.T#id} - * @throws NullPointerException if the value for the {@link com.tinkerpop.gremlin.process.T#id} key is {@code null} + * @return the value associated with {@link org.apache.tinkerpop.gremlin.process.T#id} + * @throws NullPointerException if the value for the {@link org.apache.tinkerpop.gremlin.process.T#id} key is {@code null} */ public static Optional getIdValue(final Object... keyValues) { for (int i = 0; i < keyValues.length; i = i + 2) { @@ -213,12 +213,12 @@ public static Set getKeys(final Object... keyValues) { } /** - * Extracts the value of the {@link com.tinkerpop.gremlin.process.T#label} key from the list of arguments. + * Extracts the value of the {@link org.apache.tinkerpop.gremlin.process.T#label} key from the list of arguments. * * @param keyValues a list of key/value pairs - * @return the value associated with {@link com.tinkerpop.gremlin.process.T#label} + * @return the value associated with {@link org.apache.tinkerpop.gremlin.process.T#label} * @throws ClassCastException if the value of the label is not a {@link String} - * @throws NullPointerException if the value for the {@link com.tinkerpop.gremlin.process.T#label} key is {@code null} + * @throws NullPointerException if the value for the {@link org.apache.tinkerpop.gremlin.process.T#label} key is {@code null} */ public static Optional getLabelValue(final Object... keyValues) { for (int i = 0; i < keyValues.length; i = i + 2) { @@ -231,8 +231,8 @@ public static Optional getLabelValue(final Object... keyValues) { } /** - * Assign key/value pairs as properties to an {@link com.tinkerpop.gremlin.structure.Element}. If the value of {@link com.tinkerpop.gremlin.process.T#id} or - * {@link com.tinkerpop.gremlin.process.T#label} is in the set of pairs, then they are ignored. + * Assign key/value pairs as properties to an {@link org.apache.tinkerpop.gremlin.structure.Element}. If the value of {@link org.apache.tinkerpop.gremlin.process.T#id} or + * {@link org.apache.tinkerpop.gremlin.process.T#label} is in the set of pairs, then they are ignored. * * @param element the graph element to assign the {@code propertyKeyValues} * @param propertyKeyValues the key/value pairs to assign to the {@code element} @@ -250,8 +250,8 @@ public static void attachProperties(final Element element, final Object... prope } /** - * Assign key/value pairs as properties to an {@link com.tinkerpop.gremlin.structure.Vertex}. If the value of {@link com.tinkerpop.gremlin.process.T#id} or - * {@link com.tinkerpop.gremlin.process.T#label} is in the set of pairs, then they are ignored. + * Assign key/value pairs as properties to an {@link org.apache.tinkerpop.gremlin.structure.Vertex}. If the value of {@link org.apache.tinkerpop.gremlin.process.T#id} or + * {@link org.apache.tinkerpop.gremlin.process.T#label} is in the set of pairs, then they are ignored. * * @param vertex the vertex to assign the {@code propertyKeyValues} * @param propertyKeyValues the key/value pairs to assign to the {@code vertex} @@ -298,11 +298,11 @@ public static Object[] getProperties(final Element element, final boolean includ } /** - * A standard method for determining if two {@link com.tinkerpop.gremlin.structure.Element} objects are equal. This method should be used by any + * A standard method for determining if two {@link org.apache.tinkerpop.gremlin.structure.Element} objects are equal. This method should be used by any * {@link Object#equals(Object)} implementation to ensure consistent behavior. This method is used for Vertex, Edge, and VertexProperty. * - * @param a The first {@link com.tinkerpop.gremlin.structure.Element} - * @param b The second {@link com.tinkerpop.gremlin.structure.Element} (as an {@link Object}) + * @param a The first {@link org.apache.tinkerpop.gremlin.structure.Element} + * @param b The second {@link org.apache.tinkerpop.gremlin.structure.Element} (as an {@link Object}) * @return true if elements and equal and false otherwise * @throws IllegalArgumentException if either argument is null */ @@ -322,11 +322,11 @@ public static boolean areEqual(final Element a, final Object b) { } /** - * A standard method for determining if two {@link com.tinkerpop.gremlin.structure.VertexProperty} objects are equal. This method should be used by any + * A standard method for determining if two {@link org.apache.tinkerpop.gremlin.structure.VertexProperty} objects are equal. This method should be used by any * {@link Object#equals(Object)} implementation to ensure consistent behavior. * - * @param a the first {@link com.tinkerpop.gremlin.structure.VertexProperty} - * @param b the second {@link com.tinkerpop.gremlin.structure.VertexProperty} + * @param a the first {@link org.apache.tinkerpop.gremlin.structure.VertexProperty} + * @param b the second {@link org.apache.tinkerpop.gremlin.structure.VertexProperty} * @return true if equal and false otherwise */ public static boolean areEqual(final VertexProperty a, final Object b) { @@ -334,10 +334,10 @@ public static boolean areEqual(final VertexProperty a, final Object b) { } /** - * Simply tests if the value returned from {@link com.tinkerpop.gremlin.structure.Element#id()} are {@code equal()}. + * Simply tests if the value returned from {@link org.apache.tinkerpop.gremlin.structure.Element#id()} are {@code equal()}. * - * @param a the first {@link com.tinkerpop.gremlin.structure.Element} - * @param b the second {@link com.tinkerpop.gremlin.structure.Element} + * @param a the first {@link org.apache.tinkerpop.gremlin.structure.Element} + * @param b the second {@link org.apache.tinkerpop.gremlin.structure.Element} * @return true if ids are equal and false otherwise */ public static boolean haveEqualIds(final Element a, final Element b) { @@ -356,7 +356,7 @@ public static int hashCode(final Element element) { /** * If two {@link Property} instances are equal, then they must have the same hash codes. This methods ensures consistent hashCode values. - * For {@link VertexProperty} use {@link ElementHelper#hashCode(com.tinkerpop.gremlin.structure.Element)}. + * For {@link VertexProperty} use {@link ElementHelper#hashCode(org.apache.tinkerpop.gremlin.structure.Element)}. * * @param property the property to get the hashCode for * @return the hash code of the property @@ -366,11 +366,11 @@ public static int hashCode(final Property property) { } /** - * A standard method for determining if two {@link com.tinkerpop.gremlin.structure.Property} objects are equal. This method should be used by any + * A standard method for determining if two {@link org.apache.tinkerpop.gremlin.structure.Property} objects are equal. This method should be used by any * {@link Object#equals(Object)} implementation to ensure consistent behavior. * - * @param a the first {@link com.tinkerpop.gremlin.structure.Property} - * @param b the second {@link com.tinkerpop.gremlin.structure.Property} + * @param a the first {@link org.apache.tinkerpop.gremlin.structure.Property} + * @param b the second {@link org.apache.tinkerpop.gremlin.structure.Property} * @return true if equal and false otherwise */ public static boolean areEqual(final Property a, final Object b) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/FeatureDescriptor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/FeatureDescriptor.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/FeatureDescriptor.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/FeatureDescriptor.java index 01e9c70cca2..232444d3743 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/FeatureDescriptor.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/FeatureDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; +package org.apache.tinkerpop.gremlin.structure.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java similarity index 80% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java index af8c383db3a..29be6570f9d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; +package org.apache.tinkerpop.gremlin.structure.util; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.util.config.YamlConfiguration; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.util.config.YamlConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.MapConfiguration; @@ -30,7 +30,7 @@ import java.util.Map; /** - * Factory to construct new {@link com.tinkerpop.gremlin.structure.Graph} instances from a + * Factory to construct new {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from a * {@link org.apache.commons.configuration.Configuration} object or properties file. * * @author Stephen Mallette (http://stephen.genoprime.com) @@ -38,12 +38,12 @@ public class GraphFactory { /** - * Open a graph. See each {@link com.tinkerpop.gremlin.structure.Graph} instance for its configuration options. + * Open a graph. See each {@link org.apache.tinkerpop.gremlin.structure.Graph} instance for its configuration options. * * @param configuration A configuration object that specifies the minimally required properties for a I - * {@link com.tinkerpop.gremlin.structure.Graph} instance. This minimum is determined by the - * {@link com.tinkerpop.gremlin.structure.Graph} instance itself. - * @return A {@link com.tinkerpop.gremlin.structure.Graph} instance. + * {@link org.apache.tinkerpop.gremlin.structure.Graph} instance. This minimum is determined by the + * {@link org.apache.tinkerpop.gremlin.structure.Graph} instance itself. + * @return A {@link org.apache.tinkerpop.gremlin.structure.Graph} instance. * @throws IllegalArgumentException if {@code configuration} */ public static Graph open(final Configuration configuration) { @@ -76,14 +76,14 @@ public static Graph open(final Configuration configuration) { } /** - * Open a graph. See each {@link com.tinkerpop.gremlin.structure.Graph} instance for its configuration options. This file may be XML, YAML, + * Open a graph. See each {@link org.apache.tinkerpop.gremlin.structure.Graph} instance for its configuration options. This file may be XML, YAML, * or a standard properties file. How the configuration is used (and which kind is required) is dependent on * the implementation. * * @param configurationFile The location of a configuration file that specifies the minimally required properties - * for a {@link com.tinkerpop.gremlin.structure.Graph} instance. This minimum is determined by the {@link com.tinkerpop.gremlin.structure.Graph} instance + * for a {@link org.apache.tinkerpop.gremlin.structure.Graph} instance. This minimum is determined by the {@link org.apache.tinkerpop.gremlin.structure.Graph} instance * itself. - * @return A {@link com.tinkerpop.gremlin.structure.Graph} instance. + * @return A {@link org.apache.tinkerpop.gremlin.structure.Graph} instance. * @throws IllegalArgumentException if {@code configurationFile} is null */ public static Graph open(final String configurationFile) { @@ -92,7 +92,7 @@ public static Graph open(final String configurationFile) { } /** - * Open a graph. See each {@link com.tinkerpop.gremlin.structure.Graph} instance for its configuration options. + * Open a graph. See each {@link org.apache.tinkerpop.gremlin.structure.Graph} instance for its configuration options. * * @param configuration A {@link java.util.Map} based configuration that will be converted to an {@link org.apache.commons.configuration.Configuration} object * via {@link org.apache.commons.configuration.MapConfiguration} and passed to the appropriate overload. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphVariableHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphVariableHelper.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphVariableHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphVariableHelper.java index 46a22ce2969..f7e251c2e1e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphVariableHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/GraphVariableHelper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; +package org.apache.tinkerpop.gremlin.structure.util; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/StringFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/StringFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java index 2105577e794..76b4db032c9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/StringFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; - -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.TraversalStrategy; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.structure.strategy.StrategyElement; -import com.tinkerpop.gremlin.structure.strategy.StrategyProperty; -import com.tinkerpop.gremlin.structure.strategy.StrategyVariables; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +package org.apache.tinkerpop.gremlin.structure.util; + +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.TraversalStrategy; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyElement; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyProperty; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyVariables; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.javatuples.Pair; import java.lang.reflect.Method; @@ -74,14 +74,14 @@ public class StringFactory { private static final int prefixLength = featuresStartWith.length(); /** - * Construct the representation for a {@link com.tinkerpop.gremlin.structure.Vertex}. + * Construct the representation for a {@link org.apache.tinkerpop.gremlin.structure.Vertex}. */ public static String vertexString(final Vertex vertex) { return V + L_BRACKET + vertex.id() + R_BRACKET; } /** - * Construct the representation for a {@link com.tinkerpop.gremlin.structure.Edge}. + * Construct the representation for a {@link org.apache.tinkerpop.gremlin.structure.Edge}. */ public static String edgeString(final Edge edge) { final Vertex inV = edge.iterators().vertexIterator(Direction.IN).next(); @@ -90,7 +90,7 @@ public static String edgeString(final Edge edge) { } /** - * Construct the representation for a {@link com.tinkerpop.gremlin.structure.Property} or {@link com.tinkerpop.gremlin.structure.VertexProperty}. + * Construct the representation for a {@link org.apache.tinkerpop.gremlin.structure.Property} or {@link org.apache.tinkerpop.gremlin.structure.VertexProperty}. */ public static String propertyString(final Property property) { if (property instanceof VertexProperty) { @@ -105,7 +105,7 @@ public static String propertyString(final Property property) { } /** - * Construct the representation for a {@link com.tinkerpop.gremlin.structure.Graph}. + * Construct the representation for a {@link org.apache.tinkerpop.gremlin.structure.Graph}. * * @param internalString a mapper {@link String} that appends to the end of the standard representation */ @@ -114,7 +114,7 @@ public static String graphString(final Graph graph, final String internalString) } /** - * Construct the representation for a {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy}. + * Construct the representation for a {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy}. */ public static String graphStrategyString(final GraphStrategy graphStrategy) { diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java index 3ab0e79b1fb..7c9a533118d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch; +package org.apache.tinkerpop.gremlin.structure.util.batch; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchGraph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java index d31764b10c2..b8582a85ba9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/BatchGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.VertexTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.batch.cache.VertexCache; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.util.batch; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.VertexTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.VertexCache; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; @@ -54,7 +54,7 @@ * {@code BatchGraph} is ONLY meant for loading data and does not support any retrieval or removal operations. * That is, BatchGraph only supports the following methods: * - {@link #addVertex(Object...)} for adding vertices - * - {@link Vertex#addEdge(String, com.tinkerpop.gremlin.structure.Vertex, Object...)} for adding edges + * - {@link Vertex#addEdge(String, org.apache.tinkerpop.gremlin.structure.Vertex, Object...)} for adding edges * - {@link #V(Object...)} to be used when adding edges * - Property getter, setter and removal methods for vertices and edges. *
@@ -65,13 +65,13 @@ * {@code BatchGraph} can also automatically set the provided element ids as properties on the respective element. Use * {@link Builder#vertexIdKey(String)} and {@link Builder#edgeIdKey(String)} to set the keys * for the vertex and edge properties respectively. This allows to make the loaded baseGraph compatible for later - * operation with {@link com.tinkerpop.gremlin.structure.strategy.IdStrategy}. + * operation with {@link org.apache.tinkerpop.gremlin.structure.strategy.IdStrategy}. *
- * Note that {@code BatchGraph} itself is not a {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy} because + * Note that {@code BatchGraph} itself is not a {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy} because * it requires that the {@link Vertex} implementation not hold on to the underlying {@link Vertex} reference and - * {@link com.tinkerpop.gremlin.structure.strategy.StrategyVertex} does that by it's very nature. While it might + * {@link org.apache.tinkerpop.gremlin.structure.strategy.StrategyVertex} does that by it's very nature. While it might * be possible to work around this issue, it is likely better for performance to simply leave this as a "half-wrapper" - * implementation, instead of forcing it into a {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy}. + * implementation, instead of forcing it into a {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy}. * * @author Matthias Broecheler (http://www.matthiasb.com) * @author Stephen Mallette (http://stephen.genoprime.com) @@ -598,7 +598,7 @@ public Builder edgeIdKey(final String key) { } /** - * Number of mutations to perform between calls to {@link com.tinkerpop.gremlin.structure.Transaction#commit}. + * Number of mutations to perform between calls to {@link org.apache.tinkerpop.gremlin.structure.Transaction#commit}. */ public Builder bufferSize(long bufferSize) { if (bufferSize <= 0) throw new IllegalArgumentException("BufferSize must be positive"); diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/Exists.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/Exists.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java index 08d5ee1669a..ebe941ef6a9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/Exists.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch; +package org.apache.tinkerpop.gremlin.structure.util.batch; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.util.function.BiConsumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/VertexIdType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java similarity index 78% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/VertexIdType.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java index 30eb2f8e4e7..29cf4ce328d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/VertexIdType.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch; +package org.apache.tinkerpop.gremlin.structure.util.batch; -import com.tinkerpop.gremlin.structure.util.batch.cache.LongIDVertexCache; -import com.tinkerpop.gremlin.structure.util.batch.cache.ObjectIDVertexCache; -import com.tinkerpop.gremlin.structure.util.batch.cache.StringIDVertexCache; -import com.tinkerpop.gremlin.structure.util.batch.cache.URLCompression; -import com.tinkerpop.gremlin.structure.util.batch.cache.VertexCache; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.LongIDVertexCache; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.ObjectIDVertexCache; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.StringIDVertexCache; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.URLCompression; +import org.apache.tinkerpop.gremlin.structure.util.batch.cache.VertexCache; /** * Type of vertex ids expected by BatchGraph. The default is IdType.OBJECT. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java index 4dbb618a271..56728424446 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.HashMap; import java.util.HashSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java index 885eb9bc538..aef4a726c6f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; import com.carrotsearch.hppc.LongArrayList; import com.carrotsearch.hppc.LongObjectMap; import com.carrotsearch.hppc.LongObjectOpenHashMap; import com.carrotsearch.hppc.procedures.LongProcedure; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Matthias Broecheler (http://www.matthiasb.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java index 95e2150aa88..7487430377a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; /** * @author Matthias Broecheler (http://www.matthiasb.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java index ee04a599afa..c862f71efd8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; /** * @author Matthias Broecheler (http://www.matthiasb.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java index b69c9584c41..865fd70be63 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.HashMap; import java.util.HashSet; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java index f06ef73cbdc..4113cc76edc 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; import java.util.HashMap; import java.util.Map; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java index 32b5bc5b83a..3ee7626a25b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.batch.cache; +package org.apache.tinkerpop.gremlin.structure.util.batch.cache; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Matthias Broecheler (http://www.matthiasb.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/Attachable.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/Attachable.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/Attachable.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/Attachable.java index fe62ffbb24f..c07a3ecf8ca 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/Attachable.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/Attachable.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * An interface that provides methods for detached properties and elements to be re-attached to the {@link Graph}. diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java index be20e6d0fc3..6d78678ee3b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.javatuples.Pair; import java.util.Collections; @@ -44,7 +44,7 @@ * A {@code DetachedEdge} only has reference to the properties and in/out vertices that are associated with it at the * time of detachment (or construction) and is not traversable or mutable. Note that the references to the in/out * vertices are {@link DetachedVertex} instances that only have reference to the - * {@link com.tinkerpop.gremlin.structure.Vertex#id()} and {@link com.tinkerpop.gremlin.structure.Vertex#label()}. + * {@link org.apache.tinkerpop.gremlin.structure.Vertex#id()} and {@link org.apache.tinkerpop.gremlin.structure.Vertex#label()}. * * @author Stephen Mallette (http://stephen.genoprime.com) * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedElement.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedElement.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedElement.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedElement.java index 4acdcc920d1..e8da1a172d1 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedElement.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedElement.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.io.Serializable; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java index 09c0654b796..12c3a73f9e8 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPath.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPath.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPath.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPath.java index dd8cf4a05c0..1709512bac9 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPath.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPath.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.util.path.MutablePath; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.util.path.MutablePath; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java similarity index 88% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java index 21a5b1b5422..e09039f80c3 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.io.Serializable; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java index d7f450b4024..2517986d6cf 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java similarity index 90% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java index ab4562bd8f4..fddbc0dff53 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Collections; import java.util.HashMap; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java similarity index 81% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java index cd7a2b50ea5..37070b52b1b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.empty; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.util.EmptyGraphTraversal; -import com.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.structure.util.empty; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.util.EmptyGraphTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java similarity index 89% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java index 5a62dc82af2..4450ea0e295 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyProperty.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.empty; +package org.apache.tinkerpop.gremlin.structure.util.empty; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.NoSuchElementException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java similarity index 87% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java index d8eb6fd5945..abd1548715e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyVertexProperty.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.empty; +package org.apache.tinkerpop.gremlin.structure.util.empty; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Collections; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java index 10b5035db30..f48c7fcea56 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedEdge.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java index d8aba7eca83..573d0bbc7fb 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedElement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java index dc5e6a474f9..004bdb664cd 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedGraph.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java index b56a825903b..454e9a19082 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java index 3673f4e3555..31f6f84561d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java similarity index 93% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java index 13e4293a5b1..77fabe6dc50 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertex.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java index 068d8610358..8003921a232 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVertexProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.wrapped; +package org.apache.tinkerpop.gremlin.structure.util.wrapped; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Gremlin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Gremlin.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java index fb4b55ea3fe..26f9919979a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Gremlin.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util; +package org.apache.tinkerpop.gremlin.util; import com.jcabi.manifests.Manifests; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Serializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Serializer.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Serializer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Serializer.java index 747b5e75bc0..22dba7a1356 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/Serializer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Serializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util; +package org.apache.tinkerpop.gremlin.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/StreamFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/StreamFactory.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/StreamFactory.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/StreamFactory.java index 5c84ff92d89..e905d92668e 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/StreamFactory.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/StreamFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util; +package org.apache.tinkerpop.gremlin.util; import java.util.Iterator; import java.util.Spliterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/TimeUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/TimeUtil.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/TimeUtil.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/TimeUtil.java index f4c874429cd..51315604d95 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/TimeUtil.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/TimeUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util; +package org.apache.tinkerpop.gremlin.util; import java.util.concurrent.TimeUnit; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/config/YamlConfiguration.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/config/YamlConfiguration.java similarity index 99% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/config/YamlConfiguration.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/config/YamlConfiguration.java index 77f80f2dbe1..56ae2ea54da 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/config/YamlConfiguration.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/config/YamlConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.config; +package org.apache.tinkerpop.gremlin.util.config; import org.apache.commons.configuration.AbstractHierarchicalFileConfiguration; import org.apache.commons.configuration.ConfigurationException; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/FunctionUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/FunctionUtils.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/FunctionUtils.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/FunctionUtils.java index 14e006e814b..1071f0dd122 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/FunctionUtils.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/FunctionUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java index ca4cf68347d..6a0184a7e53 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiConsumer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingConsumer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingConsumer.java similarity index 95% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingConsumer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingConsumer.java index db0ab125cdf..a42cb187555 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingConsumer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingConsumer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingFunction.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingFunction.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingFunction.java index 86662a93e79..10655f1b876 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingFunction.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingFunction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingSupplier.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingSupplier.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingSupplier.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingSupplier.java index 57e93fe25b9..b9cf5620a2f 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/ThrowingSupplier.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingSupplier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TraversableLambda.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TraversableLambda.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TraversableLambda.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TraversableLambda.java index 736866d221d..8373f5a96d7 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TraversableLambda.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TraversableLambda.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; -import com.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traversal; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriConsumer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriConsumer.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriConsumer.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriConsumer.java index 1f59d9615be..0c0d6289809 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriConsumer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriConsumer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; import java.util.Objects; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriFunction.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriFunction.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriFunction.java index 55ffe1ed849..b1909d18942 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/function/TriFunction.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/TriFunction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; import java.util.Objects; import java.util.function.Function; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/ArrayIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/ArrayIterator.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/ArrayIterator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/ArrayIterator.java index cd82ad37d04..e7e82ec35df 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/ArrayIterator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/ArrayIterator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.iterator; +package org.apache.tinkerpop.gremlin.util.iterator; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/DoubleIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/DoubleIterator.java similarity index 92% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/DoubleIterator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/DoubleIterator.java index e8ceaa56945..b1b9219bf0a 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/DoubleIterator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/DoubleIterator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.iterator; +package org.apache.tinkerpop.gremlin.util.iterator; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/IteratorUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java similarity index 98% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/IteratorUtils.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java index e01ecc05b7f..56cc93ed576 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/IteratorUtils.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.iterator; +package org.apache.tinkerpop.gremlin.util.iterator; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.ArrayList; import java.util.Collection; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/MultiIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/MultiIterator.java similarity index 94% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/MultiIterator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/MultiIterator.java index 79ec1d3ae69..03d015892e6 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/MultiIterator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/MultiIterator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.iterator; +package org.apache.tinkerpop.gremlin.util.iterator; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.ArrayList; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/SingleIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/SingleIterator.java similarity index 91% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/SingleIterator.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/SingleIterator.java index 1e661c4879f..69b90d56a42 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/iterator/SingleIterator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/SingleIterator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.iterator; +package org.apache.tinkerpop.gremlin.util.iterator; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import java.util.Iterator; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/MultiMap.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java similarity index 97% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/MultiMap.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java index 22d377d6882..d09dabe823b 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/MultiMap.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.tools; +package org.apache.tinkerpop.gremlin.util.tools; import java.util.Collection; import java.util.Collections; diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/TimeUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/TimeUtils.java similarity index 96% rename from gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/TimeUtils.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/TimeUtils.java index 030e6150fd5..a8d4788654d 100644 --- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/util/tools/TimeUtils.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/TimeUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.tools; +package org.apache.tinkerpop.gremlin.util.tools; import java.util.stream.IntStream; diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml index b197ce8dd56..846ac547c9a 100644 --- a/gremlin-driver/pom.xml +++ b/gremlin-driver/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -30,7 +30,7 @@ limitations under the License. - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} @@ -64,7 +64,7 @@ limitations under the License. test - com.tinkerpop + org.apache.tinkerpop tinkergraph-gremlin ${project.version} test diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java similarity index 94% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Channelizer.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java index 19e2cba7904..a0a272bd056 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Channelizer.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder; -import com.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder; -import com.tinkerpop.gremlin.driver.handler.WebSocketClientHandler; -import com.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder; -import com.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder; +import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder; +import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java similarity index 95% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Client.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java index e6f14b6805a..b585cb3129c 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Client.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.exception.ConnectionException; -import com.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +52,7 @@ public abstract class Client { /** * Makes any final changes to the builder and returns the constructed {@link RequestMessage}. Implementers * may choose to override this message to append data to the request before sending. By default, this method - * will simply call the {@link com.tinkerpop.gremlin.driver.message.RequestMessage.Builder#create()} and return + * will simply call the {@link org.apache.tinkerpop.gremlin.driver.message.RequestMessage.Builder#create()} and return * the {@link RequestMessage}. */ public RequestMessage buildMessage(final RequestMessage.Builder builder) { @@ -142,7 +142,7 @@ public void close() { /** * A {@code Client} implementation that does not operate in a session. Requests are sent to multiple servers - * given a {@link com.tinkerpop.gremlin.driver.LoadBalancingStrategy}. Transactions are automatically committed + * given a {@link org.apache.tinkerpop.gremlin.driver.LoadBalancingStrategy}. Transactions are automatically committed * (or rolled-back on error) after each request. */ public static class ClusteredClient extends Client { diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java similarity index 99% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Cluster.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java index d1a1ee39baa..cd523ce6ffa 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Cluster.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import io.netty.bootstrap.Bootstrap; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ClusterInfo.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ClusterInfo.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ClusterInfo.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ClusterInfo.java index b9dbb33a52d..7667f8d9673 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ClusterInfo.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ClusterInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Connection.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java index 41458aefd9d..659f4ad683f 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Connection.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.exception.ConnectionException; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelPromise; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java similarity index 99% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ConnectionPool.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java index 11eecc62c00..eeac6492240 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ConnectionPool.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.exception.ConnectionException; -import com.tinkerpop.gremlin.util.TimeUtil; +import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException; +import org.apache.tinkerpop.gremlin.util.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java similarity index 92% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Handler.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java index b54b04c7f7a..2cbdd9aa26c 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Handler.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.exception.ResponseException; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.ReferenceCountUtil; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Host.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java similarity index 98% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Host.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java index 5fccd7f1d66..b573a483a86 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Host.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/LoadBalancingStrategy.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java similarity index 96% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/LoadBalancingStrategy.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java index 75620476058..d1811aa4074 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/LoadBalancingStrategy.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; import java.util.Collection; import java.util.Iterator; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/MessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java similarity index 87% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/MessageSerializer.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java index 140fe5a0b5e..922781c50d8 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/MessageSerializer.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.ser.SerializationException; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.ser.SerializationException; +import org.apache.tinkerpop.gremlin.structure.Graph; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.slf4j.Logger; @@ -32,11 +32,11 @@ /** * Serializes data to and from Gremlin Server. Typically the object being serialized or deserialized will be an item - * from an {@link java.util.Iterator} as returned from the {@code ScriptEngine} or an incoming {@link com.tinkerpop.gremlin.driver.message.RequestMessage}. + * from an {@link java.util.Iterator} as returned from the {@code ScriptEngine} or an incoming {@link org.apache.tinkerpop.gremlin.driver.message.RequestMessage}. * {@link MessageSerializer} instances are instantiated to a cache via {@link ServiceLoader} and indexed based on * the mime types they support. If a mime type is supported more than once, the last {@link MessageSerializer} * instance loaded for that mime type is assigned. If a mime type is not found the default - * {@link com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0} is used to return the results. + * {@link org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0} is used to return the results. * * @author Stephen Mallette (http://stephen.genoprime.com) */ diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResponseQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResponseQueue.java similarity index 92% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResponseQueue.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResponseQueue.java index d259e100184..b3cfbfe195c 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResponseQueue.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResponseQueue.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; @@ -27,7 +27,7 @@ /** * A queue of incoming {@link ResponseMessage} objects. The queue is updated by the - * {@link com.tinkerpop.gremlin.driver.Handler.GremlinResponseHandler} until a response terminator is identified. At that point the fetch + * {@link org.apache.tinkerpop.gremlin.driver.Handler.GremlinResponseHandler} until a response terminator is identified. At that point the fetch * status is changed to {@link Status#COMPLETE} and all results have made it client side. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Result.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java similarity index 90% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Result.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java index 88b81bc6699..cffafd8de72 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Result.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * An {@code Item} represents an result value from the server. diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResultSet.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java similarity index 96% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResultSet.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java index 3e73d57dbd3..48d69decef7 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ResultSet.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import io.netty.channel.Channel; import java.util.ArrayList; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Settings.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java index 3a94daadf1b..2666a21f5e2 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Settings.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0; +import org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Tokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java similarity index 98% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Tokens.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java index 5703715a83f..7cfbb475bc5 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/Tokens.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; import java.util.Arrays; import java.util.List; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ConnectionException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ConnectionException.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ConnectionException.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ConnectionException.java index b3b7be3e383..67101b39e01 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ConnectionException.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ConnectionException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.exception; +package org.apache.tinkerpop.gremlin.driver.exception; import java.net.InetSocketAddress; import java.net.URI; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ResponseException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java similarity index 90% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ResponseException.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java index 7f186a62146..3ae4e75541a 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/exception/ResponseException.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.exception; +package org.apache.tinkerpop.gremlin.driver.exception; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java similarity index 90% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java index 9114bec261a..ed1e6c0dd54 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.handler; +package org.apache.tinkerpop.gremlin.driver.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java similarity index 93% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java index 880af7e5f37..d9db3761fbf 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.handler; +package org.apache.tinkerpop.gremlin.driver.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java similarity index 98% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java index 614b4a98795..5078ac9df8e 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.handler; +package org.apache.tinkerpop.gremlin.driver.handler; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java similarity index 91% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java index b6b6508c297..5080b47ebf2 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.handler; +package org.apache.tinkerpop.gremlin.driver.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java similarity index 92% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java index 42a981dd074..b07530d3d73 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.handler; +package org.apache.tinkerpop.gremlin.driver.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/RequestMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/RequestMessage.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java index 1194bf7f5ef..dc1fbf33879 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/RequestMessage.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.message; +package org.apache.tinkerpop.gremlin.driver.message; -import com.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import java.util.HashMap; import java.util.Map; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java similarity index 98% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseMessage.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java index 13004b227c9..f43f56e80ec 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseMessage.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.message; +package org.apache.tinkerpop.gremlin.driver.message; import java.util.Collections; import java.util.Map; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseResult.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java similarity index 96% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseResult.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java index 7e86ff796e7..a17c7148f0f 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseResult.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.message; +package org.apache.tinkerpop.gremlin.driver.message; import java.util.Map; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatus.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatus.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java index 2a6372b32c4..1b7420b5c20 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatus.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.message; +package org.apache.tinkerpop.gremlin.driver.message; import java.util.Map; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatusCode.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java similarity index 95% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatusCode.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java index 5de54d02004..a310096580c 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/message/ResponseStatusCode.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.message; +package org.apache.tinkerpop.gremlin.driver.message; import java.util.HashMap; import java.util.Map; @@ -59,7 +59,7 @@ public enum ResponseStatusCode { SERVER_ERROR(500), /** - * The remote {@link com.tinkerpop.gremlin.process.Traversal} submitted for processing evaluated in on the + * The remote {@link org.apache.tinkerpop.gremlin.process.Traversal} submitted for processing evaluated in on the * server with errors and could not be processed. */ SERVER_ERROR_TRAVERSAL_EVALUATION(596), diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java similarity index 95% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java index 0c028d272e6..518f2425399 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; @@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; import groovy.json.JsonBuilder; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java index 8ebe159e4ef..98816777889 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderKryoSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java similarity index 94% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java index e0c6ce0195b..7c928e780b7 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; import java.nio.ByteBuffer; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java similarity index 94% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java index fd1ef363e05..91063a7da75 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java similarity index 95% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java index e8101a53444..3f35a77ab5f 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.kryo.KryoMapper; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.util.ReferenceCountUtil; @@ -71,7 +71,7 @@ protected Kryo initialValue() { private boolean serializeToString; /** - * Creates an instance with a standard {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper} instance. Note that this instance + * Creates an instance with a standard {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper} instance. Note that this instance * will be overriden by {@link #configure} is called. */ public KryoMessageSerializerV1d0() { @@ -79,7 +79,7 @@ public KryoMessageSerializerV1d0() { } /** - * Creates an instance with a provided mapper configured {@link com.tinkerpop.gremlin.structure.io.kryo.KryoMapper} instance. Note that this instance + * Creates an instance with a provided mapper configured {@link org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper} instance. Note that this instance * will be overriden by {@link #configure} is called. */ public KryoMessageSerializerV1d0(final KryoMapper kryo) { diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java similarity index 87% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java index 3c628ccb4d3..912c78605ce 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; /** * An extension to the MessageSerializer interface that allows a format to be compatible with text-based diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerTokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java similarity index 97% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerTokens.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java index 81dcbf1a2fa..f2a5a4672ef 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerTokens.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerializationException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java similarity index 95% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerializationException.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java index 2526eaa169d..bf40374e148 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/SerializationException.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/Serializers.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java similarity index 86% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/Serializers.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java index 454a75b3d84..4deab4b823b 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/ser/Serializers.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; +package org.apache.tinkerpop.gremlin.driver.ser; -import com.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; /** * An enum of the default serializers. @@ -34,14 +34,14 @@ public enum Serializers { /** * Default serializer for results returned from Gremlin Server. This implementation must be of type - * {@link com.tinkerpop.gremlin.driver.ser.MessageTextSerializer} so that it can be compatible with text-based + * {@link org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer} so that it can be compatible with text-based * websocket messages. */ public static final MessageSerializer DEFAULT_RESULT_SERIALIZER = new JsonMessageSerializerV1d0(); /** * Default serializer for requests received by Gremlin Server. This implementation must be of type - * {@link com.tinkerpop.gremlin.driver.ser.MessageTextSerializer} so that it can be compatible with text-based + * {@link org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer} so that it can be compatible with text-based * websocket messages. */ public static final MessageSerializer DEFAULT_REQUEST_SERIALIZER = new JsonMessageSerializerV1d0(); diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/NioClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/NioClient.java similarity index 89% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/NioClient.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/NioClient.java index 94499d4e5d5..dd2b358db7e 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/NioClient.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/NioClient.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.simple; +package org.apache.tinkerpop.gremlin.driver.simple; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder; -import com.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder; +import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/SimpleClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java similarity index 84% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/SimpleClient.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java index 7979a3cfb0f..3cd4701e4ad 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/SimpleClient.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.simple; +package org.apache.tinkerpop.gremlin.driver.simple; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; import java.io.Closeable; import java.util.function.Consumer; diff --git a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/WebSocketClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java similarity index 90% rename from gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/WebSocketClient.java rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java index 9cbd8b3dc3f..dac8cd319d6 100644 --- a/gremlin-driver/src/main/java/com/tinkerpop/gremlin/driver/simple/WebSocketClient.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.simple; +package org.apache.tinkerpop.gremlin.driver.simple; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.handler.WebSocketClientHandler; -import com.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder; -import com.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder; +import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/HostTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java similarity index 96% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/HostTest.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java index 1f4ceae881d..cef9a82d73b 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/HostTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; import org.junit.Test; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/RequestMessageTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java similarity index 95% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/RequestMessageTest.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java index 405f9fb355d..bf018668aa6 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/RequestMessageTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; +package org.apache.tinkerpop.gremlin.driver; -import com.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; import org.junit.Assert; import org.junit.Test; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ResultTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java similarity index 91% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ResultTest.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java index ae1f0396763..0516716103f 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ResultTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver; - -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +package org.apache.tinkerpop.gremlin.driver; + +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; import org.junit.Test; import java.util.UUID; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java similarity index 96% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java index 8bdf1ad2c97..839a13b8ebf 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.benchmark; +package org.apache.tinkerpop.gremlin.driver.benchmark; -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java similarity index 93% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java index c8472604304..da3764b6818 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; - -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +package org.apache.tinkerpop.gremlin.driver.ser; + +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java similarity index 95% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java index 83547fb4aff..cb511613711 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; - -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +package org.apache.tinkerpop.gremlin.driver.ser; + +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.json.JSONArray; import org.json.JSONObject; import org.junit.Test; diff --git a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java similarity index 93% rename from gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java rename to gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java index 4f757dc0bbd..5514bfcb6ba 100644 --- a/gremlin-driver/src/test/java/com/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.driver.ser; - -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.driver.ser; + +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml index 60865ebe22a..7da29e4063f 100644 --- a/gremlin-groovy-test/pom.xml +++ b/gremlin-groovy-test/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,12 +27,12 @@ limitations under the License. Gremlin Groovy Test: Gremlin Structure and Process Test Suite - com.tinkerpop + org.apache.tinkerpop gremlin-test ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy similarity index 91% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy index 702e03e8574..2b87e6ad3e6 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoaderTest.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders +package org.apache.tinkerpop.gremlin.groovy.loaders -import com.tinkerpop.gremlin.AbstractGremlinTest +import org.apache.tinkerpop.gremlin.AbstractGremlinTest import org.junit.Test import static org.junit.Assert.assertEquals diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy similarity index 94% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy index 786c56bde9b..fbe00e4d875 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders +package org.apache.tinkerpop.gremlin.groovy.loaders -import com.tinkerpop.gremlin.AbstractGremlinTest -import com.tinkerpop.gremlin.LoadGraphWith -import com.tinkerpop.gremlin.groovy.util.SugarTestHelper -import com.tinkerpop.gremlin.structure.Graph -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.AbstractGremlinTest +import org.apache.tinkerpop.gremlin.LoadGraphWith +import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper +import org.apache.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.structure.Vertex import org.junit.Test import static org.junit.Assert.* diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy similarity index 92% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy index c9f256f69f2..7ff0be86cb4 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/SugarTestHelper.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.util +package org.apache.tinkerpop.gremlin.groovy.util -import com.tinkerpop.gremlin.GraphProvider +import org.apache.tinkerpop.gremlin.GraphProvider /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/ComputerTestHelper.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/ComputerTestHelper.groovy similarity index 82% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/ComputerTestHelper.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/ComputerTestHelper.groovy index a2512c7c9ae..8e3433cb12e 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/ComputerTestHelper.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/ComputerTestHelper.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process +package org.apache.tinkerpop.gremlin.process -import com.tinkerpop.gremlin.groovy.engine.GroovyTraversalScript -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.computer.GraphComputer -import com.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.groovy.engine.GroovyTraversalScript +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer +import org.apache.tinkerpop.gremlin.structure.Graph /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy similarity index 97% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy index 62d0680b318..eb7cbaf1629 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyGraphComputerTest.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer +package org.apache.tinkerpop.gremlin.process.computer -import com.tinkerpop.gremlin.process.computer.lambda.LambdaMapReduce -import com.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram +import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaMapReduce +import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy index 516df78fde2..d68e4509f49 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy similarity index 87% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy index 5a99c9c7082..c564324e23c 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.ChooseTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.ChooseTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy similarity index 91% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy index a2b059c05fa..1e8c42aaa10 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalTest -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Order -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalTest +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Order +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy similarity index 92% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy index 17e41e49d05..19f9f3950b0 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy similarity index 90% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy index d5788f089dc..9c8ffdbfec7 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import static com.tinkerpop.gremlin.process.graph.traversal.__.* +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.* /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy similarity index 74% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy index 3884af67752..778d3f3bdda 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter - -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.AndTest -import com.tinkerpop.gremlin.structure.Vertex - -import static com.tinkerpop.gremlin.process.graph.traversal.__.has -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE -import static com.tinkerpop.gremlin.structure.Compare.gt -import static com.tinkerpop.gremlin.structure.Compare.gte +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter + +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.AndTest +import org.apache.tinkerpop.gremlin.structure.Vertex + +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.has +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE +import static org.apache.tinkerpop.gremlin.structure.Compare.gt +import static org.apache.tinkerpop.gremlin.structure.Compare.gte /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy similarity index 82% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy index 7333277f3eb..3f683a736ac 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy similarity index 83% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy index 242b35f0e44..295fa4ff63d 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy index 4b05307c9e3..a8817e6be99 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy similarity index 90% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy index 34b100b3873..e0d20519cf6 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter - -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptTest -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter + +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy similarity index 91% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy index fd3b5d8c419..a41614cfb78 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterTest -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterTest +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy similarity index 84% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy index 670fd2053bb..b1d43e18807 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasNotTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasNotTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Joshua Shinavier (http://fortytwo.net) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy similarity index 91% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy index 77bbc869991..a32da60aa94 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter - -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTest -import com.tinkerpop.gremlin.structure.Compare -import com.tinkerpop.gremlin.structure.Contains -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter + +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTest +import org.apache.tinkerpop.gremlin.structure.Compare +import org.apache.tinkerpop.gremlin.structure.Contains +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy similarity index 87% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy index 1a27c4d2c24..52cde81ba57 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.IsTest -import com.tinkerpop.gremlin.structure.Compare -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.IsTest +import org.apache.tinkerpop.gremlin.structure.Compare +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Daniel Kuppitz (http://gremlin.guru) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy similarity index 75% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy index bac37967a0b..c28bec8f8be 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter - -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.OrTest -import com.tinkerpop.gremlin.structure.Vertex - -import static com.tinkerpop.gremlin.process.graph.traversal.__.has -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE -import static com.tinkerpop.gremlin.structure.Compare.gt -import static com.tinkerpop.gremlin.structure.Compare.gte +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter + +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.OrTest +import org.apache.tinkerpop.gremlin.structure.Vertex + +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.has +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE +import static org.apache.tinkerpop.gremlin.structure.Compare.gt +import static org.apache.tinkerpop.gremlin.structure.Compare.gte /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy similarity index 90% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy index a08b0361917..f86e3607b25 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.RangeTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RangeTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy similarity index 87% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy index ffb3eb001b7..bb34aa15a54 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy similarity index 81% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy index 32289f2a795..84d0b8a7501 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleTest -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleTest +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy similarity index 81% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy index c18c4eb2d58..4dffd513621 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter - -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathTest -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter + +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy similarity index 88% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy index b10266ee02e..5a8ae45894e 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereTest -import com.tinkerpop.gremlin.structure.Compare -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereTest +import org.apache.tinkerpop.gremlin.structure.Compare +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy similarity index 93% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy index fc34adcf43a..ded1ba7c7af 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map - -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.BackTest -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map + +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.BackTest +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy similarity index 87% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy index 09e7eed9734..252d9a77525 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.structure.Vertex -import static com.tinkerpop.gremlin.process.graph.traversal.__.out -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE /** * diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy similarity index 88% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy index b57049c841b..856685f82ba 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy similarity index 85% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy index 09cfa7cbaaa..3bc3ba6b966 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.map.FoldTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.FoldTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy similarity index 90% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy index f313cd2e145..dabb6b0d4cc 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MapTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MapTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy similarity index 94% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy index c41e23e2062..df83e57ed0a 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map - -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest -import com.tinkerpop.gremlin.structure.Compare -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map + +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest +import org.apache.tinkerpop.gremlin.structure.Compare +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy similarity index 81% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy index 3d731db5340..05f8b03043c 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MaxTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MaxTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy similarity index 80% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy index f8e4a7140e4..9fef56769d9 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MeanTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MeanTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy similarity index 81% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy index 91103933e8d..4066660e714 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MinTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MinTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy similarity index 92% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy index f89065aa6e9..8112f3997f1 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map - -import com.tinkerpop.gremlin.process.Scope -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.OrderTest -import com.tinkerpop.gremlin.structure.Order -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map + +import org.apache.tinkerpop.gremlin.process.Scope +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderTest +import org.apache.tinkerpop.gremlin.structure.Order +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy similarity index 87% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy index 65c35bd2eb9..436e2d3b793 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy similarity index 85% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy index 1e202a136c1..58e1326d14d 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy similarity index 93% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy index c5c0a89700e..02a706975b7 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.structure.Order -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.structure.Order +import org.apache.tinkerpop.gremlin.structure.Vertex -import static com.tinkerpop.gremlin.process.graph.traversal.__.values +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.values /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy similarity index 82% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy index 169c878c8f9..60e22b9b777 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.UnfoldTest -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.UnfoldTest +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy index 152f6ec2f04..fbd9e6e2208 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.ValueMapTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.ValueMapTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy similarity index 95% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy index 17d88b83ae6..576efb55097 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map - -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.map.VertexTest -import com.tinkerpop.gremlin.structure.Compare -import com.tinkerpop.gremlin.structure.Direction -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Vertex +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map + +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexTest +import org.apache.tinkerpop.gremlin.structure.Compare +import org.apache.tinkerpop.gremlin.structure.Direction +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy index 4c84545fdf9..1256be92cc5 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AddEdgeTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AddEdgeTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy similarity index 83% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy index 1ab32fd970b..ccae5484bd0 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy similarity index 90% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy index 6c544823185..4a5e12995b0 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy similarity index 89% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy index 237c91f5b0a..ea94e519221 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy index 09e4702b776..5d36c34e43b 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Path -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Path +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy similarity index 78% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy index 9ff1c67db00..46963e1610f 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect - -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileTest -import com.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect + +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileTest +import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy similarity index 84% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy index 9fa604a750d..7a7c38d50a1 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackTest +import org.apache.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ -import static com.tinkerpop.gremlin.structure.Operator.sum +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import static org.apache.tinkerpop.gremlin.structure.Operator.sum /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy similarity index 83% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy index bb3362ba794..33c771f239e 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapTest -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapTest +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy index 1447037d2c1..0a07265f836 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy similarity index 88% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy index 22658e85954..277b8d1e69a 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreTest -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreTest +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy similarity index 80% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy index 86c2ca8d8c6..31a59e92456 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SubgraphTest -import com.tinkerpop.gremlin.structure.Graph -import com.tinkerpop.gremlin.structure.Vertex -import com.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SubgraphTest +import org.apache.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy similarity index 86% rename from gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy rename to gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy index dc8510a1306..0342c4ef7e5 100644 --- a/gremlin-groovy-test/src/main/groovy/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import com.tinkerpop.gremlin.process.T -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.ComputerTestHelper -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeTest -import com.tinkerpop.gremlin.process.graph.util.Tree -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.process.T +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.ComputerTestHelper +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeTest +import org.apache.tinkerpop.gremlin.process.graph.util.Tree +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java similarity index 86% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java index 5786f9b750a..083d2817ab7 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineIntegrateTest; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.groovy.util.SugarTestHelper; +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineIntegrateTest; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java similarity index 80% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java index 7144a7b936e..ea0f1e3d67c 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutorTest; -import com.tinkerpop.gremlin.groovy.engine.GroovyTraversalScriptTest; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineTest; -import com.tinkerpop.gremlin.groovy.loaders.GremlinLoaderTest; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoaderTest; -import com.tinkerpop.gremlin.groovy.util.SugarTestHelper; +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutorTest; +import org.apache.tinkerpop.gremlin.groovy.engine.GroovyTraversalScriptTest; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineTest; +import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoaderTest; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoaderTest; +import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java similarity index 98% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java index 1f26ba4efec..d81f6d21393 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.engine; +package org.apache.tinkerpop.gremlin.groovy.engine; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineTest; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineTest; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.junit.Test; import org.kohsuke.groovy.sandbox.GroovyInterceptor; diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java similarity index 90% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java index b309f1bcc81..56d2ae81a0e 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScriptTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.engine; +package org.apache.tinkerpop.gremlin.groovy.engine; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.List; diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java similarity index 93% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java index b40645453d4..d9144b6dc01 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineIntegrateTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.junit.Test; import javax.script.Bindings; import javax.script.ScriptException; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.fail; /** diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java similarity index 96% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java index c43742a6a36..8f6d48821cc 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.NoImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.config.YamlConfiguration; +package org.apache.tinkerpop.gremlin.groovy.jsr223; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.config.YamlConfiguration; import groovy.lang.Closure; import groovy.lang.Script; import org.junit.Assert; @@ -129,7 +129,7 @@ public void shouldLoadImportsViaDependencyManagerInterface() throws Exception { assertTrue(se instanceof ScriptException); } - engine.addImports(new HashSet<>(Arrays.asList("import com.tinkerpop.gremlin.structure.Vertex"))); + engine.addImports(new HashSet<>(Arrays.asList("import org.apache.tinkerpop.gremlin.structure.Vertex"))); assertEquals(Vertex.class.getName(), engine.eval("Vertex.class.getName()")); } diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java similarity index 86% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java index 02f231a7e58..239e23402d4 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.groovy.util.SugarTestHelper; -import com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest; -import com.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper; +import org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest; +import org.apache.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; diff --git a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java similarity index 87% rename from gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java rename to gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java index c27b032c2d0..4d6d09b428f 100644 --- a/gremlin-groovy-test/src/main/java/com/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.groovy.util.SugarTestHelper; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; -import com.tinkerpop.gremlin.process.traversal.CoreTraversalTest; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; +import org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; diff --git a/gremlin-groovy-test/src/main/resources/META-INF/javax.script.ScriptEngineFactory b/gremlin-groovy-test/src/main/resources/META-INF/javax.script.ScriptEngineFactory index 55802500034..24c8a755f09 100644 --- a/gremlin-groovy-test/src/main/resources/META-INF/javax.script.ScriptEngineFactory +++ b/gremlin-groovy-test/src/main/resources/META-INF/javax.script.ScriptEngineFactory @@ -1 +1 @@ -com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory +org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory diff --git a/gremlin-groovy-test/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/gremlin-groovy-test/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory index 55802500034..24c8a755f09 100644 --- a/gremlin-groovy-test/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory +++ b/gremlin-groovy-test/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory @@ -1 +1 @@ -com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory +org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory diff --git a/gremlin-groovy-test/src/main/resources/com/tinkerpop/gremlin/groovy/engine/GremlinExecutorInit.groovy b/gremlin-groovy-test/src/main/resources/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorInit.groovy similarity index 100% rename from gremlin-groovy-test/src/main/resources/com/tinkerpop/gremlin/groovy/engine/GremlinExecutorInit.groovy rename to gremlin-groovy-test/src/main/resources/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorInit.groovy diff --git a/gremlin-groovy-test/src/test/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java b/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java similarity index 96% rename from gremlin-groovy-test/src/test/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java rename to gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java index b89ae135213..74df889f141 100644 --- a/gremlin-groovy-test/src/test/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java +++ b/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; import org.junit.Test; import java.util.HashSet; diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml index 5a3d1d71b4d..f05d975ecba 100644 --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,12 +27,12 @@ limitations under the License. Gremlin Groovy: Gremlin for the Groovy Language - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-algorithm ${project.version} diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy similarity index 78% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy index 86ae68df40f..c485481df8c 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders +package org.apache.tinkerpop.gremlin.groovy.loaders -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine -import com.tinkerpop.gremlin.process.Step -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal -import com.tinkerpop.gremlin.structure.Edge -import com.tinkerpop.gremlin.structure.Element -import com.tinkerpop.gremlin.structure.Graph -import com.tinkerpop.gremlin.structure.Vertex +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine +import org.apache.tinkerpop.gremlin.process.Step +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal +import org.apache.tinkerpop.gremlin.structure.Edge +import org.apache.tinkerpop.gremlin.structure.Element +import org.apache.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.structure.Vertex /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy similarity index 96% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy index 2a5d23e9edc..b7f0ec2f2d4 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/ObjectLoader.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders +package org.apache.tinkerpop.gremlin.groovy.loaders /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy similarity index 84% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy index c9551f883b2..e9caa2ba320 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/StepLoader.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders +package org.apache.tinkerpop.gremlin.groovy.loaders -import com.tinkerpop.gremlin.groovy.function.GComparator -import com.tinkerpop.gremlin.groovy.function.GFunction -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal +import org.apache.tinkerpop.gremlin.groovy.function.GComparator +import org.apache.tinkerpop.gremlin.groovy.function.GFunction +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy similarity index 93% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy index af4de0cf66a..df89e58d9ca 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.loaders - -import com.tinkerpop.gremlin.process.Traversal -import com.tinkerpop.gremlin.process.Traverser -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper -import com.tinkerpop.gremlin.structure.* +package org.apache.tinkerpop.gremlin.groovy.loaders + +import org.apache.tinkerpop.gremlin.process.Traversal +import org.apache.tinkerpop.gremlin.process.Traverser +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper +import org.apache.tinkerpop.gremlin.structure.* /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy similarity index 98% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy index 24b6a1a46e2..b69e291e365 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.util +package org.apache.tinkerpop.gremlin.groovy.util -import com.tinkerpop.gremlin.groovy.plugin.Artifact +import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact import groovy.grape.Grape import org.apache.commons.lang3.SystemUtils diff --git a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy similarity index 97% rename from gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy rename to gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy index 42e88d15f84..9d56d11f178 100644 --- a/gremlin-groovy/src/main/groovy/com/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy +++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/MetaRegistryUtil.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.util +package org.apache.tinkerpop.gremlin.groovy.util import org.codehaus.groovy.runtime.InvokerHelper diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java similarity index 74% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java index 7c685945085..38795879bf3 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java @@ -16,40 +16,40 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; - -import com.tinkerpop.gremlin.algorithm.generator.AbstractGenerator; -import com.tinkerpop.gremlin.groovy.function.GFunction; -import com.tinkerpop.gremlin.groovy.loaders.GremlinLoader; -import com.tinkerpop.gremlin.process.Scope; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram; -import com.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram; -import com.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Operator; -import com.tinkerpop.gremlin.structure.Order; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.structure.util.GraphFactory; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.detached.DetachedElement; -import com.tinkerpop.gremlin.util.Gremlin; -import com.tinkerpop.gremlin.util.function.FunctionUtils; -import com.tinkerpop.gremlin.util.tools.TimeUtils; +package org.apache.tinkerpop.gremlin.groovy; + +import org.apache.tinkerpop.gremlin.algorithm.generator.AbstractGenerator; +import org.apache.tinkerpop.gremlin.groovy.function.GFunction; +import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader; +import org.apache.tinkerpop.gremlin.process.Scope; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Operator; +import org.apache.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement; +import org.apache.tinkerpop.gremlin.util.Gremlin; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.util.tools.TimeUtils; import groovy.grape.Grape; import groovy.json.JsonBuilder; import org.apache.commons.configuration.Configuration; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java similarity index 95% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java index d10dcb69387..b0b6f2988ec 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/CompilerCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import org.codehaus.groovy.control.customizers.CompilationCustomizer; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java similarity index 98% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java index e145e8c94bd..cd9f3d38d85 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import java.util.HashSet; import java.util.Set; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java similarity index 94% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java index 4ae1a18e7cf..4400e8fc0ff 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/EmptyImportCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer; @@ -26,7 +26,7 @@ import java.util.Set; /** - * This {@link com.tinkerpop.gremlin.groovy.ImportCustomizerProvider} is empty and comes with no pre-defined imports + * This {@link org.apache.tinkerpop.gremlin.groovy.ImportCustomizerProvider} is empty and comes with no pre-defined imports * at all. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java index 0be9b549b42..dfebef8b769 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/ImportCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import java.util.Set; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java similarity index 97% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java index 8d50af7a59e..91816b86132 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/NoImportCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java similarity index 97% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java index f4b269e2cf0..67d0674e790 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/SecurityCustomizerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy; +package org.apache.tinkerpop.gremlin.groovy; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.kohsuke.groovy.sandbox.GroovyInterceptor; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java similarity index 98% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java index f1184ad0662..963fd6b6830 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.engine; +package org.apache.tinkerpop.gremlin.groovy.engine; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.javatuples.Pair; import org.slf4j.Logger; @@ -52,7 +52,6 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.UnaryOperator; import java.util.stream.Collectors; /** diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java similarity index 82% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java index 27a65204e6e..09e3d170318 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GroovyTraversalScript.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.engine; - -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalScript; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.structure.Graph; +package org.apache.tinkerpop.gremlin.groovy.engine; + +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalScript; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.commons.configuration.Configuration; import java.util.concurrent.CompletableFuture; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/ScriptEngines.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java similarity index 95% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/ScriptEngines.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java index 9e51b436880..dc4c6d4c5c2 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/engine/ScriptEngines.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.engine; - -import com.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; -import com.tinkerpop.gremlin.groovy.jsr223.DependencyManager; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +package org.apache.tinkerpop.gremlin.groovy.engine; + +import org.apache.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.jsr223.DependencyManager; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; import org.kohsuke.groovy.sandbox.GroovyInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GComparator.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GComparator.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GComparator.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GComparator.java index ada28665f3b..ee0e55dcaec 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GComparator.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GComparator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.function; +package org.apache.tinkerpop.gremlin.groovy.function; import groovy.lang.Closure; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GFunction.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GFunction.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GFunction.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GFunction.java index 6f385302eb5..f1a7435d419 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/function/GFunction.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/function/GFunction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.function; +package org.apache.tinkerpop.gremlin.groovy.function; import groovy.lang.Closure; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java similarity index 77% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java index 42870a0a767..6071c5c17c6 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPluginException; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPluginException; import java.util.List; import java.util.Map; @@ -36,16 +36,16 @@ public interface DependencyManager { /** * Take maven coordinates and load the classes into the classloader used by the ScriptEngine. Those ScriptEngines * that can support script engine plugins should check if there are any new {@link GremlinPlugin} - * implementations in the classloader. The {@link com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine} + * implementations in the classloader. The {@link org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine} * implementation uses ServiceLoader to figure out if there are such classes to return. *
* It is up to the caller to execute the - * {@link GremlinPlugin#pluginTo(com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor)} method. The reason for + * {@link GremlinPlugin#pluginTo(org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor)} method. The reason for * this has to do with conflicts that can occur with mapper imports that are added via the - * {@link com.tinkerpop.gremlin.groovy.ImportCustomizerProvider} and scripts executed through the - * {@link com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor}. Generally speaking, all calls to this "use" method + * {@link org.apache.tinkerpop.gremlin.groovy.ImportCustomizerProvider} and scripts executed through the + * {@link org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor}. Generally speaking, all calls to this "use" method * should be complete prior to calling - * {@link GremlinPlugin#pluginTo(com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor)}. + * {@link GremlinPlugin#pluginTo(org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor)}. */ List use(final String group, final String artifact, final String version); diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java index ea0c8b23102..6fc7d8fbe00 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyClassLoader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; import groovy.lang.GroovyClassLoader; import org.codehaus.groovy.control.CompilerConfiguration; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java similarity index 97% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java index 2a2b447e5b7..ad5ee992b7f 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; - -import com.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.EmptyImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.ImportCustomizerProvider; -import com.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; -import com.tinkerpop.gremlin.groovy.loaders.GremlinLoader; -import com.tinkerpop.gremlin.groovy.plugin.Artifact; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPluginException; +package org.apache.tinkerpop.gremlin.groovy.jsr223; + +import org.apache.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.EmptyImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.ImportCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.SecurityCustomizerProvider; +import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader; +import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPluginException; import groovy.grape.Grape; import groovy.lang.Binding; import groovy.lang.Closure; @@ -67,7 +67,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; -import java.util.stream.Stream; /** * This {@code ScriptEngine} implementation is heavily adapted from the {@code GroovyScriptEngineImpl} to include diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java index 34f523b1159..5eda4e67bec 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; -import com.tinkerpop.gremlin.util.Gremlin; +import org.apache.tinkerpop.gremlin.util.Gremlin; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java similarity index 98% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java index f685744c3ed..8f3860446d5 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ManagedConcurrentValueMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; import org.codehaus.groovy.util.ManagedReference; import org.codehaus.groovy.util.ReferenceBundle; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java similarity index 93% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java index ef7556b0bd9..00817b18dff 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptEnginePluginAcceptor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; -import com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; import javax.script.ScriptContext; import javax.script.ScriptEngine; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java similarity index 97% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java index 1d5333a17eb..0f0105c3ddd 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/ScriptExecutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.jsr223; +package org.apache.tinkerpop.gremlin.groovy.jsr223; import javax.script.Bindings; import java.io.FileReader; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java similarity index 95% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java index 01bc3932cb6..08038ef2c62 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/AbstractGremlinPlugin.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.IO; @@ -26,7 +26,7 @@ /** * A base class for a plugin that provides access to the shell and io variables. This is a good class to extend * from if the plugin needs to interact with the shell in some way, such as the case with those plugins that - * want to utilize the {@link com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor} and may need access to those + * want to utilize the {@link org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor} and may need access to those * shell and io objects. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/Artifact.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/Artifact.java similarity index 98% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/Artifact.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/Artifact.java index 6d8724b2750..1614461034f 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/Artifact.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/Artifact.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java similarity index 95% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java index 209f3443113..daeedee1997 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; import java.util.Optional; /** * Those wanting to extend Gremlin can implement this interface to provide mapper imports and extension * methods to the language itself. Gremlin uses ServiceLoader to install plugins. It is necessary for - * projects to include a com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin file in META-INF/services of their + * projects to include a org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin file in META-INF/services of their * packaged project which includes the full class names of the implementations of this interface to install. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java index 34389fc0052..d85c7439a4c 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPluginException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; /** * Base exception for {@link GremlinPlugin}. diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java index f34a115bcfb..86dbcbc0bf4 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/IllegalEnvironmentException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; /** * An exception thrown when the environment variables passed via {@link PluginAcceptor#environment()} do not meet diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java similarity index 97% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java index 9c520d4f3e9..06453bb04c6 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; import javax.script.ScriptException; import java.util.Collections; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java similarity index 96% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java index 11b8ae543ae..7d872158736 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginInitializationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; /** * An exception that occurs as a result of plugin initialization, typically triggered by a bad evaluation in the diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java similarity index 86% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java index b0cae0a84a0..51066413533 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; import org.codehaus.groovy.tools.shell.Groovysh; @@ -35,7 +35,7 @@ public interface RemoteAcceptor extends Closeable { * to decide how additional arguments on the line should be treated after "connect". * * @return an object to display as output to the user - * @throws com.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with connecting + * @throws org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with connecting */ public Object connect(final List args) throws RemoteException; @@ -44,7 +44,7 @@ public interface RemoteAcceptor extends Closeable { * to decide how additional arguments on the line should be treated after "config". * * @return an object to display as output to the user - * @throws com.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with configuration + * @throws org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with configuration */ public Object configure(final List args) throws RemoteException; @@ -53,7 +53,7 @@ public interface RemoteAcceptor extends Closeable { * the line should be treated after "submit". * * @return an object to display as output to the user - * @throws com.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with submission + * @throws org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException if there is a problem with submission */ public Object submit(final List args) throws RemoteException; diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteException.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteException.java similarity index 89% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteException.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteException.java index 3e604ab5191..62efda5a5a9 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/RemoteException.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteException.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; /** * A mapper {@link Exception} to be thrown when there are problems with processing a command given to a - * {@link com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor}. The message provided to the exception will + * {@link org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor}. The message provided to the exception will * be displayed to the user in the Console. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java similarity index 93% rename from gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java rename to gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java index be88576ac71..912670da02d 100644 --- a/gremlin-groovy/src/main/java/com/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/SugarGremlinPlugin.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.groovy.plugin; +package org.apache.tinkerpop.gremlin.groovy.plugin; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-groovy/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/gremlin-groovy/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin deleted file mode 100644 index 2839dc0bc52..00000000000 --- a/gremlin-groovy/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +++ /dev/null @@ -1 +0,0 @@ -com.tinkerpop.gremlin.groovy.plugin.SugarGremlinPlugin \ No newline at end of file diff --git a/gremlin-groovy/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/gremlin-groovy/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin new file mode 100644 index 00000000000..75f65aefc14 --- /dev/null +++ b/gremlin-groovy/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin @@ -0,0 +1 @@ +org.apache.tinkerpop.gremlin.groovy.plugin.SugarGremlinPlugin \ No newline at end of file diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml index 9fc7bed7230..7e8122d283a 100644 --- a/gremlin-server/conf/gremlin-server-classic.yaml +++ b/gremlin-server/conf/gremlin-server-classic.yaml @@ -14,8 +14,8 @@ scriptEngines: { staticImports: [java.lang.Math.PI], scripts: [scripts/generate-classic.groovy]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} metrics: { slf4jReporter: {enabled: true, interval: 180000}} threadPoolBoss: 1 diff --git a/gremlin-server/conf/gremlin-server-min.yaml b/gremlin-server/conf/gremlin-server-min.yaml index 70a7c66a408..e62983bf3e1 100644 --- a/gremlin-server/conf/gremlin-server-min.yaml +++ b/gremlin-server/conf/gremlin-server-min.yaml @@ -12,8 +12,8 @@ scriptEngines: { gremlin-groovy: { imports: []}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } metrics: { slf4jReporter: {enabled: true, interval: 180000}} threadPoolBoss: 1 diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml index a85492d62b1..1de18318f6f 100644 --- a/gremlin-server/conf/gremlin-server-modern.yaml +++ b/gremlin-server/conf/gremlin-server-modern.yaml @@ -14,8 +14,8 @@ scriptEngines: { staticImports: [java.lang.Math.PI], scripts: [scripts/generate-modern.groovy]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} metrics: { slf4jReporter: {enabled: true, interval: 180000}} threadPoolBoss: 1 diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml index 11217268432..b6edde3a560 100644 --- a/gremlin-server/conf/gremlin-server-neo4j.yaml +++ b/gremlin-server/conf/gremlin-server-neo4j.yaml @@ -4,7 +4,7 @@ threadPoolWorker: 1 gremlinPool: 8 scriptEvaluationTimeout: 30000 serializedResponseTimeout: 30000 -channelizer: com.tinkerpop.gremlin.server.channel.WebSocketChannelizer +channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer graphs: { g: conf/neo4j-empty.properties} plugins: @@ -17,11 +17,11 @@ scriptEngines: { imports: [java.lang.Math], staticImports: [java.lang.Math.PI]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } processors: - - { className: com.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} + - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, diff --git a/gremlin-server/conf/gremlin-server-rest-modern.yaml b/gremlin-server/conf/gremlin-server-rest-modern.yaml index cbd2fb6ee6f..2a3b9d26984 100644 --- a/gremlin-server/conf/gremlin-server-rest-modern.yaml +++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml @@ -4,7 +4,7 @@ threadPoolWorker: 1 gremlinPool: 8 scriptEvaluationTimeout: 30000 serializedResponseTimeout: 30000 -channelizer: com.tinkerpop.gremlin.server.channel.HttpChannelizer +channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer graphs: { g: conf/tinkergraph-empty.properties} plugins: @@ -15,8 +15,8 @@ scriptEngines: { staticImports: [java.lang.Math.PI], scripts: [scripts/generate-modern.groovy]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } metrics: { slf4jReporter: {enabled: true, interval: 180000}} threadPoolBoss: 1 diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml index 51bf3eb3294..0abc154d3fe 100644 --- a/gremlin-server/conf/gremlin-server.yaml +++ b/gremlin-server/conf/gremlin-server.yaml @@ -4,7 +4,7 @@ threadPoolWorker: 1 gremlinPool: 8 scriptEvaluationTimeout: 30000 serializedResponseTimeout: 30000 -channelizer: com.tinkerpop.gremlin.server.channel.WebSocketChannelizer +channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer graphs: { g: conf/tinkergraph-empty.properties} plugins: @@ -17,12 +17,12 @@ scriptEngines: { imports: [java.lang.Math], staticImports: [java.lang.Math.PI]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }} + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } processors: - - { className: com.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} + - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, diff --git a/gremlin-server/conf/log4j-server.properties b/gremlin-server/conf/log4j-server.properties index 8bc52f47ad2..e9776bb253d 100644 --- a/gremlin-server/conf/log4j-server.properties +++ b/gremlin-server/conf/log4j-server.properties @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. log4j.rootLogger=INFO, stdout -log4j.logger.com.tinkerpop.gremlin.driver.Connection=OFF -log4j.logger.com.tinkerpop.gremlin.driver.ConnectionPool=OFF +log4j.logger.org.apache.tinkerpop.gremlin.driver.Connection=OFF +log4j.logger.org.apache.tinkerpop.gremlin.driver.ConnectionPool=OFF log4j.appender.stdout=org.apache.log4j.ConsoleAppender #log4j.appender.stdout=org.apache.log4j.FileAppender #log4j.appender.stdout.file=recless.log diff --git a/gremlin-server/conf/neo4j-empty.properties b/gremlin-server/conf/neo4j-empty.properties index 5e05e60da41..df1267b44f0 100644 --- a/gremlin-server/conf/neo4j-empty.properties +++ b/gremlin-server/conf/neo4j-empty.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -gremlin.graph=com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph +gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph gremlin.neo4j.directory=/tmp/neo4j gremlin.neo4j.conf.node_auto_indexing=true gremlin.neo4j.conf.relationship_auto_indexing=true \ No newline at end of file diff --git a/gremlin-server/conf/tinkergraph-empty.properties b/gremlin-server/conf/tinkergraph-empty.properties index 97a9d99c77e..020921a6a8d 100644 --- a/gremlin-server/conf/tinkergraph-empty.properties +++ b/gremlin-server/conf/tinkergraph-empty.properties @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -gremlin.graph=com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph \ No newline at end of file +gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph \ No newline at end of file diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index 4df03261b71..bfe02ddded6 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,17 +27,17 @@ limitations under the License. Gremlin Server: Gremlin on the Server - com.tinkerpop + org.apache.tinkerpop tinkergraph-gremlin ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-driver ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} @@ -61,13 +61,13 @@ limitations under the License. - com.tinkerpop + org.apache.tinkerpop gremlin-test ${project.version} test - com.tinkerpop + org.apache.tinkerpop neo4j-gremlin ${project.version} test @@ -137,7 +137,7 @@ limitations under the License. warn - com.tinkerpop.gremlin.server.GremlinServer + org.apache.tinkerpop.gremlin.server.GremlinServer diff --git a/gremlin-server/src/main/bin/gremlin-server.bat b/gremlin-server/src/main/bin/gremlin-server.bat index 988a3f3e177..f69e8154545 100644 --- a/gremlin-server/src/main/bin/gremlin-server.bat +++ b/gremlin-server/src/main/bin/gremlin-server.bat @@ -24,7 +24,7 @@ if "%1" == "-i" goto install :server :: Launch the application -java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; com.tinkerpop.gremlin.server.GremlinServer %* +java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.GremlinServer %* :install @@ -38,4 +38,4 @@ goto loop1 :after_loop -java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; com.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR% \ No newline at end of file +java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR% \ No newline at end of file diff --git a/gremlin-server/src/main/bin/gremlin-server.sh b/gremlin-server/src/main/bin/gremlin-server.sh index 5864978f2bb..9c79daff211 100755 --- a/gremlin-server/src/main/bin/gremlin-server.sh +++ b/gremlin-server/src/main/bin/gremlin-server.sh @@ -57,7 +57,7 @@ fi # Execute the application and return its exit code if [ "$1" = "-i" ]; then shift - exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS -cp $CP:$CLASSPATH com.tinkerpop.gremlin.server.util.GremlinServerInstall "$@" + exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS -cp $CP:$CLASSPATH org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall "$@" else - exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS -cp $CP:$CLASSPATH com.tinkerpop.gremlin.server.GremlinServer "$@" + exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS -cp $CP:$CLASSPATH org.apache.tinkerpop.gremlin.server.GremlinServer "$@" fi \ No newline at end of file diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java similarity index 94% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/AbstractChannelizer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java index c1e327c68f1..c535c8df669 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/AbstractChannelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java @@ -16,18 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.handler.IteratorHandler; -import com.tinkerpop.gremlin.server.handler.OpExecutorHandler; -import com.tinkerpop.gremlin.server.handler.OpSelectorHandler; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.handler.IteratorHandler; +import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler; +import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.ssl.SslHandler; -import io.netty.util.concurrent.EventExecutorGroup; import org.javatuples.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +52,8 @@ * Gremlin scripts). *
* Implementers need only worry about determining how incoming data is converted to a - * {@link com.tinkerpop.gremlin.driver.message.RequestMessage} and outgoing data is converted from a - * {@link com.tinkerpop.gremlin.driver.message.ResponseMessage} to whatever expected format is needed by the pipeline. + * {@link org.apache.tinkerpop.gremlin.driver.message.RequestMessage} and outgoing data is converted from a + * {@link org.apache.tinkerpop.gremlin.driver.message.ResponseMessage} to whatever expected format is needed by the pipeline. * * @author Stephen Mallette (http://stephen.genoprime.com) */ diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Channelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java similarity index 89% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Channelizer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java index 4b4b7002bca..7cc65379b8b 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Channelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; import io.netty.channel.ChannelHandler; -import io.netty.util.concurrent.EventExecutorGroup; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; @@ -31,7 +30,7 @@ * configured in Gremlin Server with the {@code channelizer} setting in the configuration file. * * @author Stephen Mallette (http://stephen.genoprime.com) - * @see com.tinkerpop.gremlin.server.AbstractChannelizer + * @see org.apache.tinkerpop.gremlin.server.AbstractChannelizer */ public interface Channelizer extends ChannelHandler { diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Context.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java similarity index 90% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Context.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java index 9cffc9695ef..575c2c5ebc7 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Context.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; import io.netty.channel.ChannelHandlerContext; import java.util.concurrent.ScheduledExecutorService; @@ -75,7 +75,7 @@ public Settings getSettings() { } /** - * Gets the set of {@link com.tinkerpop.gremlin.structure.Graph} objects configured in Gremlin Server. + * Gets the set of {@link org.apache.tinkerpop.gremlin.structure.Graph} objects configured in Gremlin Server. */ public Graphs getGraphs() { return graphs; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Graphs.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java similarity index 90% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Graphs.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java index 9126e159898..971d48e70b1 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Graphs.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,7 +75,7 @@ public Bindings getGraphsAsBindings() { } /** - * Rollback transactions across all {@link com.tinkerpop.gremlin.structure.Graph} objects. + * Rollback transactions across all {@link org.apache.tinkerpop.gremlin.structure.Graph} objects. */ public void rollbackAll() { graphs.entrySet().forEach(e -> { @@ -86,7 +86,7 @@ public void rollbackAll() { } /** - * Commit transactions across all {@link com.tinkerpop.gremlin.structure.Graph} objects. + * Commit transactions across all {@link org.apache.tinkerpop.gremlin.structure.Graph} objects. */ public void commitAll() { graphs.entrySet().forEach(e -> { diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java similarity index 98% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/GremlinServer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java index c3f96708127..b2a4c222523 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/GremlinServer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.util.MetricManager; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.structure.Graph; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.Channel; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/OpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java similarity index 89% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/OpProcessor.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java index 9a61fa47ccd..57e560d9f43 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/OpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; /** * Interface for providing commands that websocket requests will respond to. diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java similarity index 97% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Settings.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java index e1a60950aca..ce28d37fdf7 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/Settings.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.server.channel.WebSocketChannelizer; +import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer; import info.ganglia.gmetric4j.gmetric.GMetric; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; @@ -146,7 +146,7 @@ public class Settings { public ServerMetrics metrics = null; /** - * {@link Map} of {@link com.tinkerpop.gremlin.structure.Graph} objects keyed by their binding name. + * {@link Map} of {@link org.apache.tinkerpop.gremlin.structure.Graph} objects keyed by their binding name. */ public Map graphs; @@ -157,7 +157,7 @@ public class Settings { public Map scriptEngines; /** - * List of {@link com.tinkerpop.gremlin.driver.MessageSerializer} to configure. + * List of {@link org.apache.tinkerpop.gremlin.driver.MessageSerializer} to configure. */ public List serializers; @@ -173,7 +173,7 @@ public class Settings { public List plugins = new ArrayList<>(); /** - * Custom settings for {@link com.tinkerpop.gremlin.server.OpProcessor} implementations. + * Custom settings for {@link org.apache.tinkerpop.gremlin.server.OpProcessor} implementations. */ public List processors = new ArrayList<>(); diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/HttpChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java similarity index 81% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/HttpChannelizer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java index adf6c7e1b0f..cd8649b5b8f 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/HttpChannelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java @@ -16,21 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.channel; +package org.apache.tinkerpop.gremlin.server.channel; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.AbstractChannelizer; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.AbstractChannelizer; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler; import io.netty.channel.ChannelPipeline; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; -import io.netty.util.concurrent.DefaultEventExecutorGroup; -import io.netty.util.concurrent.EventExecutorGroup; -import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +35,7 @@ import java.util.concurrent.ScheduledExecutorService; /** - * Constructs a {@link com.tinkerpop.gremlin.server.Channelizer} that exposes an HTTP/REST endpoint in Gremlin Server. + * Constructs a {@link org.apache.tinkerpop.gremlin.server.Channelizer} that exposes an HTTP/REST endpoint in Gremlin Server. * * @author Stephen Mallette (http://stephen.genoprime.com) */ diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/NioChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/NioChannelizer.java similarity index 80% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/NioChannelizer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/NioChannelizer.java index ca23af5b26c..1ac8e7e656d 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/NioChannelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/NioChannelizer.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.channel; +package org.apache.tinkerpop.gremlin.server.channel; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.AbstractChannelizer; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.handler.NioGremlinBinaryRequestDecoder; -import com.tinkerpop.gremlin.server.handler.NioGremlinResponseEncoder; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.AbstractChannelizer; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.handler.NioGremlinBinaryRequestDecoder; +import org.apache.tinkerpop.gremlin.server.handler.NioGremlinResponseEncoder; import io.netty.channel.ChannelPipeline; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; @@ -34,7 +34,7 @@ import java.util.concurrent.ScheduledExecutorService; /** - * A {@link com.tinkerpop.gremlin.server.Channelizer} that exposes an NIO-based Gremlin endpoint with a custom + * A {@link org.apache.tinkerpop.gremlin.server.Channelizer} that exposes an NIO-based Gremlin endpoint with a custom * protocol. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java similarity index 87% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java index 737c5f03c77..992fa554fd9 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.channel; +package org.apache.tinkerpop.gremlin.server.channel; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.AbstractChannelizer; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.handler.WsGremlinBinaryRequestDecoder; -import com.tinkerpop.gremlin.server.handler.WsGremlinResponseEncoder; -import com.tinkerpop.gremlin.server.handler.WsGremlinTextRequestDecoder; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.AbstractChannelizer; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.handler.WsGremlinBinaryRequestDecoder; +import org.apache.tinkerpop.gremlin.server.handler.WsGremlinResponseEncoder; +import org.apache.tinkerpop.gremlin.server.handler.WsGremlinTextRequestDecoder; import io.netty.channel.ChannelPipeline; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestDecoder; @@ -39,7 +39,7 @@ import java.util.concurrent.ScheduledExecutorService; /** - * A {@link com.tinkerpop.gremlin.server.Channelizer} that exposes a WebSocket-based Gremlin endpoint with a custom + * A {@link org.apache.tinkerpop.gremlin.server.Channelizer} that exposes a WebSocket-based Gremlin endpoint with a custom * sub-protocol. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java similarity index 95% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java index 1056d1a15cd..9116195793b 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; @@ -24,16 +24,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.util.MetricManager; -import com.tinkerpop.gremlin.util.function.FunctionUtils; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/IteratorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/IteratorHandler.java similarity index 93% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/IteratorHandler.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/IteratorHandler.java index d800efcfa5a..cdb79754dde 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/IteratorHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/IteratorHandler.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.server.Settings; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java similarity index 91% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java index 4e48136c79c..72b88a7ab53 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinBinaryRequestDecoder.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.SerializationException; -import com.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.SerializationException; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java similarity index 92% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java index c991c3a917a..9670216f0da 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; import com.codahale.metrics.Meter; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpExecutorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java similarity index 85% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpExecutorHandler.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java index 6c6ac905483..2a042ca9ade 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpExecutorHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java similarity index 82% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpSelectorHandler.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java index cf87358525e..dca348a13fb 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/OpSelectorHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; import com.codahale.metrics.Meter; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.OpProcessor; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.op.OpLoader; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.OpProcessor; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.op.OpLoader; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/StateKey.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java similarity index 87% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/StateKey.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java index cd2e5ed3745..bfddd9f6439 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/StateKey.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.server.op.session.Session; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.server.op.session.Session; import io.netty.util.AttributeKey; /** diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java similarity index 92% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java index 00c32c38276..8fe8cc4e4d6 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.SerializationException; -import com.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.SerializationException; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java similarity index 92% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java index 1568afdab5a..59673110d50 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; import com.codahale.metrics.Meter; -import com.tinkerpop.gremlin.driver.MessageSerializer; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.op.session.Session; -import com.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.driver.MessageSerializer; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.op.session.Session; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java similarity index 86% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java index cb96dcf3ba6..37b0dd128da 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.handler; +package org.apache.tinkerpop.gremlin.server.handler; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.ser.MessageTextSerializer; -import com.tinkerpop.gremlin.driver.ser.SerializationException; -import com.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer; +import org.apache.tinkerpop.gremlin.driver.ser.SerializationException; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java similarity index 90% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java index 8433d43dd7a..3131593f2f1 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op; +package org.apache.tinkerpop.gremlin.server.op; import com.codahale.metrics.Timer; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.OpProcessor; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.util.MetricManager; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.OpProcessor; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import io.netty.channel.ChannelHandlerContext; import org.apache.commons.lang.time.StopWatch; import org.slf4j.Logger; @@ -52,7 +52,7 @@ import static com.codahale.metrics.MetricRegistry.name; /** - * A base {@link com.tinkerpop.gremlin.server.OpProcessor} implementation that helps with operations that deal + * A base {@link org.apache.tinkerpop.gremlin.server.OpProcessor} implementation that helps with operations that deal * with script evaluation functions. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpLoader.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java similarity index 91% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpLoader.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java index f2698c553c3..166aeade89c 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpLoader.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op; +package org.apache.tinkerpop.gremlin.server.op; -import com.tinkerpop.gremlin.server.OpProcessor; -import com.tinkerpop.gremlin.server.op.standard.StandardOpProcessor; +import org.apache.tinkerpop.gremlin.server.OpProcessor; +import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpProcessorException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java similarity index 91% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpProcessorException.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java index 2bc2dfa98f9..a6ec2025bba 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/OpProcessorException.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op; +package org.apache.tinkerpop.gremlin.server.op; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java similarity index 91% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java index 1453fb59e5d..db57c8c0838 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOpProcessor.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.control; +package org.apache.tinkerpop.gremlin.server.op.control; import com.codahale.metrics.Meter; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.OpProcessor; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.server.util.MetricManager; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.OpProcessor; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOps.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOps.java similarity index 89% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOps.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOps.java index c408a0d2a60..d015861fa90 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/control/ControlOps.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/control/ControlOps.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.control; +package org.apache.tinkerpop.gremlin.server.op.control; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.groovy.engine.ScriptEngines; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.util.Gremlin; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.groovy.engine.ScriptEngines; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.util.Gremlin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/Session.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java similarity index 95% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/Session.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java index 89391357dd7..6ff41b539f6 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/Session.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.session; +package org.apache.tinkerpop.gremlin.server.op.session; -import com.tinkerpop.gremlin.groovy.engine.GremlinExecutor; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.Graphs; -import com.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.Graphs; +import org.apache.tinkerpop.gremlin.server.Settings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java similarity index 77% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java index 0566f425b08..8c5dc1ed5c3 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.session; +package org.apache.tinkerpop.gremlin.server.op.session; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.Settings; -import com.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.Settings; +import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; import java.util.HashMap; import java.util.Optional; /** - * Simple {@link com.tinkerpop.gremlin.server.OpProcessor} implementation that handles {@code ScriptEngine} + * Simple {@link org.apache.tinkerpop.gremlin.server.OpProcessor} implementation that handles {@code ScriptEngine} * script evaluation in the context of a session. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOps.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOps.java similarity index 85% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOps.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOps.java index f24aad8332c..fe54d21bc69 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/session/SessionOps.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOps.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.session; +package org.apache.tinkerpop.gremlin.server.op.session; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.GremlinServer; -import com.tinkerpop.gremlin.server.handler.StateKey; -import com.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; -import com.tinkerpop.gremlin.server.op.OpProcessorException; -import com.tinkerpop.gremlin.server.util.MetricManager; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.GremlinServer; +import org.apache.tinkerpop.gremlin.server.handler.StateKey; +import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.server.util.MetricManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java similarity index 81% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java index 6094f9dbcf1..4cadbc6f305 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.standard; +package org.apache.tinkerpop.gremlin.server.op.standard; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.OpProcessor; -import com.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.OpProcessor; +import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; /** * Simple {@link OpProcessor} implementation that handles {@code ScriptEngine} script evaluation outside the context diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOps.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOps.java similarity index 83% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOps.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOps.java index 9410288f892..10803e3e476 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/op/standard/StandardOps.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOps.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.op.standard; +package org.apache.tinkerpop.gremlin.server.op.standard; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.server.Context; -import com.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; -import com.tinkerpop.gremlin.server.op.OpProcessorException; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.server.Context; +import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor; +import org.apache.tinkerpop.gremlin.server.op.OpProcessorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/GremlinServerInstall.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java similarity index 91% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/GremlinServerInstall.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java index 8a6b4af9e0c..03317d340f4 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/GremlinServerInstall.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.util; +package org.apache.tinkerpop.gremlin.server.util; -import com.tinkerpop.gremlin.groovy.plugin.Artifact; -import com.tinkerpop.gremlin.groovy.util.DependencyGrabber; +import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact; +import org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber; import groovy.lang.GroovyClassLoader; /** diff --git a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/MetricManager.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/MetricManager.java similarity index 99% rename from gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/MetricManager.java rename to gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/MetricManager.java index c338047db56..2867aa752d6 100644 --- a/gremlin-server/src/main/java/com/tinkerpop/gremlin/server/util/MetricManager.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/MetricManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.util; +package org.apache.tinkerpop.gremlin.server.util; import com.codahale.metrics.ConsoleReporter; import com.codahale.metrics.Counter; diff --git a/gremlin-server/src/main/resources/META-INF/services/com.tinkerpop.gremlin.server.OpProcessor b/gremlin-server/src/main/resources/META-INF/services/com.tinkerpop.gremlin.server.OpProcessor deleted file mode 100644 index 700e224c62a..00000000000 --- a/gremlin-server/src/main/resources/META-INF/services/com.tinkerpop.gremlin.server.OpProcessor +++ /dev/null @@ -1,3 +0,0 @@ -com.tinkerpop.gremlin.server.op.standard.StandardOpProcessor -com.tinkerpop.gremlin.server.op.control.ControlOpProcessor -com.tinkerpop.gremlin.server.op.session.SessionOpProcessor \ No newline at end of file diff --git a/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor b/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor new file mode 100644 index 00000000000..64ba6f3b87e --- /dev/null +++ b/gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor @@ -0,0 +1,3 @@ +org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor +org.apache.tinkerpop.gremlin.server.op.control.ControlOpProcessor +org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor \ No newline at end of file diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java similarity index 98% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java index a5ff82186c1..41bdd306f98 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; import org.junit.After; import org.junit.Before; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java similarity index 98% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java index 9aa49a8dc9b..363e0919b06 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GraphsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java similarity index 90% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GraphsTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java index 9b3e4fb75e7..0e0634523c7 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GraphsTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.Ignore; import org.junit.Test; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java similarity index 93% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java index 31f113c3429..765ad2837e9 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; @@ -24,10 +24,10 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.Result; -import com.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.Result; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java similarity index 95% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java index 45a0c10a740..3755792d861 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; - -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.Result; -import com.tinkerpop.gremlin.driver.ResultSet; -import com.tinkerpop.gremlin.driver.exception.ResponseException; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer; -import com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import com.tinkerpop.gremlin.util.TimeUtil; +package org.apache.tinkerpop.gremlin.server; + +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.Result; +import org.apache.tinkerpop.gremlin.driver.ResultSet; +import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer; +import org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.util.TimeUtil; import groovy.json.JsonBuilder; import org.junit.Rule; import org.junit.Test; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java similarity index 99% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java index 9f5ceb1d879..b560bf332f8 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tinkerpop.gremlin.server.channel.HttpChannelizer; +import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer; import org.apache.http.Consts; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java similarity index 93% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index fbe56e8ddf8..379b44e2012 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; - -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.ResultSet; -import com.tinkerpop.gremlin.driver.Tokens; -import com.tinkerpop.gremlin.driver.exception.ResponseException; -import com.tinkerpop.gremlin.driver.message.RequestMessage; -import com.tinkerpop.gremlin.driver.message.ResponseStatusCode; -import com.tinkerpop.gremlin.driver.ser.Serializers; -import com.tinkerpop.gremlin.driver.simple.NioClient; -import com.tinkerpop.gremlin.driver.simple.SimpleClient; -import com.tinkerpop.gremlin.driver.simple.WebSocketClient; -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.server.channel.NioChannelizer; -import com.tinkerpop.gremlin.server.op.session.SessionOpProcessor; +package org.apache.tinkerpop.gremlin.server; + +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.ResultSet; +import org.apache.tinkerpop.gremlin.driver.Tokens; +import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; +import org.apache.tinkerpop.gremlin.driver.message.RequestMessage; +import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode; +import org.apache.tinkerpop.gremlin.driver.ser.Serializers; +import org.apache.tinkerpop.gremlin.driver.simple.NioClient; +import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient; +import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient; +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer; +import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; diff --git a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java similarity index 95% rename from gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java index 03d48c590bd..a29208dc157 100644 --- a/gremlin-server/src/test/java/com/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server; +package org.apache.tinkerpop.gremlin.server; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; @@ -24,9 +24,9 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import com.tinkerpop.gremlin.driver.Client; -import com.tinkerpop.gremlin.driver.Cluster; -import com.tinkerpop.gremlin.driver.ResultSet; +import org.apache.tinkerpop.gremlin.driver.Client; +import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.apache.tinkerpop.gremlin.driver.ResultSet; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml similarity index 63% rename from gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml rename to gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml index cdcb0623ea0..ce8c5dc61e4 100644 --- a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml +++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml @@ -17,12 +17,12 @@ scriptEngines: { imports: [java.lang.Math], staticImports: [java.lang.Math.PI]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;com.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer]}} - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true}} - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer]}} + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true}} + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } processors: - - { className: com.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} + - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, diff --git a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml similarity index 74% rename from gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml rename to gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml index 04904406f0b..215fc1b197c 100644 --- a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml +++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml @@ -17,11 +17,11 @@ scriptEngines: { imports: [java.lang.Math], staticImports: [java.lang.Math.PI]}} serializers: - - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } - - { className: com.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 } + - { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 } processors: - - { className: com.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} + - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }} metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, diff --git a/gremlin-server/src/test/scala/com/tinkerpop/gremlin/server/simulation/GremlinServerAdditionSimulation.scala b/gremlin-server/src/test/scala/com/tinkerpop/gremlin/server/simulation/GremlinServerAdditionSimulation.scala index 49a469fc324..8a9f4c0b873 100644 --- a/gremlin-server/src/test/scala/com/tinkerpop/gremlin/server/simulation/GremlinServerAdditionSimulation.scala +++ b/gremlin-server/src/test/scala/com/tinkerpop/gremlin/server/simulation/GremlinServerAdditionSimulation.scala @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.server.simulation +package org.apache.tinkerpop.gremlin.server.simulation import io.gatling.core.Predef._ import scala.concurrent.duration._ @@ -26,7 +26,7 @@ import io.gatling.core.action.Chainable import akka.actor.Props import io.gatling.core.result.message.{KO, OK} import io.gatling.core.result.writer.{RequestMessage, DataWriter} -import com.tinkerpop.gremlin.driver.{Client, Cluster} +import org.apache.tinkerpop.gremlin.driver.{Client, Cluster} class GremlinServerAdditionSimulation extends Simulation { val host: String = System.getProperty("host", "localhost") diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml index 7fa359fecf0..c58f8fef3f3 100644 --- a/gremlin-test/pom.xml +++ b/gremlin-test/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,12 +27,12 @@ limitations under the License. Gremlin Test: Gremlin Structure and Process Test Suite - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-algorithm ${project.version} diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGraphProvider.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java index 9d8f949f1c3..15fb62901f9 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGraphProvider.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; @@ -38,7 +38,7 @@ public abstract class AbstractGraphProvider implements GraphProvider { /** - * Provides a basic configuration for a particular {@link com.tinkerpop.gremlin.structure.Graph} instance and used + * Provides a basic configuration for a particular {@link org.apache.tinkerpop.gremlin.structure.Graph} instance and used * the {@code graphName} to ensure that the instance is unique. It is up to the Gremlin implementation * to determine how best to use the {@code graphName} to ensure uniqueness. For example, Neo4j, might use the * {@code graphName} might be used to create a different sub-directory where the graph is stored. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java index 00cb14469e9..c3ed4cd38e8 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; - -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +package org.apache.tinkerpop.gremlin; + +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.commons.configuration.Configuration; import org.javatuples.Pair; import org.junit.runner.Description; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java index 2f6f35f4807..7373c95f0b1 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; - -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin; + +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.Configuration; import org.junit.After; import org.junit.Before; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverage.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverage.java similarity index 98% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverage.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverage.java index 6d6e629f0e8..446c9edfd9b 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverage.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverageSet.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverageSet.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverageSet.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverageSet.java index 525aff0dbc8..3bd1da56a42 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/ExceptionCoverageSet.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/ExceptionCoverageSet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirement.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirement.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirement.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirement.java index f295990fa04..01852c55831 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirement.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirement.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirementSet.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirementSet.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirementSet.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirementSet.java index ca2ea177168..a5ac6935e94 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirementSet.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirementSet.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -30,8 +30,8 @@ /** * Logically grouped features used to simplify test annotations. This annotation can be used in conjunction - * with {@link com.tinkerpop.gremlin.FeatureRequirement} and features automatically added by - * {@link com.tinkerpop.gremlin.LoadGraphWith}. + * with {@link org.apache.tinkerpop.gremlin.FeatureRequirement} and features automatically added by + * {@link org.apache.tinkerpop.gremlin.LoadGraphWith}. * * @author Stephen Mallette (http://stephen.genoprime.com) */ diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirements.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirements.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirements.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirements.java index f84a834088b..dc9106cafcb 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/FeatureRequirements.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/FeatureRequirements.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphManager.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphManager.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java index 6b591517277..50b0ac57721 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphManager.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; /** * Holds the GraphProvider specified by the implementer using the StructureSuite. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java similarity index 79% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphProvider.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java index 93c1806d895..36714f81bcf 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/GraphProvider.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.traverser.B_O_Traverser; -import com.tinkerpop.gremlin.process.traverser.O_Traverser; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.strategy.GraphStrategy; -import com.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_Traverser; +import org.apache.tinkerpop.gremlin.process.traverser.O_Traverser; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy; +import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; import org.apache.commons.configuration.Configuration; import java.util.Collections; @@ -73,7 +73,7 @@ public interface GraphProvider { }}; /** - * Creates a new {@link com.tinkerpop.gremlin.structure.Graph} instance using the default + * Creates a new {@link org.apache.tinkerpop.gremlin.structure.Graph} instance using the default * {@link org.apache.commons.configuration.Configuration} from {@link #standardGraphConfiguration(Class, String)}. * The default implementation converts the passes the */ @@ -82,8 +82,8 @@ default public Graph standardTestGraph(final Class test, final String testMet } /** - * Creates a new {@link com.tinkerpop.gremlin.structure.Graph} instance from the Configuration object using - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. The assumption here is that the {@code Configuration} + * Creates a new {@link org.apache.tinkerpop.gremlin.structure.Graph} instance from the Configuration object using + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. The assumption here is that the {@code Configuration} * has been created by one of the {@link #newGraphConfiguration(String, Class, String)} methods and has therefore * already been modified by the implementation as necessary for {@link Graph} creation. */ @@ -92,8 +92,8 @@ default public Graph openTestGraph(final Configuration config) { } /** - * Creates a new {@link com.tinkerpop.gremlin.structure.Graph} instance from the Configuration object using - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. The assumption here is that the {@code Configuration} + * Creates a new {@link org.apache.tinkerpop.gremlin.structure.Graph} instance from the Configuration object using + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. The assumption here is that the {@code Configuration} * has been created by one of the {@link #newGraphConfiguration(String, Class, String)} methods and has therefore * already been modified by the implementation as necessary for {@link Graph} creation. */ @@ -103,10 +103,10 @@ default public Graph openTestGraph(final Configuration config, final GraphStrate } /** - * Gets the {@link org.apache.commons.configuration.Configuration} object that can construct a {@link com.tinkerpop.gremlin.structure.Graph} instance from {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. - * Note that this method should create a {@link com.tinkerpop.gremlin.structure.Graph} using the {@code graphName} of "standard", meaning it - * should always return a configuration instance that generates the same {@link com.tinkerpop.gremlin.structure.Graph} from the - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. + * Gets the {@link org.apache.commons.configuration.Configuration} object that can construct a {@link org.apache.tinkerpop.gremlin.structure.Graph} instance from {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. + * Note that this method should create a {@link org.apache.tinkerpop.gremlin.structure.Graph} using the {@code graphName} of "standard", meaning it + * should always return a configuration instance that generates the same {@link org.apache.tinkerpop.gremlin.structure.Graph} from the + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. */ default public Configuration standardGraphConfiguration(final Class test, final String testMethodName) { return newGraphConfiguration("standard", test, testMethodName, Collections.emptyMap()); @@ -115,7 +115,7 @@ default public Configuration standardGraphConfiguration(final Class test, fin /** * If possible (usually with persisted graph) clear the space on disk given the configuration that would be used * to construct the graph. The default implementation simply calls - * {@link #clear(com.tinkerpop.gremlin.structure.Graph, org.apache.commons.configuration.Configuration)} with + * {@link #clear(org.apache.tinkerpop.gremlin.structure.Graph, org.apache.commons.configuration.Configuration)} with * a null graph argument. */ public default void clear(final Configuration configuration) throws Exception { @@ -123,7 +123,7 @@ public default void clear(final Configuration configuration) throws Exception { } /** - * Clears a {@link com.tinkerpop.gremlin.structure.Graph} of all data and settings. Implementations will have + * Clears a {@link org.apache.tinkerpop.gremlin.structure.Graph} of all data and settings. Implementations will have * different ways of handling this. For a brute force approach, implementers can simply delete data directories * provided in the configuration. Implementers may choose a more elegant approach if it exists. *
@@ -180,7 +180,7 @@ default public Configuration newGraphConfiguration(final String graphName, } /** - * Tests are annotated with a {@link com.tinkerpop.gremlin.LoadGraphWith} annotation. These annotations tell + * Tests are annotated with a {@link org.apache.tinkerpop.gremlin.LoadGraphWith} annotation. These annotations tell * the test what kind of data to preload into the graph instance. It is up to the implementation to load the * graph with the data specified by that annotation. This method also represents the place where indices should * be configured according the the {@link Graph} implementation's API. Implementers can use the {@code testClass} @@ -197,9 +197,9 @@ default public Configuration newGraphConfiguration(final String graphName, /** * Converts the GraphSON representation of an identifier to the implementation's representation of an identifier. * When serializing a mapper identifier type to GraphSON an implementer will typically specify a mapper serializer - * in {@link com.tinkerpop.gremlin.structure.Graph.Io}. That will serialize the identifier to a GraphSON representation. + * in {@link org.apache.tinkerpop.gremlin.structure.Graph.Io}. That will serialize the identifier to a GraphSON representation. * When the GraphSON is deserialized, the identifier is written to an - * {@link com.tinkerpop.gremlin.structure.util.detached.Attachable} object where it is passed to a user supplied + * {@link org.apache.tinkerpop.gremlin.structure.util.detached.Attachable} object where it is passed to a user supplied * conversion {@link java.util.function.Function} that ultimately processes it. It is in this conversion process * that vendor specific identifier conversion would occur (if desired). This method mimics that conversion by * providing the mechanism that a test can use to do the conversion. @@ -226,9 +226,9 @@ public default ID reconstituteGraphSONIdentifier(final Class{@link Graph.Variables} *
  • {@link Graph.Iterators}
    • *
  • {@link GraphTraversal}
    • - *
  • {@link com.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser}
    • + *
  • {@link org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser}
    • *
  • {@link Property}
    • - *
  • {@link com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser}
    • + *
  • {@link org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser}
    • *
  • {@link Traversal}
    • *
  • {@link Traverser}
    • *
  • {@link Vertex}
    • diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/LoadGraphWith.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java similarity index 87% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/LoadGraphWith.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java index d847acb984e..20e6f8ef53c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/LoadGraphWith.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -30,9 +30,9 @@ import java.util.ArrayList; import java.util.List; -import static com.tinkerpop.gremlin.structure.Graph.Features.DataTypeFeatures.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.DataTypeFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES; /** * Annotations to define a graph example to load from test resources prior to test execution. This annotation is @@ -44,7 +44,7 @@ * data contains for the test to be executed. *
    * If a graph implementation is "read-only", it can override the - * {@link GraphProvider#loadGraphData(com.tinkerpop.gremlin.structure.Graph, LoadGraphWith, Class, String)} method + * {@link GraphProvider#loadGraphData(org.apache.tinkerpop.gremlin.structure.Graph, LoadGraphWith, Class, String)} method * to provide some other mechanism for making that data available to the graph in time for the test. See the * hadoop-gremlin implementation for more details. * @@ -69,7 +69,7 @@ public enum GraphData { MODERN, /** - * Load "The Crew" TinkerPop3 toy graph which includes {@link com.tinkerpop.gremlin.structure.VertexProperty} data. + * Load "The Crew" TinkerPop3 toy graph which includes {@link org.apache.tinkerpop.gremlin.structure.VertexProperty} data. */ CREW, @@ -135,7 +135,7 @@ public List featuresRequired() { } } - public static final String RESOURCE_PATH_PREFIX = "/com/tinkerpop/gremlin/structure/io/kryo/"; + public static final String RESOURCE_PATH_PREFIX = "/org/apache/tinkerpop/gremlin/structure/io/kryo/"; /** * The name of the resource to load with full path. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/TestHelper.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java similarity index 99% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/TestHelper.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java index dc2f75a8c14..8c08fc44bf5 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/TestHelper.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin; +package org.apache.tinkerpop.gremlin; import java.io.File; import java.io.FileOutputStream; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java index 913a9f11737..c2b7a23f5cb 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; +package org.apache.tinkerpop.gremlin.algorithm.generator; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.javatuples.Triplet; import java.util.List; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java index 0fb8592c64b..eb58ecf2c2a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/CommunityGeneratorTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.algorithm.generator; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.Configuration; import org.junit.Test; import org.junit.experimental.runners.Enclosed; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java index 43b68f50b71..c904637434d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/DistributionGeneratorTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.algorithm.generator; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.algorithm.generator; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.Configuration; import org.junit.Test; import org.junit.experimental.runners.Enclosed; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java index d33bc4d0b95..c3c719eb65c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; import org.junit.Before; import java.util.ArrayList; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java similarity index 87% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessComputerSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java index 3d816432e2f..0fa51b2a381 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessComputerSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; - -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.process.computer.GraphComputerTest; -import com.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest; -import com.tinkerpop.gremlin.process.computer.util.ComputerDataStrategyTest; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest; +package org.apache.tinkerpop.gremlin.process; + +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest; +import org.apache.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest; +import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategyTest; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; @@ -37,8 +37,8 @@ /** * The {@code ProcessComputerStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a - * {@link com.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use - * by Gremlin implementers to test their {@link com.tinkerpop.gremlin.structure.Graph} implementations. The + * {@link org.apache.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use + * by Gremlin implementers to test their {@link org.apache.tinkerpop.gremlin.structure.Graph} implementations. The * {@code ProcessComputerStandardSuite} ensures consistency and validity of the implementations that they test. *

    * To use the {@code ProcessComputerStandardSuite} define a class in a test module. Simple naming would expect the @@ -50,8 +50,8 @@ * @ProcessComputerSuite.GraphProviderClass(TinkerGraphProcessComputerTest.class) public class TinkerGraphProcessComputerTest implements GraphProvider { * } * - * Implementing {@link com.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessComputerStandardSuite} - * to instantiate {@link com.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to + * Implementing {@link org.apache.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessComputerStandardSuite} + * to instantiate {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to * inject into tests in the suite. The {@code ProcessComputerStandardSuite} will utilized Features defined in the * suite to determine which tests will be executed. *
    diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessPerformanceSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java similarity index 77% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessPerformanceSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java index f49666885f3..61ee2b1c7c4 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessPerformanceSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java @@ -16,11 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.structure.GraphReadPerformanceTest; -import com.tinkerpop.gremlin.structure.GraphWritePerformanceTest; +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; @@ -31,7 +29,7 @@ *

    * To use the {@code ProcessPerformanceSuite} define a class in a test module. Simple naming would expect the name of * the implementation followed by "ProcessPerformanceTest". This class should be annotated as follows (note that - * the "Suite" implements {@link com.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in + * the "Suite" implements {@link org.apache.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in * a separate class file): * * @RunWith(ProcessPerformanceSuite.class) @@ -39,10 +37,10 @@ * public class TinkerGraphProcessPerformanceTest implements GraphProvider { * } * - * Implementing {@link com.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessPerformanceSuite} to - * instantiate {@link com.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject + * Implementing {@link org.apache.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessPerformanceSuite} to + * instantiate {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject * into tests in the suite. The {@code ProcessPerformanceSuite} will utilized - * {@link com.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be * executed. * * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java similarity index 83% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessStandardSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java index 96c4d349719..7b284502d37 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/ProcessStandardSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; - -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.process.graph.traversal.step.branch.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; -import com.tinkerpop.gremlin.process.graph.traversal.step.util.TraversalSideEffectsTest; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest; -import com.tinkerpop.gremlin.process.traversal.CoreTraversalTest; -import com.tinkerpop.gremlin.process.util.PathTest; +package org.apache.tinkerpop.gremlin.process; + +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.TraversalSideEffectsTest; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest; +import org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest; +import org.apache.tinkerpop.gremlin.process.util.PathTest; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; @@ -37,13 +37,13 @@ /** * The {@code ProcessStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a - * {@link com.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use - * by Gremlin implementers to test their {@link com.tinkerpop.gremlin.structure.Graph} implementations. The + * {@link org.apache.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use + * by Gremlin implementers to test their {@link org.apache.tinkerpop.gremlin.structure.Graph} implementations. The * {@code ProcessStandardSuite} ensures consistency and validity of the implementations that they test. *

    * To use the {@code ProcessStandardSuite} define a class in a test module. Simple naming would expect the name of the * implementation followed by "ProcessStandardSuite". This class should be annotated as follows (note that the "Suite" - * implements {@link com.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in a + * implements {@link org.apache.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in a * separate class file): *

    * @@ -52,10 +52,10 @@ * } * *

    - * Implementing {@link com.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessStandardSuite} to - * instantiate {@link com.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject + * Implementing {@link org.apache.tinkerpop.gremlin.GraphProvider} provides a way for the {@code ProcessStandardSuite} to + * instantiate {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject * into tests in the suite. The ProcessStandardSuite will utilized - * {@link com.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be executed. + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be executed. *
    * * @author Stephen Mallette (http://stephen.genoprime.com) @@ -101,7 +101,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite { MeanTest.StandardTest.class, MinTest.StandardTest.class, OrderTest.StandardTest.class, - com.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest.StandardTest.class, + org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest.StandardTest.class, PropertiesTest.StandardTest.class, SelectTest.StandardTest.class, VertexTest.StandardTest.class, @@ -175,7 +175,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite { MeanTest.class, MinTest.class, OrderTest.class, - com.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest.class, + org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest.class, SelectTest.class, VertexTest.class, UnfoldTest.class, diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/TraversalPerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/TraversalPerformanceTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java index e0edb34ff2f..2299d3ee84b 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/TraversalPerformanceTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; @@ -24,13 +24,13 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; -import static com.tinkerpop.gremlin.process.graph.traversal.__.out; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out; /** * @author Stephen Mallette (http://stephen.genoprime.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputerTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java index fa5cace0144..9cd34bdc72a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/GraphComputerTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer; - -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.computer.lambda.LambdaMapReduce; -import com.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.computer; + +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaMapReduce; +import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.ArrayList; @@ -37,7 +37,7 @@ import java.util.Map; import java.util.concurrent.Future; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java similarity index 90% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java index 7bcdf3eb2b3..7fc333b2365 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.ranking; +package org.apache.tinkerpop.gremlin.process.computer.ranking; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java similarity index 90% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java index f777a09532b..b3fe822f799 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.computer.util; +package org.apache.tinkerpop.gremlin.process.computer.util; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.strategy.StrategyGraph; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraph; import org.junit.Test; import java.util.Arrays; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java similarity index 88% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java index d9a19222d96..0bbbd2fc447 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java index d6a12b17055..32ba4915e37 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java index 13ad2b837d7..2bbbf6890af 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Order; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java index 91e4af6c28e..0caaaef26d4 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.ArrayList; @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java index 836866c9dba..134f4013bc7 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.branch; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java similarity index 82% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java index baf4a39551e..7ac3bdf3fde 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; -import static com.tinkerpop.gremlin.structure.Compare.gt; -import static com.tinkerpop.gremlin.structure.Compare.gte; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.structure.Compare.gt; +import static org.apache.tinkerpop.gremlin.structure.Compare.gte; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java similarity index 88% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java index 62fb3fb0306..a2ce39c7025 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java index 2622924da67..47a099ee31f 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java index 21c988cc5dc..46eaaa09d1e 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.List; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java index e971e88290b..89909633b96 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.Arrays; @@ -33,8 +33,8 @@ import java.util.Set; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java index 6cdeec5610f..2803e643a26 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashSet; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java similarity index 86% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java index a7996eb569c..ed9f4f0615a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.List; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java index 39ce74ee086..ee01877bb96 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java @@ -16,27 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; import static org.junit.Assume.assumeTrue; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java index 07d8eeae98e..f96159f5db6 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java similarity index 80% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java index aeadc564a05..776aaae869c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.has; -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE; -import static com.tinkerpop.gremlin.structure.Compare.gt; -import static com.tinkerpop.gremlin.structure.Compare.gte; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.has; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE; +import static org.apache.tinkerpop.gremlin.structure.Compare.gt; +import static org.apache.tinkerpop.gremlin.structure.Compare.gte; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java index e078f6b0bc2..35b4beaa94d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java index bacaa5ff43a..3adcfbd7b76 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java similarity index 87% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java index 40046b8d45a..2b830c43a71 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java similarity index 86% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java index 456f9e32e21..960274a3c27 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java index 47403b83985..6e2d7cb7204 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.filter; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java index a3428df3934..f9a3e9513f1 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/BackTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; @@ -32,8 +32,8 @@ import java.util.Map; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java index 551f92f34c0..731e0f2c510 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.out; -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java index b40768bef0d..ae7f0b7cb1a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CountTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.out; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java similarity index 90% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java index 28f2bed20cc..8bc7a569eec 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/FoldTest.java @@ -16,20 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; -import org.junit.Ignore; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java index 98d636b0a2d..0e8a92ce67c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MapTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java index 18ace97684b..1af110a2613 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MatchTest.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.Bindings; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.CrossJoinEnumerator; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.Enumerator; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.InnerJoinEnumerator; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.IteratorEnumerator; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; -import com.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.Bindings; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.CrossJoinEnumerator; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.Enumerator; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.InnerJoinEnumerator; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.IteratorEnumerator; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep; +import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; @@ -49,10 +49,10 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.as; -import static com.tinkerpop.gremlin.process.graph.traversal.__.out; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.as; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java similarity index 84% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java index 592eb241374..d46eeae2503 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java similarity index 84% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java index e7d9762fd37..aec8eff23ac 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java similarity index 84% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java index 6102a64861b..007351d9843 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java index 63bdd6c5289..c04e87a67f0 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/OrderTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Scope; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Order; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Scope; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.Arrays; @@ -34,7 +34,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java index e2b65ce773d..e5a1e8f3a89 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashSet; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java similarity index 87% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java index 0ad91a66294..14b0fdf49aa 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PropertiesTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java index e4c4d8a2b40..9b37ed688a0 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SelectTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Order; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Order; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.values; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.values; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java index a25cbb27178..e5b0215b1ac 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/UnfoldTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashSet; @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java index b6fcd6feb23..d8d4af43c9c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/ValueMapTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java index 78dc11567e0..a613ac3b72c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/VertexTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.map; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.HashMap; @@ -35,7 +35,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java index e975f7dc313..70f99d45de7 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java index c4cebbb310a..92931e0bb03 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Collection; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.*; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java index 51e7d508f29..c1e45343f50 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.ArrayList; @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java index 60759c81d7c..a94e842bd80 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.ArrayList; @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java index ed83f4a627c..4762e8c3391 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.util.MapHelper; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.util.MapHelper; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java index cd586ccaac0..fab498bd6d6 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.Traverser; -import com.tinkerpop.gremlin.process.util.metric.Metrics; -import com.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.Traverser; +import org.apache.tinkerpop.gremlin.process.util.metric.Metrics; +import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; /** * @author Bob Briody (http://bobbriody.com) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java similarity index 90% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java index f5ed3276456..ac007c9c349 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Operator; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Operator; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java similarity index 90% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java index 5a7f9df58f8..5ae1bddaaf3 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java index 269b3f151ed..0d6c350bd1d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java similarity index 92% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java index 46b1418f53c..aeb441e4805 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java similarity index 85% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java index ec3b611da43..f1b272ea408 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphTest.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.commons.configuration.Configuration; import org.junit.Test; import java.util.Arrays; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES; -import static com.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_USER_SUPPLIED_IDS; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java index 860d107c6c6..0f7bcb66e15 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.util.Tree; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.util.Tree; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java similarity index 83% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java index b42e1a12a62..8cdd5785680 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/util/TraversalSideEffectsTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.TraversalSideEffects; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java index c92545ebdf8..3ed34450bad 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; import org.junit.Test; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.fail; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java similarity index 88% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java index 1f179f7ec95..5885544ee3b 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; - -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.util.BulkSet; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.process.traversal; + +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.util.BulkSet; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import java.util.Arrays; @@ -38,9 +38,9 @@ import java.util.Random; import java.util.Set; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java similarity index 85% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java index ca7438e691b..56dfa9d844f 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalTest.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.process.traversal; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversal; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.empty.EmptyGraph; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/util/PathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/util/PathTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/process/util/PathTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/util/PathTest.java index 15fa74027bb..0baceeec23e 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/util/PathTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/util/PathTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; +package org.apache.tinkerpop.gremlin.process.util; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.util.path.ImmutablePath; -import com.tinkerpop.gremlin.process.util.path.MutablePath; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.util.path.ImmutablePath; +import org.apache.tinkerpop.gremlin.process.util.path.MutablePath; import org.junit.Test; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import static com.tinkerpop.gremlin.process.graph.traversal.__.out; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/BatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/BatchTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java index 9a7552c4739..23b8d3f059f 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/BatchTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.util.batch.BatchGraph; -import com.tinkerpop.gremlin.structure.util.batch.Exists; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph; +import org.apache.tinkerpop.gremlin.structure.util.batch.Exists; import org.junit.Test; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/EdgeTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java index cb4ce7da051..6990f6aba06 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/EdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -36,7 +36,7 @@ import java.util.Set; import java.util.function.Consumer; -import static com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/FeatureSupportTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java index 512f6b3d345..aa10ce95d1f 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/FeatureSupportTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Before; import org.junit.Test; import org.junit.experimental.runners.Enclosed; @@ -39,10 +39,10 @@ import java.util.Date; import java.util.UUID; -import static com.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; import static org.junit.Assume.assumeThat; @@ -68,7 +68,7 @@ public void shouldHaveStandardToStringRepresentation() { } /** - * Feature checks that test {@link com.tinkerpop.gremlin.structure.Graph} functionality to determine if a feature should be on when it is marked + * Feature checks that test {@link org.apache.tinkerpop.gremlin.structure.Graph} functionality to determine if a feature should be on when it is marked * as not supported. */ @ExceptionCoverage(exceptionClass = Graph.Exceptions.class, methods = { @@ -90,8 +90,8 @@ public void shouldPrintTheFeatureList() { } /** - * A {@link com.tinkerpop.gremlin.structure.Graph} that does not support {@link com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures#FEATURE_COMPUTER} must call - * {@link com.tinkerpop.gremlin.structure.Graph.Exceptions#graphComputerNotSupported()}. + * A {@link org.apache.tinkerpop.gremlin.structure.Graph} that does not support {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures#FEATURE_COMPUTER} must call + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Exceptions#graphComputerNotSupported()}. */ @Test @FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_COMPUTER, supported = false) @@ -105,8 +105,8 @@ public void shouldSupportComputerIfAGraphCanCompute() throws Exception { } /** - * A {@link com.tinkerpop.gremlin.structure.Graph} that does not support {@link com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures#FEATURE_TRANSACTIONS} must call - * {@link com.tinkerpop.gremlin.structure.Graph.Exceptions#transactionsNotSupported()}. + * A {@link org.apache.tinkerpop.gremlin.structure.Graph} that does not support {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures#FEATURE_TRANSACTIONS} must call + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Exceptions#transactionsNotSupported()}. */ @Test @FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_TRANSACTIONS, supported = false) @@ -120,8 +120,8 @@ public void shouldSupportTransactionsIfAGraphConstructsATx() throws Exception { } /** - * A {@link com.tinkerpop.gremlin.structure.Graph} that does not support {@link com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures#FEATURE_VARIABLES} must call - * {@link com.tinkerpop.gremlin.structure.Graph.Exceptions#variablesNotSupported()}. + * A {@link org.apache.tinkerpop.gremlin.structure.Graph} that does not support {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures#FEATURE_VARIABLES} must call + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Exceptions#variablesNotSupported()}. */ @Test @FeatureRequirement(featureClass = Graph.Features.VariableFeatures.class, feature = FEATURE_VARIABLES, supported = false) @@ -148,7 +148,7 @@ public void shouldThrowOnThreadedTransactionNotSupported() { } /** - * Feature checks that test {@link com.tinkerpop.gremlin.structure.Vertex} functionality to determine if a feature + * Feature checks that test {@link org.apache.tinkerpop.gremlin.structure.Vertex} functionality to determine if a feature * should be on when it is marked as not supported. */ @ExceptionCoverage(exceptionClass = Vertex.Exceptions.class, methods = { @@ -317,7 +317,7 @@ public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exceptio } /** - * Feature checks that test {@link com.tinkerpop.gremlin.structure.Edge} functionality to determine if a feature + * Feature checks that test {@link org.apache.tinkerpop.gremlin.structure.Edge} functionality to determine if a feature * should be on when it is marked as not supported. */ @ExceptionCoverage(exceptionClass = Vertex.Exceptions.class, methods = { @@ -508,7 +508,7 @@ public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exceptio } /** - * Feature checks that test {@link com.tinkerpop.gremlin.structure.Element} {@link com.tinkerpop.gremlin.structure.Property} functionality to determine if a feature should be on + * Feature checks that test {@link org.apache.tinkerpop.gremlin.structure.Element} {@link org.apache.tinkerpop.gremlin.structure.Property} functionality to determine if a feature should be on * when it is marked as not supported. */ @RunWith(Parameterized.class) @@ -564,7 +564,7 @@ private Edge createEdgeForPropertyFeatureTests() { } /** - * Feature checks that tests if {@link com.tinkerpop.gremlin.structure.Graph.Variables} + * Feature checks that tests if {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables} * functionality to determine if a feature should be on when it is marked as not supported. */ @RunWith(Parameterized.class) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphConstructionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java similarity index 85% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphConstructionTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java index 09f3fd75721..82c6e25568c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphConstructionTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.structure.util.GraphFactory; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.Configuration; import org.junit.Test; @@ -29,15 +29,15 @@ import static org.junit.Assert.*; /** - * Tests that support the creation of {@link com.tinkerpop.gremlin.structure.Graph} instances which occurs via - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. + * Tests that support the creation of {@link org.apache.tinkerpop.gremlin.structure.Graph} instances which occurs via + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. * * @author Stephen Mallette (http://stephen.genoprime.com) */ public class GraphConstructionTest extends AbstractGremlinTest { /** * All Gremlin Structure implementations should be constructable through - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. */ @Test public void shouldOpenGraphThroughGraphFactoryViaApacheConfig() throws Exception { diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java index 3b57083904d..04edb81dd6f 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; @@ -24,10 +24,10 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.algorithm.generator.Distribution; -import com.tinkerpop.gremlin.algorithm.generator.DistributionGenerator; -import com.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.algorithm.generator.Distribution; +import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator; +import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution; import org.apache.commons.lang.RandomStringUtils; import org.junit.Rule; import org.junit.Test; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java index a51bf2c6aac..617393976b1 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.GraphProvider; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.GraphProvider; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import java.lang.reflect.Method; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_PERSISTENCE; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_PERSISTENCE; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.*; @@ -239,7 +239,7 @@ public void shouldOverwriteEarlierKeyValuesWithLaterKeyValuesOnAddVertexIfMultiP /** * Graphs should have a standard toString representation where the value is generated by - * {@link com.tinkerpop.gremlin.structure.util.StringFactory#graphString(Graph, String)}. + * {@link org.apache.tinkerpop.gremlin.structure.util.StringFactory#graphString(Graph, String)}. */ @Test public void shouldHaveStandardStringRepresentation() throws Exception { @@ -367,7 +367,7 @@ public void shouldRemoveEdgesWithoutConcurrentModificationException() { } /** - * Create a small {@link com.tinkerpop.gremlin.structure.Graph} and ensure that counts of edges per vertex are correct. + * Create a small {@link org.apache.tinkerpop.gremlin.structure.Graph} and ensure that counts of edges per vertex are correct. */ @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java similarity index 91% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java index 04b3695c0d6..b490aab7c7e 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; @@ -24,12 +24,12 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.io.GraphWriter; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.io.GraphWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.runners.Enclosed; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java similarity index 98% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/IoTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java index 55303eeb621..6b06382c2d9 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/IoTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; @@ -30,30 +30,30 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; -import com.tinkerpop.gremlin.structure.io.GraphMigrator; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.io.GraphWriter; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; -import com.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoMapper; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.structure.io.kryo.VertexByteArrayInputStream; -import com.tinkerpop.gremlin.structure.util.detached.DetachedFactory; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.io.GraphMigrator; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.io.GraphWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.structure.io.kryo.VertexByteArrayInputStream; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.Configuration; import org.junit.Test; @@ -83,10 +83,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_ANY_IDS; -import static com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_ANY_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.*; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; @@ -97,8 +97,8 @@ */ public class IoTest extends AbstractGremlinTest { - private static final String GRAPHML_RESOURCE_PATH_PREFIX = "/com/tinkerpop/gremlin/structure/io/graphml/"; - private static final String GRAPHSON_RESOURCE_PATH_PREFIX = "/com/tinkerpop/gremlin/structure/io/graphson/"; + private static final String GRAPHML_RESOURCE_PATH_PREFIX = "/org/apache/tinkerpop/gremlin/structure/io/graphml/"; + private static final String GRAPHSON_RESOURCE_PATH_PREFIX = "/org/apache/tinkerpop/gremlin/structure/io/graphson/"; @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/MockSerializable.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/MockSerializable.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/MockSerializable.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/MockSerializable.java index 634a117c7cd..8c31c3f2c08 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/MockSerializable.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/MockSerializable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import java.io.Serializable; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/PropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/PropertyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java index f44c907f54b..3872e883367 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/PropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -38,14 +38,14 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.FEATURE_PROPERTIES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.FEATURE_PROPERTIES; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.junit.Assume.assumeThat; /** - * Gremlin Test Suite for {@link com.tinkerpop.gremlin.structure.Property} operations. + * Gremlin Test Suite for {@link org.apache.tinkerpop.gremlin.structure.Property} operations. * * @author Stephen Mallette (http://stephen.genoprime.com) */ @@ -54,7 +54,7 @@ public class PropertyTest { /** - * Basic tests for the {@link com.tinkerpop.gremlin.structure.Property} class. + * Basic tests for the {@link org.apache.tinkerpop.gremlin.structure.Property} class. */ public static class BasicPropertyTest extends AbstractGremlinTest { @Test @@ -117,8 +117,8 @@ public void shouldAllowRemovalFromEdgeWhenAlreadyRemoved() { } /** - * Checks that properties added to an {@link com.tinkerpop.gremlin.structure.Element} are validated in a consistent way when they are added at - * {@link com.tinkerpop.gremlin.structure.Vertex} or {@link com.tinkerpop.gremlin.structure.Edge} construction by throwing an appropriate exception. + * Checks that properties added to an {@link org.apache.tinkerpop.gremlin.structure.Element} are validated in a consistent way when they are added at + * {@link org.apache.tinkerpop.gremlin.structure.Vertex} or {@link org.apache.tinkerpop.gremlin.structure.Edge} construction by throwing an appropriate exception. */ @RunWith(Parameterized.class) @ExceptionCoverage(exceptionClass = Element.Exceptions.class, methods = { @@ -179,7 +179,7 @@ public void shouldThrowOnGraphAddEdge() throws Exception { } /** - * Test exceptions around use of {@link com.tinkerpop.gremlin.structure.Element#value(String)}. + * Test exceptions around use of {@link org.apache.tinkerpop.gremlin.structure.Element#value(String)}. */ @ExceptionCoverage(exceptionClass = Property.Exceptions.class, methods = { "propertyDoesNotExist" @@ -218,7 +218,7 @@ public void shouldGetValueThatIsNotPresentOnEdge() { /** - * Checks that properties added to an {@link com.tinkerpop.gremlin.structure.Element} are validated in a + * Checks that properties added to an {@link org.apache.tinkerpop.gremlin.structure.Element} are validated in a * consistent way when they are set after {@link Vertex} or {@link Edge} construction by throwing an * appropriate exception. */ @@ -283,7 +283,7 @@ public void shouldThrowOnGraphEdgeSetPropertyStandard() throws Exception { } /** - * Tests for feature support on {@link com.tinkerpop.gremlin.structure.Property}. The tests validate if {@link com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures} + * Tests for feature support on {@link org.apache.tinkerpop.gremlin.structure.Property}. The tests validate if {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures} * should be turned on or off and if the enabled features are properly supported by the implementation. Note that * these tests are run in a separate test class as they are "parameterized" tests. */ diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/SerializationTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java index a85845dbf49..a434619ea40 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/SerializationTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.Path; -import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; -import com.tinkerpop.gremlin.structure.io.kryo.KryoMapper; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.Path; +import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructurePerformanceSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java similarity index 71% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructurePerformanceSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java index c8e862ba926..360b8294965 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructurePerformanceSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java @@ -16,32 +16,32 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; /** * The {@code StructurePerformanceSuite} is a JUnit test runner that executes the Gremlin Test Suite over a - * {@link com.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use - * by Gremlin Structure implementers to test their {@link com.tinkerpop.gremlin.structure.Graph}implementations. + * {@link org.apache.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use + * by Gremlin Structure implementers to test their {@link org.apache.tinkerpop.gremlin.structure.Graph}implementations. * The {@code StructurePerformanceSuite} runs more complex testing scenarios over - * {@link com.tinkerpop.gremlin.structure.Graph} implementations than the standard {@code StructurePerformanceSuite}. + * {@link org.apache.tinkerpop.gremlin.structure.Graph} implementations than the standard {@code StructurePerformanceSuite}. *

    * To use the {@code StructurePerformanceSuite} define a class in a test module. Simple naming would expect the name * of the implementation followed by "StructurePerformanceTest". This class should be annotated as follows (note that - * the "Suite" implements {@link com.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented + * the "Suite" implements {@link org.apache.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented * in a separate class file): * * @RunWith(StructurePerformanceSuite.class) * @StructurePerformanceSuite.GraphProviderClass(TinkerGraphStructurePerformanceTest.class) public class TinkerGraphStructurePerformanceTest implements GraphProvider { * } * - * Implementing {@link com.tinkerpop.gremlin.GraphProvider} provides a way for the {@code StructurePerformanceSuite} - * to instantiate {@link com.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to + * Implementing {@link org.apache.tinkerpop.gremlin.GraphProvider} provides a way for the {@code StructurePerformanceSuite} + * to instantiate {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to * inject into tests in the suite. The {@code StructurePerformanceSuite} will utilized - * {@link com.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Features} defined in the suite to determine which tests will be * executed. *
    * diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructureStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java similarity index 71% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructureStandardSuite.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java index 8ba988b49e0..ff155627c4d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/StructureStandardSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.AbstractGremlinSuite; -import com.tinkerpop.gremlin.algorithm.generator.CommunityGeneratorTest; -import com.tinkerpop.gremlin.algorithm.generator.DistributionGeneratorTest; -import com.tinkerpop.gremlin.structure.strategy.IdStrategyTest; -import com.tinkerpop.gremlin.structure.strategy.PartitionStrategyTest; -import com.tinkerpop.gremlin.structure.strategy.ReadOnlyStrategyTest; -import com.tinkerpop.gremlin.structure.strategy.SequenceStrategyTest; -import com.tinkerpop.gremlin.structure.strategy.StrategyGraphTest; -import com.tinkerpop.gremlin.structure.strategy.SubgraphStrategyTest; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdgeTest; -import com.tinkerpop.gremlin.structure.util.detached.DetachedPropertyTest; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexPropertyTest; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertexTest; +import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; +import org.apache.tinkerpop.gremlin.algorithm.generator.CommunityGeneratorTest; +import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGeneratorTest; +import org.apache.tinkerpop.gremlin.structure.strategy.IdStrategyTest; +import org.apache.tinkerpop.gremlin.structure.strategy.PartitionStrategyTest; +import org.apache.tinkerpop.gremlin.structure.strategy.ReadOnlyStrategyTest; +import org.apache.tinkerpop.gremlin.structure.strategy.SequenceStrategyTest; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyGraphTest; +import org.apache.tinkerpop.gremlin.structure.strategy.SubgraphStrategyTest; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdgeTest; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPropertyTest; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexPropertyTest; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexTest; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; @@ -41,21 +41,21 @@ /** * The {@code StructureStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a - * {@link com.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use by - * Gremlin implementers to test their {@link com.tinkerpop.gremlin.structure.Graph} implementations. The + * {@link org.apache.tinkerpop.gremlin.structure.Graph} implementation. This specialized test suite and runner is for use by + * Gremlin implementers to test their {@link org.apache.tinkerpop.gremlin.structure.Graph} implementations. The * {@code StructureStandardSuite} ensures consistency and validity of the implementations that they test. *

    * To use the {@code StructureStandardSuite} define a class in a test module. Simple naming would expect the name of * the implementation followed by "StructureStandardSuite". This class should be annotated as follows (note that the - * "Suite" implements {@link com.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in a + * "Suite" implements {@link org.apache.tinkerpop.gremlin.GraphProvider} as a convenience only. It could be implemented in a * separate class file): * * @RunWith(StructureStandardSuite.class) * @StructureStandardSuite.GraphProviderClass(TinkerGraphStructureStandardTest.class) public class TinkerGraphStructureStandardTest implements GraphProvider { * } * - * Implementing {@link com.tinkerpop.gremlin.GraphProvider} provides a way for the {@code StructureStandardSuite} to - * instantiate {@link com.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject + * Implementing {@link org.apache.tinkerpop.gremlin.GraphProvider} provides a way for the {@code StructureStandardSuite} to + * instantiate {@link org.apache.tinkerpop.gremlin.structure.Graph} instances from the implementation being tested to inject * into tests in the suite. The {@code StructureStandardSuite} will utilized Features defined in the suite to * determine which tests will be executed. *
    diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/TransactionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java similarity index 98% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/TransactionTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java index c6114d7e1a0..f0da6345111 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/TransactionTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.apache.commons.configuration.Configuration; import org.junit.Test; @@ -36,10 +36,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import static com.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; -import static com.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_DOUBLE_VALUES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeatures; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_DOUBLE_VALUES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VariablesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VariablesTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VariablesTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VariablesTest.java index a3cdaf308cc..d04db1cf88c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VariablesTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VariablesTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -33,13 +33,13 @@ import java.util.List; import java.util.Map; -import static com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; import static org.junit.Assume.assumeThat; /** - * Gremlin Test Suite for {@link com.tinkerpop.gremlin.structure.Graph.Variables} operations. + * Gremlin Test Suite for {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables} operations. * * @author Stephen Mallette (http://stephen.genoprime.com) */ @@ -48,7 +48,7 @@ public class VariablesTest { /** - * Basic tests to ensure that {@link com.tinkerpop.gremlin.structure.Graph.Variables} have + * Basic tests to ensure that {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables} have * appropriate {@link String} representations. */ public static class StringRepresentationTest extends AbstractGremlinTest { @@ -66,7 +66,7 @@ public void testVariables() { } /** - * Test exceptions around {@link com.tinkerpop.gremlin.structure.Graph.Variables}. + * Test exceptions around {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables}. */ @RunWith(Parameterized.class) @ExceptionCoverage(exceptionClass = Graph.Variables.Exceptions.class, methods = { @@ -108,8 +108,8 @@ public void testGraphVariablesSet() throws Exception { } /** - * Ensure that the {@link com.tinkerpop.gremlin.structure.Graph.Variables#asMap()} method returns some basics. - * Other tests will enforce that all types are properly covered in {@link com.tinkerpop.gremlin.structure.Graph.Variables}. + * Ensure that the {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables#asMap()} method returns some basics. + * Other tests will enforce that all types are properly covered in {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables}. */ public static class VariableAsMapTest extends AbstractGremlinTest { @Test @@ -200,8 +200,8 @@ public void shouldHoldVariableMixed() { } /** - * Tests for feature support on {@link com.tinkerpop.gremlin.structure.Graph.Variables}. The tests validate if - * {@link com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures} should be turned on or off and if the + * Tests for feature support on {@link org.apache.tinkerpop.gremlin.structure.Graph.Variables}. The tests validate if + * {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures} should be turned on or off and if the * enabled features are properly supported by the implementation. Note that these tests are run in a separate * test class as they are "parameterized" tests. */ diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java similarity index 98% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexPropertyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java index fc34fabc82f..1c24030e7f4 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexPropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.util.function.FunctionUtils; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java index a9373aa685d..31de018349d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/VertexTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures; -import com.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.function.FunctionUtils; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures; +import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -43,8 +43,8 @@ import java.util.Set; import java.util.function.Consumer; -import static com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.*; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.*; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java index 7b6aaf3d559..c640d315d66 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLResourceAccess.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphml; +package org.apache.tinkerpop.gremlin.structure.io.graphml; /** * Provides path access to test data resources. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java index 33716058607..c668b2fd0aa 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONResourceAccess.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.graphson; +package org.apache.tinkerpop.gremlin.structure.io.graphson; /** * Provides path access to test data resources. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java index 25dd917034f..8e25b28687a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoResourceAccess.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; /** * Provides path access to test data resources. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java similarity index 94% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java index 1e7e37425b8..fcb5d5059b5 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/script/ScriptResourceAccess.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.script; +package org.apache.tinkerpop.gremlin.structure.io.script; /** * Provides path access to test data resources. diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java index 0cf198f98b7..3cf3d5bf31d 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/IdStrategyTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.GraphManager; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.GraphManager; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; import java.util.UUID; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java index 49e7acd43eb..1c6ad2815ba 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/PartitionStrategyTest.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.NoSuchElementException; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java similarity index 87% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java index a01a6519c5f..25912dcbd98 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/ReadOnlyStrategyTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.function.ThrowingConsumer; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer; import org.junit.Test; -import static com.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java similarity index 98% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java index e3fdd3854d5..a415854ad82 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.function.TriFunction; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.function.TriFunction; import org.junit.Test; import java.lang.reflect.Method; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java similarity index 96% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java index 96090a76bf2..f78fb092111 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraphTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.structure.strategy; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.javatuples.Pair; import org.junit.Test; import org.junit.experimental.runners.Enclosed; @@ -47,12 +47,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.FEATURE_PROPERTIES; -import static com.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.PropertyFeatures.FEATURE_PROPERTIES; +import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VariableFeatures.FEATURE_VARIABLES; import static org.junit.Assert.*; /** - * Tests that ensure proper wrapping of {@link com.tinkerpop.gremlin.structure.Graph} classes. + * Tests that ensure proper wrapping of {@link org.apache.tinkerpop.gremlin.structure.Graph} classes. * * @author Stephen Mallette (http://stephen.genoprime.com) */ diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java similarity index 97% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java index eab2efdd9bd..dd2e1930d0c 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SubgraphStrategyTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.strategy; +package org.apache.tinkerpop.gremlin.structure.strategy; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.NoSuchElementException; import java.util.function.Predicate; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static com.tinkerpop.gremlin.process.graph.traversal.__.bothE; -import static com.tinkerpop.gremlin.process.graph.traversal.__.outE; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java index f926c35f2f9..2f84e28df1a 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.javatuples.Pair; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.tinkerpop.gremlin.LoadGraphWith.GraphData; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java similarity index 89% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java index ff7039bcf2d..835fe20ba95 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedPropertyTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import static org.junit.Assert.*; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java similarity index 93% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java index 7b38ca7387b..44647524fed 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; +package org.apache.tinkerpop.gremlin.structure.util.detached; -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import static org.junit.Assert.*; diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java similarity index 95% rename from gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java rename to gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java index 82f1805231e..15843930c43 100644 --- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util.detached; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.FeatureRequirement; -import com.tinkerpop.gremlin.FeatureRequirementSet; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.structure.util.detached; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.junit.Test; import java.util.Arrays; diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/graph-types.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types.xml similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/graph-types.xml rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types.xml diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/graphml-1.1.xsd b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graphml-1.1.xsd similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/graphml-1.1.xsd rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graphml-1.1.xsd diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/grateful-dead.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/grateful-dead.xml similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/grateful-dead.xml rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/grateful-dead.xml diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic-normalized.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic-normalized.xml similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic-normalized.xml rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic-normalized.xml diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-classic.xml diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/tinkerpop-modern.xml diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/grateful-dead-vertices.ldjson b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-vertices.ldjson similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/grateful-dead-vertices.ldjson rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-vertices.ldjson diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-legacy.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-legacy.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-legacy.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-legacy.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-vertices.ldjson b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-vertices.ldjson similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-vertices.ldjson rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-vertices.ldjson diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern.json diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/grateful-dead-vertices.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/grateful-dead-vertices.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/grateful-dead-vertices.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/grateful-dead-vertices.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic-vertices.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic-vertices.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic-vertices.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic-vertices.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-classic.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew-vertices.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew-vertices.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew-vertices.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew-vertices.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-crew.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern-vertices.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern-vertices.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern-vertices.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern-vertices.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern.gio b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern.gio similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern.gio rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo/tinkerpop-modern.gio diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/script-input.groovy b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/script-input.groovy similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/script-input.groovy rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/script-input.groovy diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/script-output.groovy b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/script-output.groovy similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/script-output.groovy rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/script-output.groovy diff --git a/gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/tinkerpop-classic.txt b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/tinkerpop-classic.txt similarity index 100% rename from gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/script/tinkerpop-classic.txt rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/tinkerpop-classic.txt diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/TraversalStrategiesTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java similarity index 95% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/process/TraversalStrategiesTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java index 4dda870165b..a910524786f 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/TraversalStrategiesTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process; +package org.apache.tinkerpop.gremlin.process; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; import org.junit.Test; import java.util.Collections; @@ -35,7 +35,7 @@ public class TraversalStrategiesTest { /** - * Tests that {@link com.tinkerpop.gremlin.process.TraversalStrategies#sortStrategies(java.util.List)} + * Tests that {@link org.apache.tinkerpop.gremlin.process.TraversalStrategies#sortStrategies(java.util.List)} * works as advertised. This class defines a bunch of dummy strategies which define an order. It is verified * that the right order is being returned. */ diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/step/util/TreeTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/step/util/TreeTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/step/util/TreeTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/step/util/TreeTest.java index c50f0cbbf09..2886954eff6 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/step/util/TreeTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/step/util/TreeTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.step.util; +package org.apache.tinkerpop.gremlin.process.graph.step.util; -import com.tinkerpop.gremlin.process.graph.util.Tree; +import org.apache.tinkerpop.gremlin.process.graph.util.Tree; import org.junit.Test; import java.util.AbstractMap; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java similarity index 96% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java index c655950bdfa..50edd87f6e0 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalMethodsTest.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.graph.traversal; +package org.apache.tinkerpop.gremlin.process.graph.traversal; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.junit.Test; import java.lang.reflect.Method; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/BulkSetTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/BulkSetTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/BulkSetTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/BulkSetTest.java index b897f756bad..74766efcb68 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/BulkSetTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/BulkSetTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; +package org.apache.tinkerpop.gremlin.process.util; import org.junit.Test; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/TraversalHelperTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java similarity index 86% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/TraversalHelperTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java index d343ad4a9fc..8a32ff9c5e8 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/process/util/TraversalHelperTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.process.util; - -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.__; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.traversal.step.EmptyStep; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversal; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.PropertyType; +package org.apache.tinkerpop.gremlin.process.util; + +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.__; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep; +import org.apache.tinkerpop.gremlin.process.traversal.DefaultTraversal; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.PropertyType; import org.junit.Test; import org.mockito.Mockito; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.*; /** diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/CompareTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java similarity index 98% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/CompareTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java index 73be773e25b..81546f58361 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/CompareTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/ExceptionCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/ExceptionCoverageTest.java similarity index 86% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/ExceptionCoverageTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/ExceptionCoverageTest.java index a05bd01d282..0c47a4a7c72 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/ExceptionCoverageTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/ExceptionCoverageTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.ExceptionCoverage; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.GraphComputerTest; +import org.apache.tinkerpop.gremlin.ExceptionCoverage; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest; import org.junit.Test; import java.lang.reflect.Method; @@ -62,12 +62,12 @@ public void shouldCoverAllExceptionsInTests() { // like the first set listed (and labelled as such) below in the list assignments. final Set ignore = new HashSet() {{ // this is a general exception to be used as needed. it is not explicitly tested: - add("com.tinkerpop.gremlin.structure.Graph$Exceptions#argumentCanNotBeNull"); + add("org.apache.tinkerpop.gremlin.structure.Graph$Exceptions#argumentCanNotBeNull"); // todo: need to write consistency tests for the following items still........... - add("com.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentElementPropertiesCanNotBeRead"); - add("com.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentElementPropertiesCanNotBeWritten"); - add("com.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentVerticesCanNotBeQueried"); + add("org.apache.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentElementPropertiesCanNotBeRead"); + add("org.apache.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentElementPropertiesCanNotBeWritten"); + add("org.apache.tinkerpop.gremlin.process.computer.GraphComputer$Exceptions#adjacentVerticesCanNotBeQueried"); }}; // register test classes here that contain @ExceptionCoverage annotations diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/FeaturesConventionTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/FeaturesConventionTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/FeaturesConventionTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/FeaturesConventionTest.java index b0fd248d9de..1e7f97bd134 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/FeaturesConventionTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/FeaturesConventionTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; -import com.tinkerpop.gremlin.structure.util.FeatureDescriptor; +import org.apache.tinkerpop.gremlin.structure.util.FeatureDescriptor; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/GraphHiddenTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/GraphHiddenTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/GraphHiddenTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/GraphHiddenTest.java index b960a91a7be..215715e4db9 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/GraphHiddenTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/GraphHiddenTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure; +package org.apache.tinkerpop.gremlin.structure; import org.junit.Test; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java similarity index 95% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java index 796c314b80e..4c9e7425ae6 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapperTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.io.kryo; +package org.apache.tinkerpop.gremlin.structure.io.kryo; import org.junit.Test; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/util/ElementHelperTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelperTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/util/ElementHelperTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelperTest.java index 3abc6c2cfd8..639fe673be2 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/structure/util/ElementHelperTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelperTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.structure.util; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.structure.util; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.javatuples.Pair; import org.junit.Test; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/config/YamlConfigurationTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/config/YamlConfigurationTest.java similarity index 98% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/util/config/YamlConfigurationTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/config/YamlConfigurationTest.java index 9bf02574934..8dbbb3df04f 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/config/YamlConfigurationTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/config/YamlConfigurationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.config; +package org.apache.tinkerpop.gremlin.util.config; import org.junit.Test; import org.yaml.snakeyaml.DumperOptions; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriConsumerTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriConsumerTest.java similarity index 97% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriConsumerTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriConsumerTest.java index a7e6eba96a1..c3438a134c3 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriConsumerTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriConsumerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; import org.junit.Test; diff --git a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriFunctionTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriFunctionTest.java similarity index 96% rename from gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriFunctionTest.java rename to gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriFunctionTest.java index 5aee6e7eb1a..9a1de8dbd5d 100644 --- a/gremlin-test/src/test/java/com/tinkerpop/gremlin/util/function/TriFunctionTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/function/TriFunctionTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.util.function; +package org.apache.tinkerpop.gremlin.util.function; import org.junit.Test; diff --git a/hadoop-gremlin/conf/hadoop-graphson.properties b/hadoop-gremlin/conf/hadoop-graphson.properties index e840d2feb39..090b0ce5c02 100644 --- a/hadoop-gremlin/conf/hadoop-graphson.properties +++ b/hadoop-gremlin/conf/hadoop-graphson.properties @@ -16,10 +16,10 @@ # under the License. # the graph class -gremlin.graph=com.tinkerpop.gremlin.hadoop.structure.HadoopGraph +gremlin.graph=org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph # i/o formats for graphs and memory (i.e. computer result) -gremlin.hadoop.graphInputFormat=com.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONInputFormat -gremlin.hadoop.graphOutputFormat=com.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONOutputFormat +gremlin.hadoop.graphInputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONInputFormat +gremlin.hadoop.graphOutputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONOutputFormat gremlin.hadoop.memoryOutputFormat=org.apache.hadoop.mapreduce.lib.output.TextOutputFormat # i/o locations gremlin.hadoop.inputLocation=tinkerpop-modern-vertices.ldjson @@ -29,7 +29,7 @@ gremlin.hadoop.deriveMemory=false # if the job jars are not on the classpath of every hadoop node, then they must be provided to the distributed cache at runtime gremlin.hadoop.jarsInDistributedCache=true # the vertex program to execute -gremlin.vertexProgram=com.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram +gremlin.vertexProgram=org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram # It is possible to provide Giraph configuration parameters for use with GiraphGraphComputer ############################################################################################ diff --git a/hadoop-gremlin/conf/hadoop-kryo.properties b/hadoop-gremlin/conf/hadoop-kryo.properties index 19e428a49d3..d546da74350 100644 --- a/hadoop-gremlin/conf/hadoop-kryo.properties +++ b/hadoop-gremlin/conf/hadoop-kryo.properties @@ -14,18 +14,18 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -gremlin.graph=com.tinkerpop.gremlin.hadoop.structure.HadoopGraph -gremlin.hadoop.graphInputFormat=com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat -gremlin.hadoop.graphOutputFormat=com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat +gremlin.graph=org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph +gremlin.hadoop.graphInputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat +gremlin.hadoop.graphOutputFormat=org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat gremlin.hadoop.memoryOutputFormat=org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat gremlin.hadoop.deriveMemory=false gremlin.hadoop.jarsInDistributedCache=true gremlin.hadoop.inputLocation=tinkerpop-modern-vertices.gio gremlin.hadoop.outputLocation=output -#gremlin.vertexProgram=com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram +#gremlin.vertexProgram=org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram #gremlin.traversalVertexProgram.traversalSupplier.type=CLASS -#gremlin.traversalVertexProgram.traversalSupplier.object=com.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 +#gremlin.traversalVertexProgram.traversalSupplier.object=org.apache.tinkerpop.gremlin.hadoop.process.computer.example.TraversalSupplier1 giraph.minWorkers=2 giraph.maxWorkers=2 \ No newline at end of file diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml index bbe7e27362e..52496d29de4 100644 --- a/hadoop-gremlin/pom.xml +++ b/hadoop-gremlin/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,17 +27,17 @@ limitations under the License. Hadoop Gremlin: An Implementation of TinkerPop3 for Hadoop - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} - com.tinkerpop + org.apache.tinkerpop tinkergraph-gremlin ${project.version} @@ -79,7 +79,7 @@ limitations under the License. commons-httpclient - com.tinkerpop + org.apache.tinkerpop gremlin-test ${project.version} test @@ -91,7 +91,7 @@ limitations under the License. - com.tinkerpop + org.apache.tinkerpop gremlin-groovy-test ${project.version} test diff --git a/hadoop-gremlin/src/main/groovy/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy b/hadoop-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy similarity index 91% rename from hadoop-gremlin/src/main/groovy/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy rename to hadoop-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy index 82643580f99..d9ebd4d6167 100644 --- a/hadoop-gremlin/src/main/groovy/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy +++ b/hadoop-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopLoader.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.groovy.plugin - -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HDFSTools -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HiddenFileFilter -import com.tinkerpop.gremlin.hadoop.structure.hdfs.TextIterator -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableIterator -import com.tinkerpop.gremlin.util.StreamFactory +package org.apache.tinkerpop.gremlin.hadoop.groovy.plugin + +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HDFSTools +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HiddenFileFilter +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.TextIterator +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableIterator +import org.apache.tinkerpop.gremlin.util.StreamFactory import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.* import org.apache.hadoop.io.IOUtils diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/Constants.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java similarity index 96% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/Constants.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java index f9e7f1a79bb..46cf993a618 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/Constants.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop; +package org.apache.tinkerpop.gremlin.hadoop; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Graph; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java similarity index 76% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java index 63a598b5ab7..484a48a4d7b 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPlugin.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.groovy.plugin; +package org.apache.tinkerpop.gremlin.hadoop.groovy.plugin; -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; -import com.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapReduceGraphComputer; -import com.tinkerpop.gremlin.hadoop.structure.HadoopConfiguration; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HDFSTools; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONInputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.script.ScriptInputFormat; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupCountMapReduce; +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapReduceGraphComputer; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopConfiguration; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HDFSTools; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONInputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.script.ScriptInputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.mapreduce.GroupCountMapReduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.mapred.JobClient; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java similarity index 85% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java index 86618865ef0..31604c894bc 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.groovy.plugin; +package org.apache.tinkerpop.gremlin.hadoop.groovy.plugin; -import com.tinkerpop.gremlin.groovy.engine.GroovyTraversalScript; -import com.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.RemoteException; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import com.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.groovy.engine.GroovyTraversalScript; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.FileConfiguration; import org.apache.commons.configuration.PropertiesConfiguration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java similarity index 92% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java index 7f94253b78e..336519e0d11 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopCombine.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer; +package org.apache.tinkerpop.gremlin.hadoop.process.computer; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import org.apache.hadoop.mapreduce.Reducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java similarity index 89% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java index 607353d789c..0a6d41c40f3 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopMap.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer; +package org.apache.tinkerpop.gremlin.hadoop.process.computer; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Mapper; import org.slf4j.Logger; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java similarity index 92% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java index 6afbb29bf16..66af73e7e2d 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/HadoopReduce.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer; +package org.apache.tinkerpop.gremlin.hadoop.process.computer; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import org.apache.hadoop.mapreduce.Reducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java similarity index 85% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java index be583e0c978..17798094906 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.example; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.example; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.Traversal; import java.util.function.Supplier; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java similarity index 85% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java index c85ee50ead0..99503e8d3bb 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.example; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.example; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.Traversal; import java.util.function.Supplier; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java index ca15f2b1d8c..94b1521baf4 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.example; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.example; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.Traversal; import java.util.Collection; import java.util.function.Supplier; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java similarity index 96% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java index 12c27e12e5f..b5de047fdfc 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/EmptyOutEdges.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; import org.apache.giraph.edge.Edge; import org.apache.giraph.edge.OutEdges; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java similarity index 79% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java index f073c1211b8..4d1166c6b68 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphComputeVertex.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; -import com.tinkerpop.gremlin.process.computer.util.MapMemory; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.structure.strategy.StrategyVertex; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; +import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.structure.strategy.StrategyVertex; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; import org.apache.giraph.graph.Vertex; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; @@ -62,7 +62,7 @@ public final class GiraphComputeVertex extends Vertex vertexMaker = detachedVertex -> DetachedVertex.addTo(tinkerGraph, detachedVertex); + final Function vertexMaker = detachedVertex -> DetachedVertex.addTo(tinkerGraph, detachedVertex); final Function edgeMaker = detachedEdge -> DetachedEdge.addTo(tinkerGraph, detachedEdge); try (InputStream in = new ByteArrayInputStream(bos.toByteArray())) { tinkerVertex = (TinkerVertex) KRYO_READER.readVertex(in, Direction.BOTH, vertexMaker, edgeMaker); diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java similarity index 89% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java index 74540bcd684..9c281d50a73 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphGraphComputer.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; - -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.io.GiraphVertexInputFormat; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.io.GiraphVertexOutputFormat; -import com.tinkerpop.gremlin.hadoop.process.computer.util.MapReduceHelper; -import com.tinkerpop.gremlin.hadoop.process.computer.util.MemoryMapReduce; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.hadoop.structure.util.HadoopHelper; -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.process.computer.util.MapMemory; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; + +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io.GiraphVertexInputFormat; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io.GiraphVertexOutputFormat; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.util.MapReduceHelper; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.util.MemoryMapReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.HadoopHelper; +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.FileConfiguration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java similarity index 93% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java index d32cdd475c2..a2b17092664 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMemory.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; - -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.MemoryHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; + +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.MemoryHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.giraph.master.MasterCompute; import java.io.DataInput; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java index fa84acc7936..0f4208175a3 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessageCombiner.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; -import com.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; import org.apache.giraph.combiner.Combiner; import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable; import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java similarity index 80% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java index 7979ff4e0c6..cb004080b7e 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.hadoop.io.LongWritable; /** diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java index 067ecefed1b..d017f8a0763 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.ImmutableMemory; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.ImmutableMemory; import org.apache.giraph.worker.WorkerContext; /** diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java similarity index 98% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java index ea2906fa43e..c5cf3f08891 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/MemoryAggregator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; import org.apache.giraph.aggregators.Aggregator; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java similarity index 96% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java index bb3a650c01f..d69edafed41 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/RuleWritable.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph; -import com.tinkerpop.gremlin.util.Serializer; +import org.apache.tinkerpop.gremlin.util.Serializer; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java similarity index 92% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java index 3da9ff8813b..63cb9533009 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexInputFormat.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph.io; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.giraph.io.VertexInputFormat; import org.apache.giraph.io.VertexReader; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java similarity index 92% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java index f39374742cc..ebc40adc013 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexOutputFormat.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph.io; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.giraph.io.VertexOutputFormat; import org.apache.giraph.io.VertexWriter; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java similarity index 90% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java index 69306b9ede7..950efcbf658 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexReader.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph.io; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.giraph.graph.Vertex; import org.apache.giraph.io.VertexReader; import org.apache.hadoop.io.NullWritable; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java similarity index 90% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java index 3eae76502a6..1366b71b839 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/io/GiraphVertexWriter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.giraph.io; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.io; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphComputeVertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.giraph.graph.Vertex; import org.apache.giraph.io.VertexWriter; import org.apache.hadoop.io.NullWritable; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java similarity index 93% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java index dfc4038508d..d2a8048f338 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/mapreduce/MapReduceGraphComputer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.mapreduce; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java similarity index 89% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java index 371279a1cef..7db2f7dafbe 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MapReduceHelper.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.util; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.util; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.process.computer.HadoopCombine; -import com.tinkerpop.gremlin.hadoop.process.computer.HadoopMap; -import com.tinkerpop.gremlin.hadoop.process.computer.HadoopReduce; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableComparator; -import com.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableIterator; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.HadoopCombine; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.HadoopMap; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.HadoopReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableComparator; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritableIterator; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; import org.apache.commons.configuration.BaseConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java similarity index 84% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java index 0f12073fa60..0db931f9dfe 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/MemoryMapReduce.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.computer.util; - -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.process.computer.util.MapMemory; -import com.tinkerpop.gremlin.process.computer.util.StaticMapReduce; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.hadoop.process.computer.util; + +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory; +import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.commons.configuration.Configuration; import java.util.ArrayList; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java similarity index 69% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java index e9d6019b7e8..cbb75788f87 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.hadoop.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.hadoop.structure.HadoopElement; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.empty.EmptyGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopElement; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java similarity index 93% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java index 770d6e36061..40b786ea2fd 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopConfiguration.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.hadoop.io.NullWritable; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java similarity index 85% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java index 5bf50ac8aa0..6fe97bb3a77 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopEdge.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopElement.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopElement.java similarity index 87% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopElement.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopElement.java index 902f27af59d..a60e15bd966 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopElement.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopElement.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java similarity index 83% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java index d135462f013..7f5033acd8b 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; - -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; -import com.tinkerpop.gremlin.hadoop.process.graph.traversal.strategy.HadoopElementStepStrategy; -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HadoopEdgeIterator; -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HadoopVertexIterator; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.hadoop.structure; + +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; +import org.apache.tinkerpop.gremlin.hadoop.process.graph.traversal.strategy.HadoopElementStepStrategy; +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HadoopEdgeIterator; +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HadoopVertexIterator; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.hadoop.mapred.OutputFormat; @@ -54,71 +54,71 @@ @Graph.OptIn(Graph.OptIn.SUITE_GROOVY_PROCESS_STANDARD) @Graph.OptIn(Graph.OptIn.SUITE_GROOVY_PROCESS_COMPUTER) @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", method = "g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", method = "g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MatchTest$StandardTest", method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", method = "g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", method = "g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest$StandardTest", method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", method = "g_V_both_both_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", method = "g_V_repeatXoutX_timesX3X_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountTest$StandardTest", method = "g_V_repeatXoutX_timesX8X_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", method = "g_V_both_both_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", method = "g_V_repeatXoutX_timesX3X_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest$StandardTest", method = "g_V_repeatXoutX_timesX8X_count", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", + test = "org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", method = "shouldNotAllowNullMemoryKeys", reason = "Hadoop does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", + test = "org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", method = "shouldNotAllowSettingUndeclaredMemoryKeys", reason = "Hadoop does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", + test = "org.apache.tinkerpop.gremlin.process.computer.GroovyGraphComputerTest$ComputerTest", method = "shouldHaveConsistentMemoryVertexPropertiesAndExceptions", reason = "Hadoop does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileTest$StandardTest", method = "g_V_out_out_grateful_profile", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") @Graph.OptOut( - test = "com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyProfileTest$StandardTest", + test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyProfileTest$StandardTest", method = "g_V_out_out_grateful_profile", reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.") public class HadoopGraph implements Graph, Graph.Iterators { diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java similarity index 87% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java index f054fd163ca..f82603fe40f 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraphVariables.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.GraphVariableHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.HashMap; import java.util.Map; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java similarity index 89% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java index f0be9c944c1..a04433d8524 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopProperty.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedProperty; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedProperty; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java index cc277e8b67f..0d11097e2f3 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertex.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; +package org.apache.tinkerpop.gremlin.hadoop.structure; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java index aa1a9eb0618..cb9a0bb44fa 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure; - -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertexProperty; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.hadoop.structure; + +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertexProperty; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Iterator; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java similarity index 98% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java index c3e398040a4..ec1460105a9 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HDFSTools.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java similarity index 86% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java index 171d861b68c..743a0d4740c 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; -import com.tinkerpop.gremlin.hadoop.structure.HadoopEdge; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopEdge; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputFormat; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java similarity index 90% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java index 33e3e521539..1951b932005 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopElementIterator.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java similarity index 87% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java index f89b4d55e54..25f1eff996d 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopVertexIterator.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.HadoopVertex; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopVertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputFormat; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java similarity index 95% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java index ace096c3e7f..b0453288b81 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HiddenFileFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java similarity index 95% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java index 7c329baa9c5..a1d42b6b0ba 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/TextIterator.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.hdfs; +package org.apache.tinkerpop.gremlin.hadoop.structure.hdfs; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java similarity index 97% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java index 958d27ba621..4a9973c850f 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/CommonFileOutputFormat.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java similarity index 96% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java index 6e151022f02..55a78a0505a 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritable.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; -import com.tinkerpop.gremlin.util.Serializer; +import org.apache.tinkerpop.gremlin.util.Serializer; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.io.WritableUtils; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java similarity index 94% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java index 1891e3f6343..edab58416f0 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableComparator.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; -import com.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.RawComparator; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java similarity index 92% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java index c23ef7dc8ed..44f9c17f125 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/ObjectWritableIterator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; -import com.tinkerpop.gremlin.hadoop.structure.hdfs.HiddenFileFilter; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.FastNoSuchElementException; +import org.apache.tinkerpop.gremlin.hadoop.structure.hdfs.HiddenFileFilter; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.FastNoSuchElementException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java similarity index 81% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java index 5012ddc34c1..09d26cecd7f 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/VertexWritable.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java similarity index 94% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java index dea42ecf6d8..c33db48d600 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONInputFormat.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java similarity index 88% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java index d31b8978758..bdb2281012b 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONOutputFormat.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java similarity index 81% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java index 1da2de0b6dd..c49e5364bac 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReader.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java similarity index 88% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java index a3ea54f2bcc..57ae456b3e1 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java similarity index 94% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java index 36da7ad4a0d..cad79f67e3b 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoInputFormat.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java similarity index 88% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java index 7b9ded6f24b..8b26a7cd657 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoOutputFormat.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; -import com.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java similarity index 95% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java index e392393efef..7ed405d4b51 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReader.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.io.kryo.KryoMapper; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java similarity index 87% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java index bbe5033ef8e..c9d1b8f0b33 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordWriter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java similarity index 88% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java index 872e94a3087..6784d92cb37 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/VertexStreamIterator.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; - -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.util.detached.DetachedEdge; -import com.tinkerpop.gremlin.structure.util.detached.DetachedVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; + +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge; +import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java similarity index 94% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java index 10819fe111a..0c25c161f37 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.script; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.script; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java similarity index 88% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java index e090df40d39..69af95d59e8 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.script; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.script; -import com.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.CommonFileOutputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java similarity index 90% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java index c4e7a6ff896..c2a73cfa624 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.script; - -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.util.ScriptEngineCache; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.script; + +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.util.ScriptEngineCache; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java similarity index 94% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java index 96d19158369..797ac5eeb6e 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordWriter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.script; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.script; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.process.computer.util.ScriptEngineCache; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.process.computer.util.ScriptEngineCache; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java similarity index 98% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java index c7f0d93d060..3c2d721eb90 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/ConfUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.util; +package org.apache.tinkerpop.gremlin.hadoop.structure.util; import org.apache.commons.configuration.BaseConfiguration; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java similarity index 90% rename from hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java rename to hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java index 899bb7a77a7..8b5f2673bfd 100644 --- a/hadoop-gremlin/src/main/java/com/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/util/HadoopHelper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.util; +package org.apache.tinkerpop.gremlin.hadoop.structure.util; -import com.tinkerpop.gremlin.hadoop.Constants; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.Constants; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; import org.apache.commons.configuration.BaseConfiguration; /** diff --git a/hadoop-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/hadoop-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin deleted file mode 100644 index 5116383651b..00000000000 --- a/hadoop-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +++ /dev/null @@ -1 +0,0 @@ -com.tinkerpop.gremlin.hadoop.groovy.plugin.HadoopGremlinPlugin \ No newline at end of file diff --git a/hadoop-gremlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/hadoop-gremlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory index 38d436c02e8..74b951cc26b 100644 --- a/hadoop-gremlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory +++ b/hadoop-gremlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory @@ -1 +1 @@ -com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory \ No newline at end of file +org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngineFactory \ No newline at end of file diff --git a/hadoop-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/hadoop-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin new file mode 100644 index 00000000000..841eeb6e0c3 --- /dev/null +++ b/hadoop-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin @@ -0,0 +1 @@ +org.apache.tinkerpop.gremlin.hadoop.groovy.plugin.HadoopGremlinPlugin \ No newline at end of file diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java similarity index 82% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java index 52be648ac9c..e6c16a6d7e8 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop; +package org.apache.tinkerpop.gremlin.hadoop; -import com.tinkerpop.gremlin.AbstractGraphProvider; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; -import com.tinkerpop.gremlin.hadoop.structure.HadoopEdge; -import com.tinkerpop.gremlin.hadoop.structure.HadoopElement; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraphVariables; -import com.tinkerpop.gremlin.hadoop.structure.HadoopProperty; -import com.tinkerpop.gremlin.hadoop.structure.HadoopVertex; -import com.tinkerpop.gremlin.hadoop.structure.HadoopVertexProperty; -import com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat; -import com.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONResourceAccess; -import com.tinkerpop.gremlin.structure.io.kryo.KryoResourceAccess; -import com.tinkerpop.gremlin.structure.io.script.ScriptResourceAccess; +import org.apache.tinkerpop.gremlin.AbstractGraphProvider; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopEdge; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopElement; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraphVariables; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopProperty; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopVertex; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopVertexProperty; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoInputFormat; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.KryoOutputFormat; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONResourceAccess; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoResourceAccess; +import org.apache.tinkerpop.gremlin.structure.io.script.ScriptResourceAccess; import org.apache.commons.configuration.Configuration; import org.apache.giraph.conf.GiraphConstants; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java similarity index 81% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java index 3acbdf1dd37..6581b905c29 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/HadoopGraphProcessStandardTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process; +package org.apache.tinkerpop.gremlin.hadoop.process; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; import org.junit.runner.RunWith; /** diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java similarity index 77% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java index 4e80d54c558..3827a6f5a58 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessComputerIntegrateTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.groovy; +package org.apache.tinkerpop.gremlin.hadoop.process.groovy; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.GroovyProcessComputerSuite; -import com.tinkerpop.gremlin.process.ProcessComputerSuite; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite; +import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite; import org.junit.runner.RunWith; /** diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java similarity index 77% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java index 3bdaf53cceb..88d7e19b8f5 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/groovy/HadoopGraphGroovyProcessStandardTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.process.groovy; +package org.apache.tinkerpop.gremlin.hadoop.process.groovy; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.process.GroovyProcessStandardSuite; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; import org.junit.runner.RunWith; /** diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java similarity index 81% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java index 067c13dc9d0..743b8e390f8 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopGraphStructureStandardTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io; +package org.apache.tinkerpop.gremlin.hadoop.structure.io; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.HadoopGraph; -import com.tinkerpop.gremlin.structure.StructureStandardSuite; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; +import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite; import org.junit.runner.RunWith; /** diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java similarity index 93% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java index 4c384cdc846..92e95eb10b5 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordReaderWriterTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java similarity index 85% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java index 7da33d51f9e..138e4a0edd5 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/VertexStreamIteratorTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.graphson; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson; -import com.tinkerpop.gremlin.hadoop.structure.io.kryo.VertexStreamIterator; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo.VertexStreamIterator; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java similarity index 93% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java index 9ae408dfe75..ed77145f919 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/kryo/KryoRecordReaderWriterTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.kryo; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.kryo; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java similarity index 94% rename from hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java rename to hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java index b635050544b..03e15b3788c 100644 --- a/hadoop-gremlin/src/test/java/com/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReaderWriterTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.hadoop.structure.io.script; +package org.apache.tinkerpop.gremlin.hadoop.structure.io.script; -import com.tinkerpop.gremlin.hadoop.HadoopGraphProvider; -import com.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; +import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-gremlin/src/test/resources/com/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar b/hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar similarity index 100% rename from hadoop-gremlin/src/test/resources/com/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar rename to hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml index c17aa36ac39..59c0e0764bc 100644 --- a/neo4j-gremlin/pom.xml +++ b/neo4j-gremlin/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -30,12 +30,12 @@ limitations under the License. - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} @@ -94,13 +94,13 @@ limitations under the License. compile - com.tinkerpop + org.apache.tinkerpop gremlin-test ${project.version} test - com.tinkerpop + org.apache.tinkerpop gremlin-groovy-test ${project.version} test diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java similarity index 79% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java index e4a0cef2c09..306917d7fd3 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.groovy.plugin; +package org.apache.tinkerpop.gremlin.neo4j.groovy.plugin; -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; import java.util.HashSet; import java.util.Set; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java similarity index 91% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java index e4fca067db6..bc960f4c0ed 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/sideEffect/Neo4jGraphStep.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect; - -import com.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect; + +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.javatuples.Pair; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.DynamicLabel; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java similarity index 89% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java index 0e306d1b4d6..894af7e3580 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/step/util/Neo4jCypherIterator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process.graph.traversal.step.util; +package org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.step.util; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.ResourceIterator; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java similarity index 77% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java index e2745968abd..abe73a87b33 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect.Neo4jGraphStep; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect.Neo4jGraphStep; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; /** * @author Pieter Martin diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java similarity index 84% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java index 3169bf31608..9b78229e726 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Relationship; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java similarity index 89% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java index 60abbbe0027..608f0618401 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedElement; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedElement; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java similarity index 94% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java index b483d55b925..bc581144640 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; - -import com.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect.Neo4jGraphStep; -import com.tinkerpop.gremlin.neo4j.process.graph.traversal.step.util.Neo4jCypherIterator; -import com.tinkerpop.gremlin.neo4j.process.graph.traversal.strategy.Neo4jGraphStepStrategy; -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.neo4j.structure; + +import org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.step.sideEffect.Neo4jGraphStep; +import org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.step.util.Neo4jCypherIterator; +import org.apache.tinkerpop.gremlin.neo4j.process.graph.traversal.strategy.Neo4jGraphStepStrategy; +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationConverter; @@ -184,7 +184,7 @@ private Neo4jGraph(final Configuration configuration) { * Open a new {@link Neo4jGraph} instance. * * @param configuration the configuration for the instance - * @return a newly opened {@link com.tinkerpop.gremlin.structure.Graph} + * @return a newly opened {@link org.apache.tinkerpop.gremlin.structure.Graph} */ public static Neo4jGraph open(final Configuration configuration) { if (null == configuration) throw Graph.Exceptions.argumentCanNotBeNull("configuration"); diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java similarity index 95% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java index bbc60d983eb..87776af19fd 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.GraphVariableHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.kernel.GraphDatabaseAPI; import org.neo4j.kernel.impl.core.NodeManager; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java similarity index 96% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java index b2f9cb4c900..daf9c0a0edf 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Direction; import org.neo4j.cypher.javacompat.ExecutionEngine; import org.neo4j.graphdb.DynamicLabel; import org.neo4j.graphdb.DynamicRelationshipType; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java similarity index 88% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java index ced13389033..2257252abd4 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java similarity index 94% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java index bb2b4f2f8b1..fed8b65dd8a 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.neo4j.graphdb.DynamicLabel; import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.Label; diff --git a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java similarity index 92% rename from neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java rename to neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java index ae3544e077b..12d99e261ca 100644 --- a/neo4j-gremlin/src/main/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java +++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.neo4j.structure; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.DynamicLabel; import org.neo4j.graphdb.DynamicRelationshipType; diff --git a/neo4j-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/neo4j-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin deleted file mode 100644 index bfe1d3665f3..00000000000 --- a/neo4j-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +++ /dev/null @@ -1 +0,0 @@ -com.tinkerpop.gremlin.neo4j.groovy.plugin.Neo4jGremlinPlugin \ No newline at end of file diff --git a/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin new file mode 100644 index 00000000000..f4cbea8805d --- /dev/null +++ b/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin @@ -0,0 +1 @@ +org.apache.tinkerpop.gremlin.neo4j.groovy.plugin.Neo4jGremlinPlugin \ No newline at end of file diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java similarity index 91% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java index 2a5c5bd0801..7a397d2066e 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j; +package org.apache.tinkerpop.gremlin.neo4j; -import com.tinkerpop.gremlin.AbstractGraphProvider; -import com.tinkerpop.gremlin.LoadGraphWith; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jElement; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraphVariables; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jProperty; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.AbstractGraphProvider; +import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jElement; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraphVariables; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jProperty; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.commons.configuration.Configuration; import org.neo4j.graphdb.DynamicLabel; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java similarity index 97% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java index 17d840ee689..b64dd719731 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j; +package org.apache.tinkerpop.gremlin.neo4j; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; import org.apache.commons.configuration.Configuration; import org.junit.After; import org.junit.Before; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java similarity index 88% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java index 8394acedfad..52d17660f76 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j; +package org.apache.tinkerpop.gremlin.neo4j; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.structure.Graph; import java.io.File; import java.util.HashMap; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java similarity index 91% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java index 4d2c491a694..c94d6ae6adf 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j; +package org.apache.tinkerpop.gremlin.neo4j; -import com.tinkerpop.gremlin.TestHelper; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.TestHelper; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; import java.io.File; import java.util.HashMap; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java similarity index 95% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java index 0e0aa2361ee..9186111fc41 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process; +package org.apache.tinkerpop.gremlin.neo4j.process; -import com.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import java.util.Arrays; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java similarity index 82% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java index 649dc99d75b..65ef88f09e8 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process; +package org.apache.tinkerpop.gremlin.neo4j.process; -import com.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; import org.junit.runner.RunWith; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java similarity index 77% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java index 065cd9fb059..d6f1d139b57 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.process.groovy; +package org.apache.tinkerpop.gremlin.neo4j.process.groovy; -import com.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; -import com.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; -import com.tinkerpop.gremlin.process.GroovyProcessStandardSuite; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; +import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; +import org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; import org.junit.runner.RunWith; /** diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java similarity index 85% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java index ac8c71e952d..a0dcd289b9e 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; -import com.tinkerpop.gremlin.structure.StructureStandardSuite; +import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider; +import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite; import org.junit.runner.RunWith; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java similarity index 98% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java index c87f6460731..e1803b702db 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; - -import com.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; -import com.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; -import com.tinkerpop.gremlin.structure.Contains; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.util.StreamFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.neo4j.structure; + +import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; +import org.apache.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.Contains; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.neo4j.cypher.javacompat.ExecutionEngine; import org.neo4j.graphdb.ConstraintViolationException; diff --git a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java similarity index 85% rename from neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java rename to neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java index 1f412a54a93..0cd3ad51a1c 100644 --- a/neo4j-gremlin/src/test/java/com/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.neo4j.structure; +package org.apache.tinkerpop.gremlin.neo4j.structure; -import com.tinkerpop.gremlin.neo4j.NoMetaMultiPropertyNeo4jGraphProvider; -import com.tinkerpop.gremlin.structure.StructureStandardSuite; +import org.apache.tinkerpop.gremlin.neo4j.NoMetaMultiPropertyNeo4jGraphProvider; +import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite; import org.junit.runner.RunWith; diff --git a/pom.xml b/pom.xml index 057a90b6583..3d7f33ae761 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ limitations under the License. oss-parent 7 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT pom diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml index 21cf06e51f0..05c7214e721 100644 --- a/tinkergraph-gremlin/pom.xml +++ b/tinkergraph-gremlin/pom.xml @@ -19,7 +19,7 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.tinkerpop + org.apache.tinkerpop tinkerpop 3.0.0-SNAPSHOT @@ -27,17 +27,17 @@ limitations under the License. TinkerGraph Gremlin: The Reference Implementation of TinkerPop3 - com.tinkerpop + org.apache.tinkerpop gremlin-core ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy ${project.version} - com.tinkerpop + org.apache.tinkerpop gremlin-groovy-test ${project.version} test @@ -128,7 +128,7 @@ limitations under the License. - ../gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/kryo + ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/kryo @@ -152,7 +152,7 @@ limitations under the License. - ../gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphson + ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson @@ -173,7 +173,7 @@ limitations under the License. - ../gremlin-test/src/main/resources/com/tinkerpop/gremlin/structure/io/graphml + ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java similarity index 76% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java index 44ebfeb1005..ec06dc7523c 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/groovy/plugin/TinkerGraphGremlinPlugin.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.groovy.plugin; - -import com.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; -import com.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; -import com.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; -import com.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; -import com.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +package org.apache.tinkerpop.gremlin.tinkergraph.groovy.plugin; + +import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin; +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor; +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException; +import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import java.util.HashSet; import java.util.Set; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java similarity index 90% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java index 42b6d391987..2df39455a8f 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; - -import com.tinkerpop.gremlin.process.computer.ComputerResult; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; + +import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; import java.util.HashSet; import java.util.Iterator; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java similarity index 87% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java index f5d72df2ac9..67be0b30f2b 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphView.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerElement; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerElement; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty; import java.util.ArrayList; import java.util.Arrays; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java similarity index 93% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java index f206dac922f..d35f7b690d2 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMapEmitter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import java.util.ArrayList; import java.util.Collections; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java similarity index 90% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java index d0d31670941..dfe2d418021 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMemory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; - -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.Memory; -import com.tinkerpop.gremlin.process.computer.VertexProgram; -import com.tinkerpop.gremlin.process.computer.util.MemoryHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; + +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.Memory; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.util.MemoryHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.HashSet; import java.util.Map; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java similarity index 91% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java index 7284d7fc3b1..9ba4c3876c5 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessageBoard.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.Map; import java.util.Queue; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java similarity index 83% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java index 3cab3290d8d..0e5495fb57b 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.computer.MessageCombiner; -import com.tinkerpop.gremlin.process.computer.MessageScope; -import com.tinkerpop.gremlin.process.computer.Messenger; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.util.StreamFactory; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner; +import org.apache.tinkerpop.gremlin.process.computer.MessageScope; +import org.apache.tinkerpop.gremlin.process.computer.Messenger; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import java.util.Optional; import java.util.Queue; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java similarity index 90% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java index 7fbea153d23..362cb5a1fa9 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerReduceEmitter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.process.computer.KeyValue; -import com.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.KeyValue; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; import java.util.ArrayList; import java.util.Collections; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java similarity index 94% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java index c3613fc1623..15a8011ac43 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.computer; +package org.apache.tinkerpop.gremlin.tinkergraph.process.computer; -import com.tinkerpop.gremlin.process.computer.MapReduce; -import com.tinkerpop.gremlin.process.computer.VertexProgram; +import org.apache.tinkerpop.gremlin.process.computer.MapReduce; +import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; import java.util.ArrayList; import java.util.List; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java similarity index 86% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java index 1b559ff8446..1b1bf46d3f0 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/sideEffect/TinkerGraphStep.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.sideEffect; +package org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.sideEffect; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.util.HasContainer; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.structure.Compare; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.structure.Compare; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java similarity index 70% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java index 33f02933fb9..9af812b3345 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.empty.EmptyGraph; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java similarity index 77% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java index 53b957fb3d9..6441ded19df 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy; +package org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy; -import com.tinkerpop.gremlin.process.Step; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.TraversalEngine; -import com.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; -import com.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; -import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.sideEffect.TinkerGraphStep; +import org.apache.tinkerpop.gremlin.process.Step; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.sideEffect.TinkerGraphStep; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java similarity index 86% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java index 422d334b51a..941e0f8ffbf 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.Collections; import java.util.Iterator; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java similarity index 91% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java index b12829fc75b..d190799fc1e 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java similarity index 93% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java index d60a619aa6b..ca9a892be23 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.FlatMapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.map.MapStep; -import com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; -import com.tinkerpop.gremlin.process.traversal.DefaultTraversal; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Vertex; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.FlatMapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MapStep; +import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep; +import org.apache.tinkerpop.gremlin.process.traversal.DefaultTraversal; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Vertex; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java similarity index 86% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java index 08495a19c87..16e8456c811 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.process.TraversalStrategies; -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Transaction; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; -import com.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer; -import com.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphView; -import com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy.TinkerElementStepStrategy; -import com.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy.TinkerGraphStepStrategy; -import com.tinkerpop.gremlin.util.iterator.IteratorUtils; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.process.TraversalStrategies; +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Transaction; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer; +import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphView; +import org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy.TinkerElementStepStrategy; +import org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strategy.TinkerGraphStepStrategy; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; @@ -85,7 +85,7 @@ public class TinkerGraph implements Graph, Graph.Iterators { protected TinkerIndex edgeIndex = new TinkerIndex<>(this, TinkerEdge.class); /** - * An empty private constructor that initializes {@link TinkerGraph} with no {@link com.tinkerpop.gremlin.structure.strategy.GraphStrategy}. Primarily + * An empty private constructor that initializes {@link TinkerGraph} with no {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy}. Primarily * used for purposes of serialization issues. */ private TinkerGraph() { @@ -94,7 +94,7 @@ private TinkerGraph() { /** * Open a new {@link TinkerGraph} instance. *

    - * Reference Implementation Help: If a {@link com.tinkerpop.gremlin.structure.Graph } implementation does not require a + * Reference Implementation Help: If a {@link org.apache.tinkerpop.gremlin.structure.Graph } implementation does not require a * {@link org.apache.commons.configuration.Configuration} (or perhaps has a default configuration) it can choose to implement a zero argument * open() method. This is an optional constructor method for TinkerGraph. It is not enforced by the Gremlin * Test Suite. @@ -107,16 +107,16 @@ public static TinkerGraph open() { * Open a new {@link TinkerGraph} instance. *

    * Reference Implementation Help: This method is the one use by the - * {@link com.tinkerpop.gremlin.structure.util.GraphFactory} to instantiate - * {@link com.tinkerpop.gremlin.structure.Graph} instances. This method must be overridden for the Blueprint Test + * {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory} to instantiate + * {@link org.apache.tinkerpop.gremlin.structure.Graph} instances. This method must be overridden for the Blueprint Test * Suite to pass. Implementers have latitude in terms of how exceptions are handled within this method. Such * exceptions will be considered implementation specific by the test suite as all test generate graph instances - * by way of {@link com.tinkerpop.gremlin.structure.util.GraphFactory}. As such, the exceptions get generalized - * behind that facade and since {@link com.tinkerpop.gremlin.structure.util.GraphFactory} is the preferred method + * by way of {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory}. As such, the exceptions get generalized + * behind that facade and since {@link org.apache.tinkerpop.gremlin.structure.util.GraphFactory} is the preferred method * to opening graphs it will be consistent at that level. * * @param configuration the configuration for the instance - * @return a newly opened {@link com.tinkerpop.gremlin.structure.Graph} + * @return a newly opened {@link org.apache.tinkerpop.gremlin.structure.Graph} */ public static TinkerGraph open(final Configuration configuration) { return new TinkerGraph(); diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java similarity index 87% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java index e4198f94328..a49d6a210b9 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphVariables.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.util.GraphVariableHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Map; import java.util.Optional; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java similarity index 92% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java index df4db4742f7..47a366b2842 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.process.computer.GraphComputer; -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphView; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphView; import java.util.ArrayList; import java.util.Collections; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java similarity index 94% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java index cf08a594010..c90318317fa 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.ArrayList; import java.util.Collections; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java similarity index 85% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java index 7d42de72eaf..b4f438dd36a 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java similarity index 90% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java index bd85d8787f7..897eb06a73f 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.structure.Direction; -import com.tinkerpop.gremlin.structure.Edge; -import com.tinkerpop.gremlin.structure.Element; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java similarity index 91% rename from tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java rename to tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java index f19ffd5f0b5..c1afbf20598 100644 --- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.Property; -import com.tinkerpop.gremlin.structure.Vertex; -import com.tinkerpop.gremlin.structure.VertexProperty; -import com.tinkerpop.gremlin.structure.util.ElementHelper; -import com.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.structure.Property; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; +import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import java.util.Collections; import java.util.Iterator; diff --git a/tinkergraph-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/tinkergraph-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin deleted file mode 100644 index 559e50771bf..00000000000 --- a/tinkergraph-gremlin/src/main/resources/META-INF/services/com.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +++ /dev/null @@ -1 +0,0 @@ -com.tinkerpop.gremlin.tinkergraph.groovy.plugin.TinkerGraphGremlinPlugin \ No newline at end of file diff --git a/tinkergraph-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/tinkergraph-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin new file mode 100644 index 00000000000..2c627fef555 --- /dev/null +++ b/tinkergraph-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin @@ -0,0 +1 @@ +org.apache.tinkerpop.gremlin.tinkergraph.groovy.plugin.TinkerGraphGremlinPlugin \ No newline at end of file diff --git a/tinkergraph-gremlin/src/test/groovy/com/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy b/tinkergraph-gremlin/src/test/groovy/org/apache/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy similarity index 81% rename from tinkergraph-gremlin/src/test/groovy/com/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy rename to tinkergraph-gremlin/src/test/groovy/org/apache/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy index 7588106d5ae..001b59016c7 100644 --- a/tinkergraph-gremlin/src/test/groovy/com/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy +++ b/tinkergraph-gremlin/src/test/groovy/org/apache/tinkerpop/gremlin/tinkergraph/structure/GroovyTinkerGraphTest.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure +package org.apache.tinkerpop.gremlin.tinkergraph.structure -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader -import com.tinkerpop.gremlin.process.graph.traversal.GraphTraversal -import com.tinkerpop.gremlin.process.graph.traversal.__ -import com.tinkerpop.gremlin.structure.Graph +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader +import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal +import org.apache.tinkerpop.gremlin.process.graph.traversal.__ +import org.apache.tinkerpop.gremlin.structure.Graph import org.junit.Ignore import org.junit.Test diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java similarity index 74% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java index 41110c57be8..eaa81788f81 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph; +package org.apache.tinkerpop.gremlin.tinkergraph; -import com.tinkerpop.gremlin.AbstractGraphProvider; -import com.tinkerpop.gremlin.structure.Graph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerEdge; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerElement; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraphVariables; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty; +import org.apache.tinkerpop.gremlin.AbstractGraphProvider; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerEdge; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerElement; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraphVariables; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty; import org.apache.commons.configuration.Configuration; import java.util.HashMap; diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java similarity index 81% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java index 7cd438c398d..c2a5dbf2818 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessComputerTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process; +package org.apache.tinkerpop.gremlin.tinkergraph.process; -import com.tinkerpop.gremlin.process.ProcessComputerSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java similarity index 77% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java index 5ae231b7b75..92ab66912a0 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessPerformanceTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process; +package org.apache.tinkerpop.gremlin.tinkergraph.process; -import com.tinkerpop.gremlin.process.ProcessPerformanceSuite; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.process.ProcessPerformanceSuite; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java similarity index 81% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java index d18494cd3b5..83733e86a7e 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphProcessStandardTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process; +package org.apache.tinkerpop.gremlin.tinkergraph.process; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java similarity index 73% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java index 630802ed844..4e45c090844 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.groovy; +package org.apache.tinkerpop.gremlin.tinkergraph.process.groovy; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.process.GroovyProcessComputerSuite; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java similarity index 73% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java index e102c0838bf..53501ddd211 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessStandardTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.process.groovy; +package org.apache.tinkerpop.gremlin.tinkergraph.process.groovy; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.process.GroovyProcessStandardSuite; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java similarity index 81% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java index 5e8f634faeb..caa010f90dc 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructurePerformanceTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.StructurePerformanceSuite; -import com.tinkerpop.gremlin.structure.StructureStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.structure.StructurePerformanceSuite; +import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java similarity index 85% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java index 788f227cdb9..a66dd7a9bf1 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphStructureStandardTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; -import com.tinkerpop.gremlin.structure.StructureStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; import org.junit.runner.RunWith; diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java similarity index 96% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java index 9c66e80b8e6..4d114ea18e7 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure; - -import com.tinkerpop.gremlin.AbstractGremlinTest; -import com.tinkerpop.gremlin.process.T; -import com.tinkerpop.gremlin.process.Traversal; -import com.tinkerpop.gremlin.structure.*; -import com.tinkerpop.gremlin.structure.io.GraphReader; -import com.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; -import com.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; -import com.tinkerpop.gremlin.structure.io.kryo.KryoReader; -import com.tinkerpop.gremlin.structure.io.kryo.KryoWriter; -import com.tinkerpop.gremlin.util.StreamFactory; +package org.apache.tinkerpop.gremlin.tinkergraph.structure; + +import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.process.T; +import org.apache.tinkerpop.gremlin.process.Traversal; +import org.apache.tinkerpop.gremlin.structure.*; +import org.apache.tinkerpop.gremlin.structure.io.GraphReader; +import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; +import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader; +import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter; +import org.apache.tinkerpop.gremlin.util.StreamFactory; import org.apache.commons.io.FileUtils; import org.junit.BeforeClass; import org.junit.Ignore; @@ -40,7 +40,7 @@ import java.util.Set; import java.util.function.Supplier; -import static com.tinkerpop.gremlin.process.graph.traversal.__.*; +import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -588,7 +588,7 @@ public void shouldUpdateEdgeIndicesInExistingGraph() { public void shouldWriteGratefulDead() throws IOException { final Graph g = TinkerGraph.open(); final GraphReader reader = KryoReader.build().create(); - try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/com/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio")) { + try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/kryo/grateful-dead.gio")) { reader.readGraph(stream, g); } diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java similarity index 73% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java index 2ee3ff451b3..88e7ad7f0cf 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentIntegrateTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure.groovy; +package org.apache.tinkerpop.gremlin.tinkergraph.structure.groovy; -import com.tinkerpop.gremlin.groovy.GroovyEnvironmentIntegrateSuite; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.groovy.GroovyEnvironmentIntegrateSuite; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /** diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java similarity index 73% rename from tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java rename to tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java index 8494d542a44..56ef5262a72 100644 --- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/groovy/TinkerGraphGroovyEnvironmentTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.tinkerpop.gremlin.tinkergraph.structure.groovy; +package org.apache.tinkerpop.gremlin.tinkergraph.structure.groovy; -import com.tinkerpop.gremlin.groovy.GroovyEnvironmentSuite; -import com.tinkerpop.gremlin.groovy.loaders.SugarLoader; -import com.tinkerpop.gremlin.process.ProcessStandardSuite; -import com.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; -import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.apache.tinkerpop.gremlin.groovy.GroovyEnvironmentSuite; +import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader; +import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite; +import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphGraphProvider; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.runner.RunWith; /**