Address some SonarCloud code smells in new network classes

JorelAli · Jul 21, 2023 · a264fec · a264fec
1 parent 021755d
commit a264fec
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/network/FriendlyByteBuffer.java b/commandapi-core/src/main/java/dev/jorel/commandapi/network/FriendlyByteBuffer.java
@@ -28,7 +28,7 @@
 public class FriendlyByteBuffer {
 	private int readIndex = 0;
 	private int writeIndex = 0;
-	private final List<Byte> bytes = new ArrayList<>();
+	private final List<Byte> byteBuffer = new ArrayList<>();
 
 	/**
 	 * Creates a new {@link FriendlyByteBuffer} with no bytes, ready to be written to.
@@ -157,17 +157,17 @@ public boolean isWriteIndexOutOfBounds(int writeIndex) {
 	 * {@link IndexOutOfBoundsException} when accessing bytes at the write index.
 	 */
 	private void padBytesWithZerosUntilWriteIndex() {
-		if(this.writeIndex > this.bytes.size()) {
-			List<Byte> paddingZeros = Collections.nCopies(this.writeIndex - this.bytes.size(), (byte) 0);
-			this.bytes.addAll(paddingZeros);
+		if(this.writeIndex > this.byteBuffer.size()) {
+			List<Byte> paddingZeros = Collections.nCopies(this.writeIndex - this.byteBuffer.size(), (byte) 0);
+			this.byteBuffer.addAll(paddingZeros);
 		}
 	}
 
 	private IllegalStateException unexpectedByteJustRead(String message) {
 		return new IllegalStateException(
 			message + "\n" +
 			"At position " + (this.readIndex - 1) + "\n" +
-			this.bytes.subList(0, this.readIndex) + " <-- HERE " + this.bytes.subList(this.readIndex, this.writeIndex)
+			this.byteBuffer.subList(0, this.readIndex) + " <-- HERE " + this.byteBuffer.subList(this.readIndex, this.writeIndex)
 		);
 	}
 
@@ -239,7 +239,7 @@ public void resetIndices() {
 	public byte[] toByteArray() throws IllegalStateException {
 		this.checkWriteIndexIsInBounds();
 
-		return Bytes.toArray(this.bytes.subList(0, this.writeIndex));
+		return Bytes.toArray(this.byteBuffer.subList(0, this.writeIndex));
 	}
 
 	/**
@@ -252,7 +252,7 @@ public byte[] getRemainingBytes() throws IllegalStateException {
 		this.checkWriteIndexIsInBounds();
 		this.checkReadIndexIsInBounds();
 
-		return Bytes.toArray(this.bytes.subList(this.readIndex, this.writeIndex));
+		return Bytes.toArray(this.byteBuffer.subList(this.readIndex, this.writeIndex));
 	}
 
 	/**
@@ -282,10 +282,10 @@ public int countReadableBytes() {
 	public void writeByte(byte b) throws IllegalStateException {
 		this.checkWriteIndexIsInBounds();
 
-		if(this.writeIndex == this.bytes.size()) {
-			this.bytes.add(b);
+		if(this.writeIndex == this.byteBuffer.size()) {
+			this.byteBuffer.add(b);
 		} else {
-			this.bytes.set(this.writeIndex, b);
+			this.byteBuffer.set(this.writeIndex, b);
 		}
 
 		this.writeIndex++;
@@ -309,7 +309,7 @@ public void writeByte(int i) throws IllegalStateException {
 	 */
 	public byte readByte() throws IllegalStateException{
 		this.checkReadIndexIsInBounds();
-		byte b = this.bytes.get(this.readIndex);
+		byte b = this.byteBuffer.get(this.readIndex);
 
 		this.readIndex++;
 		return b;

diff --git a/...t/java/dev/jorel/commandapi/test/network/ClientToServerUpdateRequirementsPacketTests.java b/...t/java/dev/jorel/commandapi/test/network/ClientToServerUpdateRequirementsPacketTests.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class ClientToServerUpdateRequirementsPacketTests extends NetworkTestBase {
+class ClientToServerUpdateRequirementsPacketTests extends NetworkTestBase {
 
 	/*********
 	 * Setup *

diff --git a/...-test-tests/src/test/java/dev/jorel/commandapi/test/network/CommandAPIMessengerTests.java b/...-test-tests/src/test/java/dev/jorel/commandapi/test/network/CommandAPIMessengerTests.java
@@ -10,7 +10,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class CommandAPIMessengerTests extends NetworkTestBase {
+class CommandAPIMessengerTests extends NetworkTestBase {
 
 	/*********
 	 * Setup *

diff --git a/...t-test-tests/src/test/java/dev/jorel/commandapi/test/network/FriendlyByteBufferTests.java b/...t-test-tests/src/test/java/dev/jorel/commandapi/test/network/FriendlyByteBufferTests.java
@@ -11,7 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class FriendlyByteBufferTests extends TestBase {
+class FriendlyByteBufferTests extends TestBase {
 
 	/*********
 	 * Setup *

diff --git a/...sts/src/test/java/dev/jorel/commandapi/test/network/ProtocolVersionTooOldPacketTests.java b/...sts/src/test/java/dev/jorel/commandapi/test/network/ProtocolVersionTooOldPacketTests.java
@@ -9,7 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class ProtocolVersionTooOldPacketTests  extends NetworkTestBase {
+class ProtocolVersionTooOldPacketTests  extends NetworkTestBase {
 
 	/*********
 	 * Setup *

diff --git a/...kit-test-tests/src/test/java/dev/jorel/commandapi/test/network/SetVersionPacketTests.java b/...kit-test-tests/src/test/java/dev/jorel/commandapi/test/network/SetVersionPacketTests.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
-public class SetVersionPacketTests extends NetworkTestBase {
+class SetVersionPacketTests extends NetworkTestBase {
 
 	/*********
 	 * Setup *