fixes tuples bytebufs

Signed-off-by: Oleh Dokuka <[email protected]>

Author: OlegDokuka

rsocket-core/src/main/java/io/rsocket/buffer/Tuple2ByteBuf.java

@@ -134,6 +134,12 @@ public ByteBuffer[] _nioBuffers(int index, int length) {
 
   @Override
   public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (length == 0) {
+      return this;
+    }
+
+    // FIXME: check twice here
     long ri = calculateRelativeIndex(index);
     index = (int) (ri & Integer.MAX_VALUE);
     switch ((int) ((ri & MASK) >>> 32L)) {
@@ -165,20 +171,22 @@ public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
   @Override
   public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) {
     ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
-    int min = Math.min(dst.length, capacity);
-    return getBytes(0, dstBuf, index, min);
+    return getBytes(index, dstBuf, dstIndex, length);
   }
 
   @Override
   public ByteBuf getBytes(int index, ByteBuffer dst) {
     ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
-    int min = Math.min(dst.limit(), capacity);
-    return getBytes(0, dstBuf, index, min);
+    return getBytes(index, dstBuf);
   }
 
   @Override
   public ByteBuf getBytes(int index, final OutputStream out, int length) throws IOException {
     checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+
     long ri = calculateRelativeIndex(index);
     index = (int) (ri & Integer.MAX_VALUE);
     switch ((int) ((ri & MASK) >>> 32L)) {
@@ -354,18 +362,12 @@ protected void deallocate() {
 
   @Override
   public String toString(Charset charset) {
-    StringBuilder builder = new StringBuilder(3);
+    StringBuilder builder = new StringBuilder(capacity);
     builder.append(one.toString(charset));
     builder.append(two.toString(charset));
     return builder.toString();
   }
 
-  @Override
-  public String toString(int index, int length, Charset charset) {
-    // TODO - make this smarter
-    return toString(charset).substring(index, length);
-  }
-
   @Override
   public String toString() {
     return "Tuple2ByteBuf{"

rsocket-core/src/main/java/io/rsocket/buffer/Tuple3ByteBuf.java

@@ -235,15 +235,13 @@ public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
   @Override
   public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) {
     ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
-    int min = Math.min(dst.length, capacity);
-    return getBytes(0, dstBuf, index, min);
+    return getBytes(index, dstBuf, dstIndex, length);
   }
 
   @Override
   public ByteBuf getBytes(int index, ByteBuffer dst) {
     ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
-    int min = Math.min(dst.limit(), capacity);
-    return getBytes(0, dstBuf, index, min);
+    return getBytes(index, dstBuf);
   }
 
   @Override
@@ -539,12 +537,6 @@ public String toString(Charset charset) {
     return builder.toString();
   }
 
-  @Override
-  public String toString(int index, int length, Charset charset) {
-    // TODO - make this smarter
-    return toString(charset).substring(index, length);
-  }
-
   @Override
   public String toString() {
     return "Tuple3ByteBuf{"