This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new dc628b8 renamed tinkergraph to blueprints.
dc628b8 is described below
commit dc628b8e14883f7c1cb089f074a679754ae7086a
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Tue Mar 19 11:35:12 2019 -0600
renamed tinkergraph to blueprints.
---
.gitignore | 1 +
java/machine/structure/.DS_Store | Bin 6148 -> 0 bytes
.../structure/{tinkergraph => blueprints}/pom.xml | 4 ++--
.../machine/structure/blueprints/Blueprints.java} | 4 ++--
.../structure/blueprints/BlueprintsStructure.java} | 14 +++++++-------
.../blueprints/bytecode/BlueprintsCompiler.java} | 6 +++---
.../structure/blueprints/data/BlueprintsVertex.java} | 4 ++--
.../blueprints}/function/initial/VerticesFlatMap.java | 6 +++---
.../strategy/provider/BlueprintsVerticesStrategy.java} | 8 ++++----
java/machine/structure/pom.xml | 2 +-
java/machine/structure/tinkergraph/.DS_Store | Bin 6148 -> 0 bytes
11 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/.gitignore b/.gitignore
index ce14a15..a50e5ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
.idea/
target/
fileTemplates/
+.DS_Store
diff --git a/java/machine/structure/.DS_Store b/java/machine/structure/.DS_Store
deleted file mode 100644
index d5b57da..0000000
Binary files a/java/machine/structure/.DS_Store and /dev/null differ
diff --git a/java/machine/structure/tinkergraph/pom.xml
b/java/machine/structure/blueprints/pom.xml
similarity index 95%
rename from java/machine/structure/tinkergraph/pom.xml
rename to java/machine/structure/blueprints/pom.xml
index 99bf3d4..7afa479 100644
--- a/java/machine/structure/tinkergraph/pom.xml
+++ b/java/machine/structure/blueprints/pom.xml
@@ -21,8 +21,8 @@ limitations under the License.
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop :: Machine :: TinkerGraph</name>
- <artifactId>tinkergraph</artifactId>
+ <name>Apache TinkerPop :: Machine :: Blueprints</name>
+ <artifactId>blueprints</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/Blueprints.java
similarity index 89%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/Blueprints.java
index 58c24cd..8d57792 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/Blueprints.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph;
+package org.apache.tinkerpop.machine.structure.blueprints;
import org.apache.tinkerpop.machine.structure.Structure;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TinkerGraph implements Structure {
+public class Blueprints implements Structure {
}
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/BlueprintsStructure.java
similarity index 75%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/BlueprintsStructure.java
index 4f00303..3fda204 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/BlueprintsStructure.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph;
+package org.apache.tinkerpop.machine.structure.blueprints;
import org.apache.tinkerpop.machine.bytecode.BytecodeCompiler;
import org.apache.tinkerpop.machine.strategy.Strategy;
import org.apache.tinkerpop.machine.structure.Structure;
import org.apache.tinkerpop.machine.structure.StructureFactory;
-import
org.apache.tinkerpop.machine.structure.tinkergraph.bytecode.TinkerGraphCompiler;
-import
org.apache.tinkerpop.machine.structure.tinkergraph.strategy.provider.TinkerVerticesStrategy;
+import
org.apache.tinkerpop.machine.structure.blueprints.bytecode.BlueprintsCompiler;
+import
org.apache.tinkerpop.machine.structure.blueprints.strategy.provider.BlueprintsVerticesStrategy;
import java.util.Collections;
import java.util.Map;
@@ -33,19 +33,19 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TinkerGraphStructure implements StructureFactory {
+public class BlueprintsStructure implements StructureFactory {
@Override
public Structure mint(final Map<String, Object> configuration) {
- return new TinkerGraph();
+ return new Blueprints();
}
@Override
public Set<Strategy<?>> getStrategies() {
- return Collections.singleton(new TinkerVerticesStrategy());
+ return Collections.singleton(new BlueprintsVerticesStrategy());
}
@Override
public Optional<BytecodeCompiler> getCompiler() {
- return Optional.of(new TinkerGraphCompiler());
+ return Optional.of(new BlueprintsCompiler());
}
}
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/bytecode/BlueprintsCompiler.java
similarity index 89%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/bytecode/BlueprintsCompiler.java
index 056dfc5..0391324 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/bytecode/BlueprintsCompiler.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph.bytecode;
+package org.apache.tinkerpop.machine.structure.blueprints.bytecode;
import org.apache.tinkerpop.machine.bytecode.BytecodeCompiler;
import org.apache.tinkerpop.machine.bytecode.FunctionType;
import org.apache.tinkerpop.machine.bytecode.Instruction;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.function.CFunction;
-import
org.apache.tinkerpop.machine.structure.tinkergraph.function.initial.VerticesFlatMap;
+import
org.apache.tinkerpop.machine.structure.blueprints.function.initial.VerticesFlatMap;
import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TinkerGraphCompiler implements BytecodeCompiler {
+public class BlueprintsCompiler implements BytecodeCompiler {
@Override
public <C> CFunction<C> compile(final Instruction<C> instruction) {
final String op = instruction.op();
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/data/BlueprintsVertex.java
similarity index 94%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/data/BlueprintsVertex.java
index f9e7ce0..3970f0a 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/data/BlueprintsVertex.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph.data;
+package org.apache.tinkerpop.machine.structure.blueprints.data;
import org.apache.tinkerpop.machine.structure.data.TEdge;
import org.apache.tinkerpop.machine.structure.data.TKV;
@@ -31,7 +31,7 @@ import java.util.UUID;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TinkerVertex implements TVertex, Serializable {
+public class BlueprintsVertex implements TVertex, Serializable {
@Override
public Iterator<TEdge> inEdges() {
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/function/initial/VerticesFlatMap.java
similarity index 86%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/function/initial/VerticesFlatMap.java
index c3e21a8..376dacc 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/function/initial/VerticesFlatMap.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph.function.initial;
+package org.apache.tinkerpop.machine.structure.blueprints.function.initial;
import org.apache.tinkerpop.machine.structure.data.TVertex;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.function.AbstractFunction;
import org.apache.tinkerpop.machine.function.InitialFunction;
-import org.apache.tinkerpop.machine.structure.tinkergraph.data.TinkerVertex;
+import org.apache.tinkerpop.machine.structure.blueprints.data.BlueprintsVertex;
import org.apache.tinkerpop.machine.util.IteratorUtils;
import java.util.Iterator;
@@ -39,7 +39,7 @@ public class VerticesFlatMap<C> extends AbstractFunction<C>
implements InitialFu
@Override
public Iterator<TVertex> get() {
- return IteratorUtils.of(new TinkerVertex(), new TinkerVertex());
+ return IteratorUtils.of(new BlueprintsVertex(), new
BlueprintsVertex());
}
}
diff --git
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/provider/TinkerVerticesStrategy.java
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/strategy/provider/BlueprintsVerticesStrategy.java
similarity index 81%
rename from
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/provider/TinkerVerticesStrategy.java
rename to
java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/strategy/provider/BlueprintsVerticesStrategy.java
index 7fccf6c..19357db 100644
---
a/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/provider/TinkerVerticesStrategy.java
+++
b/java/machine/structure/blueprints/src/main/java/org/apache/tinkerpop/machine/structure/blueprints/strategy/provider/BlueprintsVerticesStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machine.structure.tinkergraph.strategy.provider;
+package org.apache.tinkerpop.machine.structure.blueprints.strategy.provider;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
@@ -24,12 +24,12 @@ import org.apache.tinkerpop.machine.bytecode.CoreCompiler;
import org.apache.tinkerpop.machine.bytecode.Instruction;
import org.apache.tinkerpop.machine.strategy.AbstractStrategy;
import org.apache.tinkerpop.machine.strategy.Strategy;
-import
org.apache.tinkerpop.machine.structure.tinkergraph.bytecode.TinkerGraphCompiler;
+import
org.apache.tinkerpop.machine.structure.blueprints.bytecode.BlueprintsCompiler;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TinkerVerticesStrategy extends
AbstractStrategy<Strategy.ProviderStrategy> implements
Strategy.ProviderStrategy {
+public class BlueprintsVerticesStrategy extends
AbstractStrategy<Strategy.ProviderStrategy> implements
Strategy.ProviderStrategy {
@Override
public <C> void apply(final Bytecode<C> bytecode) {
Instruction<C> temp = null;
@@ -38,6 +38,6 @@ public class TinkerVerticesStrategy extends
AbstractStrategy<Strategy.ProviderSt
temp = instruction;
}
if (null != temp)
- BytecodeUtil.replaceInstruction(bytecode, temp, new
Instruction<>(temp.coefficient(), TinkerGraphCompiler.Symbols.TG_V));
+ BytecodeUtil.replaceInstruction(bytecode, temp, new
Instruction<>(temp.coefficient(), BlueprintsCompiler.Symbols.TG_V));
}
}
diff --git a/java/machine/structure/pom.xml b/java/machine/structure/pom.xml
index ac124fa..1dc2c29 100644
--- a/java/machine/structure/pom.xml
+++ b/java/machine/structure/pom.xml
@@ -25,6 +25,6 @@ limitations under the License.
<name>Apache TinkerPop :: Machine :: Structure</name>
<artifactId>structure</artifactId>
<modules>
- <module>tinkergraph</module>
+ <module>blueprints</module>
</modules>
</project>
\ No newline at end of file
diff --git a/java/machine/structure/tinkergraph/.DS_Store
b/java/machine/structure/tinkergraph/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/java/machine/structure/tinkergraph/.DS_Store and /dev/null differ
