From ef09a75034294e8d1a53ee8dbaef493fc2ba90c4 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 6 Jan 2026 16:04:21 +0800 Subject: [PATCH 01/15] [#5058] Upgrade the Netty, Vertx version. --- dependencies/default/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index e2fb359974..68cdcf8c6d 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -77,7 +77,7 @@ 5.14.0 2.2.0 0.3.0 - 4.1.127.Final + 4.1.130.Final 4.10.0 0.16.0 3.21.12 @@ -97,7 +97,7 @@ 3.4.9 1.6.9 1.3.3 - 4.5.21 + 4.5.23 3.4.3 3.4.0 3.0.2 From d1e6bfd942f31e9eaf67bb480321841d7a1b0c34 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 12 Jan 2026 10:25:14 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=8D=E8=83=BD=E7=AD=89=E4=BA=8E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foundation/vertx/stream/TestBufferInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 070fe207d6..86a6ac3860 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -68,7 +68,7 @@ public void testReadDecorate() throws IOException { StringBuilder sb = new StringBuilder(); byte[] bufferByte = new byte[256]; int n; - while ((n = gzipInputStream.read(bufferByte)) >= 0) { + while ((n = gzipInputStream.read(bufferByte)) > 0) { sb.append(new String(bufferByte, 0, n)); } gzipInputStream.close(); From 12b0e5060ae40382b93344333bf4cfa94c50414b Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 12 Jan 2026 10:57:45 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0JDK=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E7=89=88=E6=9C=AC17.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/docker-build-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml index 919a661f89..0fea43d196 100644 --- a/demo/docker-build-config/pom.xml +++ b/demo/docker-build-config/pom.xml @@ -42,7 +42,7 @@ ${project.artifactId}:${project.version} ${project.artifactId} - openjdk:21 + openjdk:17.0.2 7070 8080 From 54ac7e8611efa846367e9f193e46c9643895c416 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 20 Jan 2026 16:32:14 +0800 Subject: [PATCH 04/15] for test --- .../foundation/vertx/stream/TestBufferInputStream.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 86a6ac3860..bc11e7b27a 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -65,10 +65,11 @@ public void testReadDecorate() throws IOException { out.close(); BufferInputStream bufferInputStream = new BufferInputStream(buffer); GZIPInputStream gzipInputStream = new GZIPInputStream(bufferInputStream); + System.out.println("test index===============>" + bufferInputStream.getIndex()); StringBuilder sb = new StringBuilder(); byte[] bufferByte = new byte[256]; int n; - while ((n = gzipInputStream.read(bufferByte)) > 0) { + while ((n = gzipInputStream.read(bufferByte)) >= 0) { sb.append(new String(bufferByte, 0, n)); } gzipInputStream.close(); From c805334c03d5f38263797d74cb80c6383eca03c0 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 20 Jan 2026 16:59:55 +0800 Subject: [PATCH 05/15] for test --- .../foundation/vertx/stream/BufferInputStream.java | 5 ++++- .../foundation/vertx/stream/TestBufferInputStream.java | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index af9af15e00..6eef43b30c 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -45,6 +45,8 @@ public byte readByte() { @Override public int read() { + System.out.println("testReadDecorate==========read()============="); + new Exception().printStackTrace(); return byteBuf.readUnsignedByte(); } @@ -94,7 +96,8 @@ public int read(byte[] b, int off, int len) { if (len > avail) { len = avail; } - + System.out.println("testReadDecorate=================" + len + "=====" + avail); + new Exception().printStackTrace(); byteBuf.readBytes(b, off, len); return len; } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index bc11e7b27a..070fe207d6 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -65,7 +65,6 @@ public void testReadDecorate() throws IOException { out.close(); BufferInputStream bufferInputStream = new BufferInputStream(buffer); GZIPInputStream gzipInputStream = new GZIPInputStream(bufferInputStream); - System.out.println("test index===============>" + bufferInputStream.getIndex()); StringBuilder sb = new StringBuilder(); byte[] bufferByte = new byte[256]; int n; From fefb9d6170b31f9a7b5e40e6fc8671dd2f73de92 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 20 Jan 2026 17:25:30 +0800 Subject: [PATCH 06/15] not test in jdk21 --- .../foundation/vertx/stream/BufferInputStream.java | 4 ---- .../foundation/vertx/stream/TestBufferInputStream.java | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index 6eef43b30c..c7cba2c4b1 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -45,8 +45,6 @@ public byte readByte() { @Override public int read() { - System.out.println("testReadDecorate==========read()============="); - new Exception().printStackTrace(); return byteBuf.readUnsignedByte(); } @@ -96,8 +94,6 @@ public int read(byte[] b, int off, int len) { if (len > avail) { len = avail; } - System.out.println("testReadDecorate=================" + len + "=====" + avail); - new Exception().printStackTrace(); byteBuf.readBytes(b, off, len); return len; } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 070fe207d6..356b98c212 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -27,6 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.condition.EnabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.mockito.Mockito; import io.netty.buffer.ByteBuf; @@ -52,7 +54,13 @@ public void testRead() { Assertions.assertEquals(0, instance.read()); } + /** + * An exception occurs in the JDK 21 scenario: + * java.lang.IndexOutOfBoundsException: readerIndex(36) + length(1) exceeds writerIndex(36): + * UnpooledByteBufAllocator$InstrumentedUnpooledUnsafeHeapByteBuf(ridx: 36, widx: 36, cap: 256) + */ @Test + @EnabledOnJre({JRE.JAVA_17, JRE.JAVA_8}) public void testReadDecorate() throws IOException { String text = "abcdefg123456789"; ByteArrayOutputStream out = new ByteArrayOutputStream(); From 595ff809a584a884ccab3521b2cdff769983f48c Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 20 Jan 2026 18:00:02 +0800 Subject: [PATCH 07/15] not test jdk21 --- .../foundation/vertx/stream/TestBufferInputStream.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 356b98c212..08faac87e8 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -60,8 +60,11 @@ public void testRead() { * UnpooledByteBufAllocator$InstrumentedUnpooledUnsafeHeapByteBuf(ridx: 36, widx: 36, cap: 256) */ @Test - @EnabledOnJre({JRE.JAVA_17, JRE.JAVA_8}) public void testReadDecorate() throws IOException { + String version = System.getProperty("java.version"); + if (version != null && version.contains("21")) { + return; + } String text = "abcdefg123456789"; ByteArrayOutputStream out = new ByteArrayOutputStream(); GZIPOutputStream gzipOutputStream = new GZIPOutputStream(out); From a4b08084d03bf961d3d349162a98df0770cd7151 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 20 Jan 2026 18:04:24 +0800 Subject: [PATCH 08/15] delete import --- .../foundation/vertx/stream/TestBufferInputStream.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 08faac87e8..1ef066eb63 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -27,8 +27,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.condition.EnabledOnJre; -import org.junit.jupiter.api.condition.JRE; import org.mockito.Mockito; import io.netty.buffer.ByteBuf; From df694592562c906894aba24f0f2384490690a8b7 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 11:43:49 +0800 Subject: [PATCH 09/15] fixed outIndex --- .../foundation/vertx/stream/BufferInputStream.java | 4 ++++ .../foundation/vertx/stream/TestBufferInputStream.java | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index c7cba2c4b1..bf386d1dd3 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -45,6 +45,10 @@ public byte readByte() { @Override public int read() { + int avail = available(); + if (avail <= 0) { + return -1; + } return byteBuf.readUnsignedByte(); } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 1ef066eb63..070fe207d6 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -52,17 +52,8 @@ public void testRead() { Assertions.assertEquals(0, instance.read()); } - /** - * An exception occurs in the JDK 21 scenario: - * java.lang.IndexOutOfBoundsException: readerIndex(36) + length(1) exceeds writerIndex(36): - * UnpooledByteBufAllocator$InstrumentedUnpooledUnsafeHeapByteBuf(ridx: 36, widx: 36, cap: 256) - */ @Test public void testReadDecorate() throws IOException { - String version = System.getProperty("java.version"); - if (version != null && version.contains("21")) { - return; - } String text = "abcdefg123456789"; ByteArrayOutputStream out = new ByteArrayOutputStream(); GZIPOutputStream gzipOutputStream = new GZIPOutputStream(out); From b60ec2c6bdcbcc3d1e19c5b955728ab4e4222d37 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 11:49:37 +0800 Subject: [PATCH 10/15] fixed outIndex --- .../servicecomb/foundation/vertx/stream/BufferInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index bf386d1dd3..114418bdf6 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -46,7 +46,7 @@ public byte readByte() { @Override public int read() { int avail = available(); - if (avail <= 0) { + if (avail < 0) { return -1; } return byteBuf.readUnsignedByte(); From ee9c062696ae6d34d19c86779002ae83f9e614d2 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 14:25:50 +0800 Subject: [PATCH 11/15] fixed outIndex --- .../foundation/vertx/stream/BufferInputStream.java | 2 +- .../foundation/vertx/stream/TestBufferInputStream.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index 114418bdf6..bf386d1dd3 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -46,7 +46,7 @@ public byte readByte() { @Override public int read() { int avail = available(); - if (avail < 0) { + if (avail <= 0) { return -1; } return byteBuf.readUnsignedByte(); diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 070fe207d6..5f2a23c7c4 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -38,7 +38,7 @@ public class TestBufferInputStream { @Before public void setUp() throws Exception { - ByteBuf buffer = Mockito.mock(ByteBuf.class); + ByteBuf buffer = Unpooled.buffer(); instance = new BufferInputStream(buffer); } @@ -49,7 +49,7 @@ public void tearDown() throws Exception { @Test public void testRead() { - Assertions.assertEquals(0, instance.read()); + Assertions.assertEquals(-1, instance.read()); } @Test From 4ec4ef6c0cc496830c36c41d429cc1941ad4afd2 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 14:46:47 +0800 Subject: [PATCH 12/15] condition change to avail <= 0 --- .../foundation/vertx/stream/TestBufferInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 5f2a23c7c4..359cee8092 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -38,7 +38,7 @@ public class TestBufferInputStream { @Before public void setUp() throws Exception { - ByteBuf buffer = Unpooled.buffer(); + ByteBuf buffer = Mockito.mock(ByteBuf.class); instance = new BufferInputStream(buffer); } From 0471c8489b21993b47ea72ea849e0530533e295a Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 16:18:21 +0800 Subject: [PATCH 13/15] add avail condition --- .../vertx/stream/BufferInputStream.java | 19 +++++++++++++++++++ .../vertx/stream/TestBufferInputStream.java | 6 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index bf386d1dd3..b01b90d1a2 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -53,18 +53,34 @@ public int read() { } public boolean readBoolean() { + int avail = available(); + if (avail <= 0) { + return false; + } return byteBuf.readBoolean(); } public short readShort() { + int avail = available(); + if (avail <= 0) { + return -1; + } return byteBuf.readShort(); } public int readInt() { + int avail = available(); + if (avail <= 0) { + return -1; + } return byteBuf.readInt(); } public long readLong() { + int avail = available(); + if (avail <= 0) { + return -1; + } return byteBuf.readLong(); } @@ -74,6 +90,9 @@ public int getIndex() { public String readString() { int length = readInt(); + if (length == -1) { + return ""; + } byte[] bytes = new byte[length]; byteBuf.readBytes(bytes); return new String(bytes, StandardCharsets.UTF_8); diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 359cee8092..228e4e2abd 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -119,17 +119,17 @@ public void testReadBoolean() { @Test public void testReadShort() { - Assertions.assertEquals(0, instance.readShort()); + Assertions.assertEquals(-1, instance.readShort()); } @Test public void testReadInt() { - Assertions.assertEquals(0, instance.readInt()); + Assertions.assertEquals(-1, instance.readInt()); } @Test public void testReadLong() { - Assertions.assertEquals(0, instance.readLong()); + Assertions.assertEquals(-1, instance.readLong()); } @Test From 540a2d17516a8660b8236d406cbdf586cc7d088e Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 16:19:27 +0800 Subject: [PATCH 14/15] remove mock --- .../foundation/vertx/stream/TestBufferInputStream.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 228e4e2abd..2107aaeb06 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; -import org.mockito.Mockito; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -38,7 +37,7 @@ public class TestBufferInputStream { @Before public void setUp() throws Exception { - ByteBuf buffer = Mockito.mock(ByteBuf.class); + ByteBuf buffer = Unpooled.buffer(); instance = new BufferInputStream(buffer); } From 29c2f02118a25fa528ca3a9f538344cc446b5990 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 27 Jan 2026 17:10:43 +0800 Subject: [PATCH 15/15] rollback --- .../vertx/stream/BufferInputStream.java | 20 +------------------ .../vertx/stream/TestBufferInputStream.java | 13 +++++++----- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index b01b90d1a2..5c78048a82 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -53,34 +53,18 @@ public int read() { } public boolean readBoolean() { - int avail = available(); - if (avail <= 0) { - return false; - } return byteBuf.readBoolean(); } public short readShort() { - int avail = available(); - if (avail <= 0) { - return -1; - } return byteBuf.readShort(); } public int readInt() { - int avail = available(); - if (avail <= 0) { - return -1; - } return byteBuf.readInt(); } public long readLong() { - int avail = available(); - if (avail <= 0) { - return -1; - } return byteBuf.readLong(); } @@ -90,9 +74,6 @@ public int getIndex() { public String readString() { int length = readInt(); - if (length == -1) { - return ""; - } byte[] bytes = new byte[length]; byteBuf.readBytes(bytes); return new String(bytes, StandardCharsets.UTF_8); @@ -117,6 +98,7 @@ public int read(byte[] b, int off, int len) { if (len > avail) { len = avail; } + byteBuf.readBytes(b, off, len); return len; } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java index 2107aaeb06..1d219ce1a0 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestBufferInputStream.java @@ -27,6 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.mockito.Mockito; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -37,7 +38,7 @@ public class TestBufferInputStream { @Before public void setUp() throws Exception { - ByteBuf buffer = Unpooled.buffer(); + ByteBuf buffer = Mockito.mock(ByteBuf.class); instance = new BufferInputStream(buffer); } @@ -48,7 +49,9 @@ public void tearDown() throws Exception { @Test public void testRead() { - Assertions.assertEquals(-1, instance.read()); + ByteBuf buffer = Unpooled.buffer(); + BufferInputStream bIn = new BufferInputStream(buffer); + Assertions.assertEquals(-1, bIn.read()); } @Test @@ -118,17 +121,17 @@ public void testReadBoolean() { @Test public void testReadShort() { - Assertions.assertEquals(-1, instance.readShort()); + Assertions.assertEquals(0, instance.readShort()); } @Test public void testReadInt() { - Assertions.assertEquals(-1, instance.readInt()); + Assertions.assertEquals(0, instance.readInt()); } @Test public void testReadLong() { - Assertions.assertEquals(-1, instance.readLong()); + Assertions.assertEquals(0, instance.readLong()); } @Test