Improve names, tests, checks for writing and reading bytes of a long.

EsotericSoftware · Oct 17, 2023 · 029190b · 029190b
1 parent 62bcd2d
commit 029190b
Show file tree

Hide file tree

Showing 6 changed files with 1,138 additions and 1,092 deletions.
diff --git a/src/com/esotericsoftware/kryo/io/ByteBufferInput.java b/src/com/esotericsoftware/kryo/io/ByteBufferInput.java
@@ -352,7 +352,8 @@ public void readBytes (byte[] bytes, int offset, int count) throws KryoException
 		}
 	}
 
-	public long readBytesAsLong (int count) {
+	public long readLong (int count) {
+		if (count < 0 || count > 8) throw new IllegalArgumentException("count must be >= 0 and <= 8: " + count);
 		require(count);
 		position += count;
 		long bytes = byteBuffer.get();

diff --git a/src/com/esotericsoftware/kryo/io/ByteBufferOutput.java b/src/com/esotericsoftware/kryo/io/ByteBufferOutput.java
@@ -276,7 +276,8 @@ public void writeBytes (byte[] bytes, int offset, int count) throws KryoExceptio
 		}
 	}
 
-	public void writeBytesFromLong (long bytes, int count) {
+	public void writeLong (long bytes, int count) {
+		if (count < 0 || count > 8) throw new IllegalArgumentException("count must be >= 0 and <= 8: " + count);
 		require(count);
 		position += count;
 		for (int i = count - 1; i >= 0; i--) {

diff --git a/src/com/esotericsoftware/kryo/io/Input.java b/src/com/esotericsoftware/kryo/io/Input.java
@@ -374,7 +374,8 @@ public void readBytes (byte[] bytes, int offset, int count) throws KryoException
 	}
 
 	/** Reads count bytes and returns them as long, the last byte read will be the lowest byte in the long. */
-	public long readBytesAsLong (int count) {
+	public long readLong (int count) {
+		if (count < 0 || count > 8) throw new IllegalArgumentException("count must be >= 0 and <= 8: " + count);
 		require(count);
 		int p = position;
 		position = p + count;

diff --git a/src/com/esotericsoftware/kryo/io/Output.java b/src/com/esotericsoftware/kryo/io/Output.java
@@ -275,7 +275,8 @@ public void writeBytes (byte[] bytes, int offset, int count) throws KryoExceptio
 
 	/** Writes count bytes from long, the last byte written is the lowest byte from the long.
 	 *  Note the number of bytes is not written. */
-	public void writeBytesFromLong (long bytes, int count) {
+	public void writeLong (long bytes, int count) {
+		if (count < 0 || count > 8) throw new IllegalArgumentException("count must be >= 0 and <= 8: " + count);
 		require(count);
 		int p = position;
 		position = p + count;