Update to Netty API removal from public API

Author: vietj

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java

@@ -20,6 +20,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.db2client.impl.codec.DB2PreparedStatement.QueryInstance;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
@@ -105,7 +106,7 @@ private static Object[] sanitize(Tuple params) {
       if (val instanceof Numeric)
         val = ((Numeric) val).bigDecimalValue();
       if (val instanceof Buffer)
-        val = ((Buffer) val).getByteBuf();
+        val = ((BufferInternal) val).getByteBuf();
       inputs[i] = val;
     }
     return inputs;

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/DataType.java

@@ -16,6 +16,7 @@
 import io.netty.util.collection.IntObjectHashMap;
 import io.netty.util.collection.IntObjectMap;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.core.buffer.impl.VertxByteBufAllocator;
 
 import java.math.BigDecimal;
@@ -712,7 +713,7 @@ public Object decodeValue(ByteBuf byteBuf, TypeInfo typeInfo) {
         if (isPLPNull(payloadLength)) {
           result = null;
         } else {
-          result = Buffer.buffer(readPLP(byteBuf));
+          result = BufferInternal.buffer(readPLP(byteBuf));
         }
       } else {
         int length = byteBuf.readUnsignedShortLE();
@@ -740,7 +741,7 @@ public String paramDefinition(Object value) {
 
     @Override
     public void encodeParam(ByteBuf byteBuf, String name, boolean out, Object value) {
-      Buffer buffer = (Buffer) value;
+      BufferInternal buffer = (BufferInternal) value;
       writeParamDescription(byteBuf, name, out, id);
       if (buffer.length() > 8000) {
         byteBuf.writeShortLE(0xFFFF);
@@ -1045,7 +1046,7 @@ private static Buffer decodeBinaryValue(ByteBuf byteBuf, int length) {
     ByteBuf unpooled = Unpooled.buffer(length);
     byteBuf.readBytes(unpooled, 0, length);
     unpooled.writerIndex(length);
-    return Buffer.buffer(unpooled);
+    return BufferInternal.buffer(unpooled);
   }
 
   private static LocalDateTime decodeIntLEDateValue(ByteBuf byteBuf) {

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/datatype/DataTypeCodec.java

@@ -14,6 +14,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.DecoderException;
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
@@ -346,7 +347,7 @@ private static void binaryEncodeText(String value, ByteBuf buffer, Charset chars
 
   private static void binaryEncodeBlob(Buffer value, ByteBuf buffer) {
     BufferUtils.writeLengthEncodedInteger(buffer, value.length());
-    buffer.writeBytes(value.getByteBuf());
+    buffer.writeBytes(((BufferInternal)value).getByteBuf());
   }
 
   private static void binaryEncodeDate(LocalDate value, ByteBuf buffer) {
@@ -553,7 +554,7 @@ private static Buffer binaryDecodeBlob(ByteBuf buffer) {
     ByteBuf copy = Unpooled.buffer(len);
     copy.writeBytes(buffer, len);
 
-    return Buffer.buffer(copy);
+    return BufferInternal.buffer(copy);
   }
 
   private static String binaryDecodeText(int collationId, ByteBuf buffer) {
@@ -685,7 +686,7 @@ private static Object textDecodeBlobOrText(int collationId, ByteBuf buffer, int
   private static Buffer textDecodeBlob(ByteBuf buffer, int index, int length) {
     ByteBuf copy = Unpooled.buffer(length);
     copy.writeBytes(buffer, index, length);
-    return Buffer.buffer(copy);
+    return BufferInternal.buffer(copy);
   }
 
   private static String textDecodeText(int collationId, ByteBuf buffer, int index, int length) {

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/StringDataTypeTest.java

@@ -11,6 +11,7 @@
 
 package io.vertx.mysqlclient.data;
 
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.mysqlclient.MySQLConnection;
 import io.vertx.sqlclient.Row;
 import io.vertx.core.buffer.Buffer;
@@ -110,7 +111,7 @@ public void testTextDecodeBlob(TestContext ctx) {
   @Test
   public void testTextDecodeBlobDoesNotLeakDirectBuffer(TestContext ctx) {
     testTextDecodeGenericWithTable(ctx, "Blob", (row, columnName) -> {
-      boolean isDirectBuffer = ((Buffer) row.getValue(0)).getByteBuf().isDirect();
+      boolean isDirectBuffer = ((BufferInternal) row.getValue(0)).getByteBuf().isDirect();
       ctx.assertFalse(isDirectBuffer);
     });
   }
@@ -123,7 +124,7 @@ public void testBinaryDecodeBlob(TestContext ctx) {
   @Test
   public void testBinaryDecodeBlobDoesNotLeakDirectBuffer(TestContext ctx) {
     testBinaryDecodeGenericWithTable(ctx, "Blob", (row, columnName) -> {
-      boolean isDirectBuffer = ((Buffer) row.getValue(0)).getByteBuf().isDirect();
+      boolean isDirectBuffer = ((BufferInternal) row.getValue(0)).getByteBuf().isDirect();
       ctx.assertFalse(isDirectBuffer);
     });
   }

vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/DataTypeCodec.java

@@ -21,6 +21,7 @@
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.DecoderException;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.core.buffer.impl.VertxByteBufAllocator;
 import io.vertx.core.impl.logging.Logger;
 import io.vertx.core.impl.logging.LoggerFactory;
@@ -1165,14 +1166,14 @@ private static Buffer textDecodeBYTEA(int index, int len, ByteBuf buff) {
   }
 
   private static void binaryEncodeBYTEA(Buffer value, ByteBuf buff) {
-    ByteBuf byteBuf = value.getByteBuf();
+    ByteBuf byteBuf = ((BufferInternal)value).getByteBuf();
     buff.writeBytes(byteBuf);
   }
 
   private static Buffer binaryDecodeBYTEA(int index, int len, ByteBuf buff) {
     ByteBuf byteBuf = VertxByteBufAllocator.DEFAULT.heapBuffer(len);
     byteBuf.writeBytes(buff, index, len);
-    return Buffer.buffer(byteBuf);
+    return BufferInternal.buffer(byteBuf);
   }
 
   private static void binaryEncodeUUID(UUID uuid, ByteBuf buff) {

vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesExtendedCodecTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.pgclient.PgConnection;
 import io.vertx.sqlclient.ColumnChecker;
 import io.vertx.sqlclient.Row;
@@ -31,7 +32,7 @@ public void testBytea(TestContext ctx) {
             ColumnChecker.checkColumn(0, "Bytea")
               .returns(Tuple::getValue, Row::getValue, Buffer.buffer(bytes))
               .<Buffer>returns(Tuple::getBuffer, Row::getBuffer, buffer -> {
-                assertFalse(buffer.getByteBuf().isDirect());
+                assertFalse(((BufferInternal)buffer).getByteBuf().isDirect());
                 assertEquals(Buffer.buffer(bytes), buffer);
               })
               .forRow(result.iterator().next());

vertx-sql-client/src/main/java/io/vertx/sqlclient/Tuple.java

@@ -16,6 +16,7 @@
 import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.buffer.impl.BufferInternal;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.sqlclient.data.NullValue;
@@ -585,7 +586,7 @@ default Buffer getBuffer(int pos) {
     } else if (val instanceof Buffer) {
       return (Buffer) val;
     } else if (val instanceof ByteBuf) {
-      return Buffer.buffer((ByteBuf) val);
+      return BufferInternal.buffer((ByteBuf) val);
     } else if (val instanceof byte[]) {
       return Buffer.buffer((byte[]) val);
     } else {