You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/03/26 13:57:20 UTC
[1/4] incubator-tinkerpop git commit: Introduce the gremlin-shaded
module that houses kryo.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master cab30ca10 -> 679e7fb8d
Introduce the gremlin-shaded module that houses kryo.
Shading was introduced to gremlin-core for kryo to enable it to work with spark. Unfortunately, it created problems higher in the stack where certain modules like gremlin-driver needed access to those kryo files directly. While this seemed to work ok for Maven, intellij had many problems processing the shaded jars preventing test execution and basic compilation. Introducing gremlin-shaded provides a static jar that gremlin-core can depend on for intellij's purposes and as long as the gremlin-shaded is "removed" from intellij, things seem to work pretty well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4b6351d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4b6351d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4b6351d2
Branch: refs/heads/master
Commit: 4b6351d279bebbf7de8a3f0b7a898cf6e8a168f5
Parents: ee0af47
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 25 18:02:43 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 25 18:02:43 2015 -0400
----------------------------------------------------------------------
gremlin-core/pom.xml | 72 +------------
.../structure/io/gryo/EntrySerializer.java | 8 +-
.../structure/io/gryo/GraphSerializer.java | 8 +-
.../structure/io/gryo/GremlinClassResolver.java | 22 ++--
.../gremlin/structure/io/gryo/GryoInput.java | 53 ----------
.../gremlin/structure/io/gryo/GryoKryo.java | 46 ---------
.../gremlin/structure/io/gryo/GryoMapper.java | 20 ++--
.../gremlin/structure/io/gryo/GryoOutput.java | 57 -----------
.../gremlin/structure/io/gryo/GryoReader.java | 6 +-
.../structure/io/gryo/GryoSerializer.java | 60 -----------
.../gremlin/structure/io/gryo/GryoWriter.java | 4 +-
.../structure/io/gryo/URISerializer.java | 8 +-
.../structure/io/gryo/UUIDSerializer.java | 8 +-
.../driver/ser/GryoMessageSerializerV1d0.java | 36 +++----
.../driver/ser/JsonBuilderGryoSerializer.java | 14 +--
gremlin-shaded/pom.xml | 102 +++++++++++++++++++
pom.xml | 1 +
17 files changed, 175 insertions(+), 350 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index e449b1a..d43981f 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -26,6 +26,11 @@ limitations under the License.
<name>Gremlin Core: The Primary Components of TinkerPop3</name>
<dependencies>
<dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-shaded</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -41,27 +46,6 @@ limitations under the License.
<version>1.2</version>
</dependency>
<dependency>
- <groupId>com.esotericsoftware.kryo</groupId>
- <artifactId>kryo</artifactId>
- <!-- Update the shade plugin config whenever you change this version -->
- <version>2.24.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.esotericsoftware.minlog</groupId>
- <artifactId>minlog</artifactId>
- <!-- Update the shade plugin config whenever you change this version -->
- <version>1.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <!-- Update the shade plugin config whenever you change this version -->
- <version>2.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
<version>0.6.0</version>
@@ -122,52 +106,6 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>shade-kryo</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>com.esotericsoftware.kryo:*</include>
- <include>com.esotericsoftware.minlog:*</include>
- <include>com.esotericsoftware.reflectasm:*</include>
- <include>org.objenesis:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>com.esotericsoftware.reflectasm</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0_reflectasm</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.esotericsoftware.kryo</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.objenesis</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.objenesis_2_1</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.esotericsoftware.minlog</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.minlog_1_2</shadedPattern>
- </relocation>
- </relocations>
- <!-- false below means the shade plugin overwrites the main project artifact (the one with no classifier).
- false does *not* actually detach the main artifact, despite what the option name suggests. -->
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <minimizeJar>false</minimizeJar>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
index c9715bd..d9b07fc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import java.util.AbstractMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
index 7540d07..72a2615 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
@@ -18,10 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -34,6 +30,10 @@ 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.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
/**
* Class used to serialize graph-based objects such as vertices, edges, properties, and paths.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
index fc82fce..9dd52cf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
@@ -18,15 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.ClassResolver;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.KryoException;
-import com.esotericsoftware.kryo.Registration;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.util.IdentityObjectIntMap;
-import com.esotericsoftware.kryo.util.IntMap;
-import com.esotericsoftware.kryo.util.ObjectMap;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Property;
@@ -37,8 +28,17 @@ 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;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.ClassResolver;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.KryoException;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Registration;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.util.IdentityObjectIntMap;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.util.IntMap;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.util.ObjectMap;
+
+import static org.apache.tinkerpop.shaded.kryo_2_24_0.util.Util.getWrapperClass;
/**
* This mapper implementation of the {@code ClassResolver} helps ensure that all Vertex and Edge concrete classes
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoInput.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoInput.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoInput.java
deleted file mode 100644
index 2dbfd7b..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoInput.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import com.esotericsoftware.kryo.io.Input;
-
-import java.io.InputStream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class GryoInput extends Input {
-
- public GryoInput() {
- super();
- }
-
- public GryoInput(final int bufferSize) {
- super(bufferSize);
- }
-
- public GryoInput(final byte[] buffer) {
- super(buffer);
- }
-
- public GryoInput(final byte[] buffer, final int offset, final int count) {
- super(buffer, offset, count);
- }
-
- public GryoInput(final InputStream inputStream) {
- super(inputStream);
- }
-
- public GryoInput(final InputStream inputStream, final int bufferSize) {
- super(inputStream, bufferSize);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoKryo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoKryo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoKryo.java
deleted file mode 100644
index f42160e..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoKryo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import com.esotericsoftware.kryo.ClassResolver;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.ReferenceResolver;
-import com.esotericsoftware.kryo.StreamFactory;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class GryoKryo extends Kryo {
-
- public GryoKryo() {
- super();
- }
-
- public GryoKryo(final ReferenceResolver referenceResolver) {
- super(referenceResolver);
- }
-
- public GryoKryo(final ClassResolver classResolver, final ReferenceResolver referenceResolver) {
- super(classResolver, referenceResolver);
- }
-
- public GryoKryo(final ClassResolver classResolver, final ReferenceResolver referenceResolver, final StreamFactory streamFactory) {
- super(classResolver, referenceResolver, streamFactory);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index bcee0ee..10fec37 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -18,13 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.KryoSerializable;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.util.DefaultStreamFactory;
-import com.esotericsoftware.kryo.util.MapReferenceResolver;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
@@ -51,6 +44,13 @@ 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.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.KryoSerializable;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.util.DefaultStreamFactory;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.util.MapReferenceResolver;
import org.javatuples.Triplet;
import java.io.IOException;
@@ -88,7 +88,7 @@ import java.util.stream.Collectors;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public final class GryoMapper implements Mapper<GryoKryo> {
+public final class GryoMapper implements Mapper<Kryo> {
static final byte[] GIO = "gio".getBytes();
private final List<Triplet<Class, Function<Kryo, Serializer>, Integer>> serializationList;
private final HeaderWriter headerWriter;
@@ -114,8 +114,8 @@ public final class GryoMapper implements Mapper<GryoKryo> {
}
@Override
- public GryoKryo createMapper() {
- final GryoKryo kryo = new GryoKryo(new GremlinClassResolver(), new MapReferenceResolver(), new DefaultStreamFactory());
+ public Kryo createMapper() {
+ final Kryo kryo = new Kryo(new GremlinClassResolver(), new MapReferenceResolver(), new DefaultStreamFactory());
kryo.addDefaultSerializer(Map.Entry.class, new EntrySerializer());
kryo.setRegistrationRequired(true);
serializationList.forEach(p -> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoOutput.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoOutput.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoOutput.java
deleted file mode 100644
index e30b7d2..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoOutput.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import com.esotericsoftware.kryo.io.Output;
-
-import java.io.OutputStream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class GryoOutput extends Output {
-
- public GryoOutput() {
- super();
- }
-
- public GryoOutput(final int bufferSize) {
- super(bufferSize);
- }
-
- public GryoOutput(final int bufferSize, final int maxBufferSize) {
- super(bufferSize, maxBufferSize);
- }
-
- public GryoOutput(final byte[] buffer) {
- super(buffer);
- }
-
- public GryoOutput(final byte[] buffer, final int maxBufferSize) {
- super(buffer, maxBufferSize);
- }
-
- public GryoOutput(final OutputStream outputStream) {
- super(outputStream);
- }
-
- public GryoOutput(final OutputStream outputStream, final int bufferSize) {
- super(outputStream, bufferSize);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 596a863..9aefe43 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -18,9 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
import org.apache.tinkerpop.gremlin.process.traversal.T;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -31,6 +29,8 @@ 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.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import java.io.File;
import java.io.FileInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializer.java
deleted file mode 100644
index d8802c0..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class GryoSerializer<T> extends Serializer<T> {
-
- public GryoSerializer() {
- super();
- }
-
- public GryoSerializer(boolean acceptsNull) {
- super(acceptsNull);
- }
-
-
- public GryoSerializer(boolean acceptsNull, boolean immutable) {
- super(acceptsNull, immutable);
- }
-
-
- public abstract void write(final GryoKryo kryo, final GryoOutput output, final T object);
-
-
- public abstract T read(final GryoKryo kryo, final GryoInput input, final Class<T> type);
-
-
- @Override
- public final void write(final Kryo kryo, final Output output, final T object) {
- this.write((GryoKryo) kryo, (GryoOutput) output, object);
- }
-
- @Override
- public final T read(final Kryo kryo, final Input input, final Class<T> type) {
- return this.read((GryoKryo) kryo, (GryoInput) input, type);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index da33a3f..767f4ef 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.Output;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
@@ -27,6 +25,8 @@ 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 org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import java.io.IOException;
import java.io.OutputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
index c0c7b48..70cfb77 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
index ffcf199..e8e4eba 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
index f8ebd5a..8bfd392 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
@@ -26,11 +26,11 @@ 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.gryo.GryoInput;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoKryo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoOutput;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoSerializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
import org.javatuples.Pair;
import java.io.ByteArrayOutputStream;
@@ -51,9 +51,9 @@ import java.util.stream.Collectors;
*/
public class GryoMessageSerializerV1d0 implements MessageSerializer {
private GryoMapper gryoMapper;
- private ThreadLocal<GryoKryo> kryoThreadLocal = new ThreadLocal<GryoKryo>() {
+ private ThreadLocal<Kryo> kryoThreadLocal = new ThreadLocal<Kryo>() {
@Override
- protected GryoKryo initialValue() {
+ protected Kryo initialValue() {
return gryoMapper.createMapper();
}
};
@@ -128,7 +128,7 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
}
if (!classNameList.isEmpty()) {
- final List<Pair<Class, Function<GryoKryo, GryoSerializer>>> classList = classNameList.stream().map(serializerDefinition -> {
+ final List<Pair<Class, Function<Kryo, Serializer>>> classList = classNameList.stream().map(serializerDefinition -> {
String className;
Optional<String> serializerName;
if (serializerDefinition.contains(";")) {
@@ -145,14 +145,14 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
try {
final Class clazz = Class.forName(className);
- final GryoSerializer serializer;
+ final Serializer serializer;
if (serializerName.isPresent()) {
final Class serializerClazz = Class.forName(serializerName.get());
- serializer = (GryoSerializer) serializerClazz.newInstance();
+ serializer = (Serializer) serializerClazz.newInstance();
} else
serializer = null;
- return Pair.<Class, Function<GryoKryo, GryoSerializer>>with(clazz, kryo -> serializer);
+ return Pair.<Class, Function<Kryo, Serializer>>with(clazz, kryo -> serializer);
} catch (Exception ex) {
throw new IllegalStateException("Class could not be found", ex);
}
@@ -174,10 +174,10 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
@Override
public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
try {
- final GryoKryo kryo = kryoThreadLocal.get();
+ final Kryo kryo = kryoThreadLocal.get();
final byte[] payload = new byte[msg.readableBytes()];
msg.readBytes(payload);
- try (final GryoInput input = new GryoInput(payload)) {
+ try (final Input input = new Input(payload)) {
final Map<String, Object> responseData = (Map<String, Object>) kryo.readClassAndObject(input);
final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
@@ -213,9 +213,9 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
message.put(SerTokens.TOKEN_RESULT, result);
message.put(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null);
- final GryoKryo kryo = kryoThreadLocal.get();
+ final Kryo kryo = kryoThreadLocal.get();
try (final OutputStream baos = new ByteArrayOutputStream()) {
- final GryoOutput output = new GryoOutput(baos);
+ final Output output = new Output(baos);
kryo.writeClassAndObject(output, message);
final long size = output.total();
@@ -238,10 +238,10 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
@Override
public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
try {
- final GryoKryo kryo = kryoThreadLocal.get();
+ final Kryo kryo = kryoThreadLocal.get();
final byte[] payload = new byte[msg.readableBytes()];
msg.readBytes(payload);
- try (final GryoInput input = new GryoInput(payload)) {
+ try (final Input input = new Input(payload)) {
final Map<String, Object> requestData = (Map<String, Object>) kryo.readClassAndObject(input);
final RequestMessage.Builder builder = RequestMessage.build((String) requestData.get(SerTokens.TOKEN_OP))
.overrideRequestId((UUID) requestData.get(SerTokens.TOKEN_REQUEST))
@@ -260,9 +260,9 @@ public class GryoMessageSerializerV1d0 implements MessageSerializer {
public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
ByteBuf encodedMessage = null;
try {
- final GryoKryo kryo = kryoThreadLocal.get();
+ final Kryo kryo = kryoThreadLocal.get();
try (final OutputStream baos = new ByteArrayOutputStream()) {
- final GryoOutput output = new GryoOutput(baos);
+ final Output output = new Output(baos);
final String mimeType = serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE;
output.writeByte(mimeType.length());
output.write(mimeType.getBytes(UTF8));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
index 62f6219..3c4d46b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
@@ -20,25 +20,25 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import groovy.json.JsonBuilder;
import groovy.json.JsonSlurper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoInput;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoKryo;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoOutput;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoSerializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
+import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class JsonBuilderGryoSerializer extends GryoSerializer<JsonBuilder> {
+public class JsonBuilderGryoSerializer extends Serializer<JsonBuilder> {
final JsonSlurper slurper = new JsonSlurper();
@Override
- public void write(final GryoKryo kryo, final GryoOutput output, final JsonBuilder jsonBuilder) {
+ public void write(final Kryo kryo, final Output output, final JsonBuilder jsonBuilder) {
output.writeString(jsonBuilder.toString());
}
@Override
- public JsonBuilder read(final GryoKryo kryo, final GryoInput input, final Class<JsonBuilder> jsonBuilderClass) {
+ public JsonBuilder read(final Kryo kryo, final Input input, final Class<JsonBuilder> jsonBuilderClass) {
final String jsonString = input.readString();
return new JsonBuilder(slurper.parseText(jsonString));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
new file mode 100644
index 0000000..004ac20
--- /dev/null
+++ b/gremlin-shaded/pom.xml
@@ -0,0 +1,102 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkerpop</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>gremlin-shaded</artifactId>
+ <name>Gremlin Shaded: Hiding Some Ugly Realities</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <!-- Update the shade plugin config whenever you change this version -->
+ <version>2.24.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware.minlog</groupId>
+ <artifactId>minlog</artifactId>
+ <!-- Update the shade plugin config whenever you change this version -->
+ <version>1.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <!-- Update the shade plugin config whenever you change this version -->
+ <version>2.1</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${basedir}/target</directory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>shade-kryo</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>com.esotericsoftware.kryo:*</include>
+ <include>com.esotericsoftware.minlog:*</include>
+ <include>com.esotericsoftware.reflectasm:*</include>
+ <include>org.objenesis:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.esotericsoftware.reflectasm</pattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0_reflectasm</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.esotericsoftware.kryo</pattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.objenesis</pattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.objenesis_2_1</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.esotericsoftware.minlog</pattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.minlog_1_2</shadedPattern>
+ </relocation>
+ </relocations>
+ <!-- false below means the shade plugin overwrites the main project artifact (the one with no classifier).
+ false does *not* actually detach the main artifact, despite what the option name suggests. -->
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <minimizeJar>false</minimizeJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4b6351d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cef9e9b..30338a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@ limitations under the License.
</contributor>
</contributors>
<modules>
+ <module>gremlin-shaded</module>
<module>gremlin-core</module>
<module>gremlin-algorithm</module>
<module>gremlin-test</module>
[2/4] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/58488672
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/58488672
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/58488672
Branch: refs/heads/master
Commit: 58488672ab0fee9cc1a937402ca5eafac162a775
Parents: 4b6351d cab30ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 26 08:22:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 26 08:22:08 2015 -0400
----------------------------------------------------------------------
.../process/computer/MessageCombiner.java | 4 +-
.../computer/spark/SparkMessagePayload.java | 2 +-
.../process/computer/spark/SparkPayload.java | 14 +++---
.../computer/spark/util/SparkHelper.java | 48 ++++++++++----------
4 files changed, 35 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-tinkerpop git commit: Removed reduced dependency
setting in shading.
Posted by sp...@apache.org.
Removed reduced dependency setting in shading.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c5c368c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c5c368c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c5c368c3
Branch: refs/heads/master
Commit: c5c368c3d65a0923e7cf9776902923f93aed4fcb
Parents: 5848867
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 26 08:22:14 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 26 08:22:14 2015 -0400
----------------------------------------------------------------------
gremlin-shaded/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c5c368c3/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 004ac20..9c553ad 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -62,7 +62,7 @@ limitations under the License.
<goal>shade</goal>
</goals>
<configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>com.esotericsoftware.kryo:*</include>
@@ -74,11 +74,11 @@ limitations under the License.
<relocations>
<relocation>
<pattern>com.esotericsoftware.reflectasm</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0_reflectasm</shadedPattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.kryo</shadedPattern>
</relocation>
<relocation>
<pattern>com.esotericsoftware.kryo</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.kryo_2_24_0</shadedPattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.kryo</shadedPattern>
</relocation>
<relocation>
<pattern>org.objenesis</pattern>
[4/4] incubator-tinkerpop git commit: Renamed the kryo shading
packaging.
Posted by sp...@apache.org.
Renamed the kryo shading packaging.
It's not likely that we will host multiple kryos in this shaded jar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/679e7fb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/679e7fb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/679e7fb8
Branch: refs/heads/master
Commit: 679e7fb8decf131c5eb2a3b91c73d832be133ee4
Parents: c5c368c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 26 08:53:55 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 26 08:53:55 2015 -0400
----------------------------------------------------------------------
.../structure/io/gryo/EntrySerializer.java | 8 +++----
.../structure/io/gryo/GraphSerializer.java | 8 +++----
.../structure/io/gryo/GremlinClassResolver.java | 22 ++++++++++----------
.../gremlin/structure/io/gryo/GryoMapper.java | 14 ++++++-------
.../gremlin/structure/io/gryo/GryoReader.java | 6 +++---
.../gremlin/structure/io/gryo/GryoWriter.java | 4 ++--
.../structure/io/gryo/URISerializer.java | 8 +++----
.../structure/io/gryo/UUIDSerializer.java | 8 +++----
.../driver/ser/GryoMessageSerializerV1d0.java | 8 +++----
.../driver/ser/JsonBuilderGryoSerializer.java | 8 +++----
gremlin-shaded/pom.xml | 4 ++--
11 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
index d9b07fc..41d4fd5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/EntrySerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import java.util.AbstractMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
index 72a2615..4a849b0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GraphSerializer.java
@@ -30,10 +30,10 @@ 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.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
/**
* Class used to serialize graph-based objects such as vertices, edges, properties, and paths.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
index 9dd52cf..bdf4af6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GremlinClassResolver.java
@@ -28,17 +28,17 @@ 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.apache.tinkerpop.shaded.kryo_2_24_0.ClassResolver;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.KryoException;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Registration;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.util.IdentityObjectIntMap;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.util.IntMap;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.util.ObjectMap;
-
-import static org.apache.tinkerpop.shaded.kryo_2_24_0.util.Util.getWrapperClass;
+import org.apache.tinkerpop.shaded.kryo.ClassResolver;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.KryoException;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo.util.IdentityObjectIntMap;
+import org.apache.tinkerpop.shaded.kryo.util.IntMap;
+import org.apache.tinkerpop.shaded.kryo.util.ObjectMap;
+
+import static org.apache.tinkerpop.shaded.kryo.util.Util.getWrapperClass;
/**
* This mapper implementation of the {@code ClassResolver} helps ensure that all Vertex and Edge concrete classes
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index 10fec37..1aa4604 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -44,13 +44,13 @@ 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.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.KryoSerializable;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.util.DefaultStreamFactory;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.util.MapReferenceResolver;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.apache.tinkerpop.shaded.kryo.util.DefaultStreamFactory;
+import org.apache.tinkerpop.shaded.kryo.util.MapReferenceResolver;
import org.javatuples.Triplet;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 9aefe43..08ca97a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
import org.apache.tinkerpop.gremlin.process.traversal.T;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -29,8 +29,8 @@ 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.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import java.io.File;
import java.io.FileInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index 767f4ef..642e7d8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -25,8 +25,8 @@ 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 org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import java.io.IOException;
import java.io.OutputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
index 70cfb77..a19857d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/URISerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
index e8e4eba..0be904b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UUIDSerializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
index 8bfd392..40e23bd 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
@@ -27,10 +27,10 @@ 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.gryo.GryoMapper;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
import org.javatuples.Pair;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
index 3c4d46b..206483f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
@@ -20,10 +20,10 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import groovy.json.JsonBuilder;
import groovy.json.JsonSlurper;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Kryo;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.Serializer;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Input;
-import org.apache.tinkerpop.shaded.kryo_2_24_0.io.Output;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679e7fb8/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 9c553ad..a651fbe 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -82,11 +82,11 @@ limitations under the License.
</relocation>
<relocation>
<pattern>org.objenesis</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.objenesis_2_1</shadedPattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.objenesis</shadedPattern>
</relocation>
<relocation>
<pattern>com.esotericsoftware.minlog</pattern>
- <shadedPattern>org.apache.tinkerpop.shaded.minlog_1_2</shadedPattern>
+ <shadedPattern>org.apache.tinkerpop.shaded.minlog</shadedPattern>
</relocation>
</relocations>
<!-- false below means the shade plugin overwrites the main project artifact (the one with no classifier).