Minor code cleanup and formatting. Fixed some issues related to a pull request that had some unintended copyright comments and bad source formatting that was missed during review. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/49668ce2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49668ce2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49668ce2 Branch: refs/heads/TINKERPOP-1130 Commit: 49668ce2e17b2e31d86594404c843e5321fe7879 Parents: 5f132eb Author: Stephen Mallette <[email protected]> Authored: Tue Dec 20 13:49:11 2016 -0500 Committer: Stephen Mallette <[email protected]> Committed: Tue Dec 20 13:49:11 2016 -0500 ---------------------------------------------------------------------- .../structure/io/gryo/kryoshim/InputShim.java | 2 ++ .../structure/io/gryo/kryoshim/OutputShim.java | 2 ++ .../kryoshim/shaded/ShadedInputAdapter.java | 5 +++ .../kryoshim/shaded/ShadedOutputAdapter.java | 8 +++-- .../io/gryo/IoRegistryAwareKryoSerializer.java | 6 ---- .../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +++++++----------- .../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +++++------------ .../unshaded/UnshadedKryoShimService.java | 6 ---- .../unshaded/UnshadedOutputAdapter.java | 35 ++++++++------------ .../unshaded/UnshadedSerializerAdapter.java | 9 +---- 10 files changed, 49 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java index 424b1bf..246fc7f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java @@ -34,5 +34,7 @@ public interface InputShim { public int readInt(); + public short readShort(); + public double readDouble(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java index e3647f3..85cba71 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java @@ -36,5 +36,7 @@ public interface OutputShim { public void writeDouble(final double d); + public void writeShort(final int s); + public void flush(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java index 29524b9..0647e0b 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java @@ -60,6 +60,11 @@ public class ShadedInputAdapter implements InputShim { } @Override + public short readShort() { + return shadedInput.readShort(); + } + + @Override public double readDouble() { return shadedInput.readDouble(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java index b05f528..5ecc0fc 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java @@ -30,8 +30,7 @@ public class ShadedOutputAdapter implements OutputShim { } @Override - public void writeByte(final byte b) - { + public void writeByte(final byte b) { shadedOutput.writeByte(b); } @@ -61,6 +60,11 @@ public class ShadedOutputAdapter implements OutputShim { } @Override + public void writeShort(int s) { + shadedOutput.writeShort(s); + } + + @Override public void flush() { shadedOutput.flush(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java index bf71fae..ec30124 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java @@ -16,12 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * <p> - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo; import com.esotericsoftware.kryo.Kryo; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java index 0f13bb2..f8177e3 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java @@ -16,35 +16,25 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded; import com.esotericsoftware.kryo.io.Input; import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim; -public class UnshadedInputAdapter implements InputShim -{ +public class UnshadedInputAdapter implements InputShim { private final Input unshadedInput; - public UnshadedInputAdapter(final Input unshadedInput) - { + public UnshadedInputAdapter(final Input unshadedInput) { this.unshadedInput = unshadedInput; } - Input getUnshadedInput() - { + Input getUnshadedInput() { return unshadedInput; } @Override - public byte readByte() - { + public byte readByte() { return unshadedInput.readByte(); } @@ -54,14 +44,12 @@ public class UnshadedInputAdapter implements InputShim } @Override - public String readString() - { + public String readString() { return unshadedInput.readString(); } @Override - public long readLong() - { + public long readLong() { return unshadedInput.readLong(); } @@ -71,8 +59,12 @@ public class UnshadedInputAdapter implements InputShim } @Override - public double readDouble() - { + public short readShort() { + return unshadedInput.readShort(); + } + + @Override + public double readDouble() { return unshadedInput.readDouble(); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java index 94918a3..f0a41eb 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java @@ -16,59 +16,45 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded; import com.esotericsoftware.kryo.Kryo; import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim; -public class UnshadedKryoAdapter implements KryoShim<UnshadedInputAdapter, UnshadedOutputAdapter> -{ +public class UnshadedKryoAdapter implements KryoShim<UnshadedInputAdapter, UnshadedOutputAdapter> { private final Kryo unshadedKryo; - public UnshadedKryoAdapter(final Kryo unshadedKryo) - { + public UnshadedKryoAdapter(final Kryo unshadedKryo) { this.unshadedKryo = unshadedKryo; } @Override - public <T> T readObject(final UnshadedInputAdapter input, final Class<T> type) - { + public <T> T readObject(final UnshadedInputAdapter input, final Class<T> type) { return unshadedKryo.readObject(input.getUnshadedInput(), type); } @Override - public Object readClassAndObject(final UnshadedInputAdapter input) - { + public Object readClassAndObject(final UnshadedInputAdapter input) { return unshadedKryo.readClassAndObject(input.getUnshadedInput()); } @Override - public void writeObject(final UnshadedOutputAdapter output, final Object object) - { + public void writeObject(final UnshadedOutputAdapter output, final Object object) { unshadedKryo.writeObject(output.getUnshadedOutput(), object); } @Override - public void writeClassAndObject(final UnshadedOutputAdapter output, final Object object) - { + public void writeClassAndObject(final UnshadedOutputAdapter output, final Object object) { unshadedKryo.writeClassAndObject(output.getUnshadedOutput(), object); } @Override - public <T> T readObjectOrNull(final UnshadedInputAdapter input, final Class<T> type) - { + public <T> T readObjectOrNull(final UnshadedInputAdapter input, final Class<T> type) { return unshadedKryo.readObjectOrNull(input.getUnshadedInput(), type); } @Override - public void writeObjectOrNull(final UnshadedOutputAdapter output, final Object object, final Class type) - { + public void writeObjectOrNull(final UnshadedOutputAdapter output, final Object object, final Class type) { unshadedKryo.writeObjectOrNull(output.getUnshadedOutput(), object, type); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java index 41e0001..1d327b2 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java @@ -16,12 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * <p> - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded; import com.esotericsoftware.kryo.Kryo; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java index 8dd8eb3..3799ee4 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java @@ -16,34 +16,24 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded; import com.esotericsoftware.kryo.io.Output; import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim; -public class UnshadedOutputAdapter implements OutputShim -{ +public class UnshadedOutputAdapter implements OutputShim { private final Output unshadedOutput; - public UnshadedOutputAdapter(final Output unshadedOutput) - { + public UnshadedOutputAdapter(final Output unshadedOutput) { this.unshadedOutput = unshadedOutput; } - Output getUnshadedOutput() - { + Output getUnshadedOutput() { return unshadedOutput; } @Override - public void writeByte(final byte b) - { + public void writeByte(final byte b) { unshadedOutput.writeByte(b); } @@ -53,14 +43,17 @@ public class UnshadedOutputAdapter implements OutputShim } @Override - public void writeString(final String s) - { + public void writeShort(int s) { + unshadedOutput.writeShort(s); + } + + @Override + public void writeString(final String s) { unshadedOutput.writeString(s); } @Override - public void writeLong(final long l) - { + public void writeLong(final long l) { unshadedOutput.writeLong(l); } @@ -70,14 +63,12 @@ public class UnshadedOutputAdapter implements OutputShim } @Override - public void writeDouble(final double d) - { + public void writeDouble(final double d) { unshadedOutput.writeDouble(d); } @Override - public void flush() - { + public void flush() { unshadedOutput.flush(); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java index a5f8b05..f2a9e0b 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java @@ -16,12 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - -/** - * Copyright DataStax, Inc. - * - * Please see the included license file for details. - */ package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded; import com.esotericsoftware.kryo.Kryo; @@ -48,8 +42,7 @@ public class UnshadedSerializerAdapter<T> extends Serializer<T> } @Override - public T read(final Kryo kryo, final Input input, final Class<T> aClass) - { + public T read(final Kryo kryo, final Input input, final Class<T> aClass) { UnshadedKryoAdapter shadedKryoAdapter = new UnshadedKryoAdapter(kryo); UnshadedInputAdapter shadedInputAdapter = new UnshadedInputAdapter(input); return serializer.read(shadedKryoAdapter, shadedInputAdapter, aClass);
