Move the Notification class that is PG specific to vertx-pg-client

Author: vietj

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

@@ -24,7 +24,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.data.Numeric;
-import io.vertx.sqlclient.impl.codec.CommonCodec;
+import io.vertx.sqlclient.impl.Utils;
 
 import java.math.BigInteger;
 import java.nio.charset.Charset;
@@ -637,23 +637,23 @@ private static Object binaryDecodeJson(int collationId, ByteBuf buffer) {
   }
 
   private static Byte textDecodeInt8(ByteBuf buffer, int index, int length) {
-    return (byte) CommonCodec.decodeDecStringToLong(index, length, buffer);
+    return (byte) Utils.decodeDecStringToLong(index, length, buffer);
   }
 
   private static Short textDecodeInt16(ByteBuf buffer, int index, int length) {
-    return (short) CommonCodec.decodeDecStringToLong(index, length, buffer);
+    return (short) Utils.decodeDecStringToLong(index, length, buffer);
   }
 
   private static Integer textDecodeInt24(ByteBuf buffer, int index, int length) {
-    return (int) CommonCodec.decodeDecStringToLong(index, length, buffer);
+    return (int) Utils.decodeDecStringToLong(index, length, buffer);
   }
 
   private static Integer textDecodeInt32(ByteBuf buffer, int index, int length) {
-    return (int) CommonCodec.decodeDecStringToLong(index, length, buffer);
+    return (int) Utils.decodeDecStringToLong(index, length, buffer);
   }
 
   private static Long textDecodeInt64(ByteBuf buffer, int index, int length) {
-    return CommonCodec.decodeDecStringToLong(index, length, buffer);
+    return Utils.decodeDecStringToLong(index, length, buffer);
   }
 
   private static Float textDecodeFloat(int collationId, ByteBuf buffer, int index, int length) {

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Notification.java renamed to vertx-pg-client/src/main/java/io/vertx/pgclient/impl/Notification.java

@@ -15,7 +15,7 @@
  *
  */
 
-package io.vertx.sqlclient.impl;
+package io.vertx.pgclient.impl;
 
 import java.util.Objects;
 

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

@@ -29,7 +29,6 @@
 import io.vertx.pgclient.impl.codec.TxFailedEvent;
 import io.vertx.pgclient.spi.PgDriver;
 import io.vertx.sqlclient.spi.connection.Connection;
-import io.vertx.sqlclient.impl.Notification;
 import io.vertx.sqlclient.codec.SocketConnectionBase;
 import io.vertx.sqlclient.internal.SqlConnectionBase;
 

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

@@ -35,7 +35,6 @@
 import io.vertx.sqlclient.codec.CommandMessage;
 import io.vertx.sqlclient.codec.SocketConnectionBase;
 import io.vertx.sqlclient.spi.connection.Connection;
-import io.vertx.sqlclient.impl.Notification;
 import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.spi.DatabaseMetadata;

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

@@ -32,7 +32,7 @@
 import io.vertx.pgclient.impl.util.UTF8StringEndDetector;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.data.Numeric;
-import io.vertx.sqlclient.impl.codec.CommonCodec;
+import io.vertx.sqlclient.impl.Utils;
 
 import java.math.BigDecimal;
 import java.net.Inet4Address;
@@ -688,7 +688,7 @@ private static Boolean textDecodeBOOL(int index, int len, ByteBuf buff) {
   }
 
   private static Short textDecodeINT2(int index, int len, ByteBuf buff) {
-    return (short) CommonCodec.decodeDecStringToLong(index, len, buff);
+    return (short) Utils.decodeDecStringToLong(index, len, buff);
   }
 
   private static Short binaryDecodeINT2(int index, int len, ByteBuf buff) {
@@ -700,7 +700,7 @@ private static void binaryEncodeINT2(Number value, ByteBuf buff) {
   }
 
   private static Integer textDecodeINT4(int index, int len, ByteBuf buff) {
-    return (int) CommonCodec.decodeDecStringToLong(index, len, buff);
+    return (int) Utils.decodeDecStringToLong(index, len, buff);
   }
 
   private static Integer binaryDecodeINT4(int index, int len, ByteBuf buff) {
@@ -712,7 +712,7 @@ private static void binaryEncodeINT4(Number value, ByteBuf buff) {
   }
 
   private static Long textDecodeINT8(int index, int len, ByteBuf buff) {
-    return CommonCodec.decodeDecStringToLong(index, len, buff);
+    return Utils.decodeDecStringToLong(index, len, buff);
   }
 
   private static Long binaryDecodeINT8(int index, int len, ByteBuf buff) {

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

@@ -25,7 +25,7 @@
 import io.netty.util.ByteProcessor;
 import io.vertx.core.Completable;
 import io.vertx.pgclient.impl.util.Util;
-import io.vertx.sqlclient.impl.Notification;
+import io.vertx.pgclient.impl.Notification;
 import io.vertx.sqlclient.codec.CommandResponse;
 
 /**

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Utils.java

@@ -1,5 +1,6 @@
 package io.vertx.sqlclient.impl;
 
+import io.netty.buffer.ByteBuf;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonArray;
@@ -69,4 +70,34 @@ public Future<T> get() {
   public static <T> Supplier<Future<T>> singletonSupplier(T factory) {
     return () -> Future.succeededFuture(factory);
   }
+
+    /**
+     * Decode the specified {@code buff} formatted as a decimal string starting at the readable index
+     * with the specified {@code length} to a long.
+     *
+     * @param index the hex string index
+     * @param len   the hex string length
+     * @param buff  the byte buff to read from
+     * @return the decoded value as a long
+     */
+    public static long decodeDecStringToLong(int index, int len, ByteBuf buff) {
+      long value = 0;
+      if (len > 0) {
+        int to = index + len;
+        boolean neg = false;
+        if (buff.getByte(index) == '-') {
+          neg = true;
+          index++;
+        }
+        while (index < to) {
+          byte ch = buff.getByte(index++);
+          byte nibble = (byte) (ch - '0');
+          value = value * 10 + nibble;
+        }
+        if (neg) {
+          value = -value;
+        }
+      }
+      return value;
+    }
 }