diff options
author | Eike Stepper | 2017-01-31 08:15:35 +0000 |
---|---|---|
committer | Eike Stepper | 2017-01-31 08:15:35 +0000 |
commit | 6cbc34eac0323ca3a8409b1411c3dbe28813d3cf (patch) | |
tree | de8fa983209e678b8ab8e0d2515bd953990a850f | |
parent | 4885e53c8ff29174336ef46a9759ca57b598726f (diff) | |
download | cdo-6cbc34eac0323ca3a8409b1411c3dbe28813d3cf.tar.gz cdo-6cbc34eac0323ca3a8409b1411c3dbe28813d3cf.tar.xz cdo-6cbc34eac0323ca3a8409b1411c3dbe28813d3cf.zip |
[511324] Support VarInt and VarLong serialization
https://bugs.eclipse.org/bugs/show_bug.cgi?id=511324
8 files changed, 48 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java index 0082a814f3..39985000ea 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java @@ -120,6 +120,9 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl super(delegate); } + /** + * @since 4.6 + */ public int readXInt() throws IOException { if (isXCompression()) @@ -130,6 +133,9 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl return readInt(); } + /** + * @since 4.6 + */ public long readXLong() throws IOException { if (isXCompression()) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java index 5ef8f75f55..11f37d9736 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java @@ -88,6 +88,9 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements super(delegate); } + /** + * @since 4.6 + */ public void writeXInt(int v) throws IOException { if (isXCompression()) @@ -100,6 +103,9 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements } } + /** + * @since 4.6 + */ public void writeXLong(long v) throws IOException { if (isXCompression()) diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java index 9ef625dbfc..7aa0614f55 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java @@ -98,11 +98,17 @@ public class DataInputExtender implements ExtendedDataInput, Closeable return input.readUTF(); } + /** + * @since 3.7 + */ public int readVarInt() throws IOException { return ExtendedIOUtil.readVarInt(input); } + /** + * @since 3.7 + */ public long readVarLong() throws IOException { return ExtendedIOUtil.readVarLong(input); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java index 20bfa49c5f..e04af835fe 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java @@ -96,11 +96,17 @@ public class DataOutputExtender implements ExtendedDataOutput, Closeable output.writeUTF(str); } + /** + * @since 3.7 + */ public void writeVarInt(int v) throws IOException { ExtendedIOUtil.writeVarInt(output, v); } + /** + * @since 3.7 + */ public void writeVarLong(long v) throws IOException { ExtendedIOUtil.writeVarLong(output, v); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java index ef2f3f8922..4aae19087c 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java @@ -184,11 +184,17 @@ public interface ExtendedDataInput extends DataInput return delegate.readUTF(); } + /** + * @since 3.7 + */ public int readVarInt() throws IOException { return delegate.readVarInt(); } + /** + * @since 3.7 + */ public long readVarLong() throws IOException { return delegate.readVarLong(); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java index 73f86c52f2..1234edd7fc 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java @@ -26,11 +26,17 @@ public class ExtendedDataInputStream extends DataInputStream implements Extended super(in); } + /** + * @since 3.7 + */ public int readVarInt() throws IOException { return ExtendedIOUtil.readVarInt(this); } + /** + * @since 3.7 + */ public long readVarLong() throws IOException { return ExtendedIOUtil.readVarLong(this); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java index 2ccf9074ca..57b4a9e869 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java @@ -167,11 +167,17 @@ public interface ExtendedDataOutput extends DataOutput delegate.writeUTF(str); } + /** + * @since 3.7 + */ public void writeVarInt(int v) throws IOException { delegate.writeVarInt(v); } + /** + * @since 3.7 + */ public void writeVarLong(long v) throws IOException { delegate.writeVarLong(v); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java index cf3b49d041..e6b67ce071 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java @@ -24,11 +24,17 @@ public class ExtendedDataOutputStream extends DataOutputStream implements Extend super(out); } + /** + * @since 3.7 + */ public void writeVarInt(int v) throws IOException { ExtendedIOUtil.writeVarInt(this, v); } + /** + * @since 3.7 + */ public void writeVarLong(long v) throws IOException { ExtendedIOUtil.writeVarLong(this, v); |