MySQL command messages should be named MySQLCommandMessage instead of MySQLCommandCodec for more clarity.

vietj · vietj · commit 739e6b96d83f · 2025-07-02T10:18:16.000+02:00
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java
@@ -28,9 +28,9 @@
 import io.vertx.mysqlclient.MySQLConnectOptions;
 import io.vertx.mysqlclient.SslMode;
 import io.vertx.mysqlclient.impl.codec.ClearCachedStatementsEvent;
-import io.vertx.mysqlclient.impl.codec.CommandCodec;
-import io.vertx.mysqlclient.impl.codec.ExtendedBatchQueryCommandCodec;
-import io.vertx.mysqlclient.impl.codec.ExtendedQueryCommandCodec;
+import io.vertx.mysqlclient.impl.codec.MySQLCommand;
+import io.vertx.mysqlclient.impl.codec.ExtendedBatchQueryMySQLCommand;
+import io.vertx.mysqlclient.impl.codec.ExtendedQueryMySQLCommand;
 import io.vertx.mysqlclient.impl.codec.MySQLCodec;
 import io.vertx.mysqlclient.impl.codec.MySQLPacketDecoder;
 import io.vertx.mysqlclient.impl.codec.MySQLPreparedStatement;
@@ -105,15 +105,15 @@ public void init() {
   @Override
   protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
     if (command.isBatch()) {
-      return new ExtendedBatchQueryCommandCodec<>(command, (MySQLPreparedStatement) preparedStatement);
+      return new ExtendedBatchQueryMySQLCommand<>(command, (MySQLPreparedStatement) preparedStatement);
     } else {
-      return new ExtendedQueryCommandCodec<>(command, (MySQLPreparedStatement) preparedStatement);
+      return new ExtendedQueryMySQLCommand<>(command, (MySQLPreparedStatement) preparedStatement);
     }
   }
 
   @Override
   protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
-    return CommandCodec.wrap(command);
+    return MySQLCommand.wrap(command);
   }
 
   @Override
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationMySQLCommandBase.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationMySQLCommandBase.java
@@ -22,7 +22,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-abstract class AuthenticationCommandBaseCodec<R, C extends AuthenticationCommandBase<R>> extends CommandCodec<R, C> {
+abstract class AuthenticationMySQLCommandBase<R, C extends AuthenticationCommandBase<R>> extends MySQLCommand<R, C> {
   protected static final int NONCE_LENGTH = 20;
   protected static final int AUTH_SWITCH_REQUEST_STATUS_FLAG = 0xFE;
 
@@ -35,7 +35,7 @@ abstract class AuthenticationCommandBaseCodec<R, C extends AuthenticationCommand
 
   private boolean isWaitingForRsaPublicKey = false;
 
-  AuthenticationCommandBaseCodec(C cmd) {
+  AuthenticationMySQLCommandBase(C cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserMySQLCommand.java
@@ -26,8 +26,8 @@
 import static io.vertx.mysqlclient.impl.protocol.CapabilitiesFlag.*;
 import static io.vertx.mysqlclient.impl.protocol.Packets.*;
 
-class ChangeUserCommandCodec extends AuthenticationCommandBaseCodec<Void, ChangeUserCommand> {
-  ChangeUserCommandCodec(ChangeUserCommand cmd) {
+class ChangeUserMySQLCommand extends AuthenticationMySQLCommandBase<Void, ChangeUserCommand> {
+  ChangeUserMySQLCommand(ChangeUserCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionMySQLCommand.java
@@ -15,10 +15,10 @@
 import io.vertx.mysqlclient.impl.protocol.CommandType;
 import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
 
-class CloseConnectionCommandCodec extends CommandCodec<Void, CloseConnectionCommand> {
+class CloseConnectionMySQLCommand extends MySQLCommand<Void, CloseConnectionCommand> {
   private static final int PAYLOAD_LENGTH = 1;
 
-  CloseConnectionCommandCodec(CloseConnectionCommand cmd) {
+  CloseConnectionMySQLCommand(CloseConnectionCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementMySQLCommand.java
@@ -16,10 +16,10 @@
 import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
 import io.vertx.sqlclient.codec.CommandResponse;
 
-class CloseStatementCommandCodec extends CommandCodec<Void, CloseStatementCommand> {
+class CloseStatementMySQLCommand extends MySQLCommand<Void, CloseStatementCommand> {
   private static final int PAYLOAD_LENGTH = 5;
 
-  CloseStatementCommandCodec(CloseStatementCommand cmd) {
+  CloseStatementMySQLCommand(CloseStatementCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/DebugMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/DebugMySQLCommand.java
@@ -15,10 +15,10 @@
 import io.vertx.mysqlclient.impl.command.DebugCommand;
 import io.vertx.mysqlclient.impl.protocol.CommandType;
 
-class DebugCommandCodec extends CommandCodec<Void, DebugCommand> {
+class DebugMySQLCommand extends MySQLCommand<Void, DebugCommand> {
   private static final int PAYLOAD_LENGTH = 1;
 
-  DebugCommandCodec(DebugCommand cmd) {
+  DebugMySQLCommand(DebugCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryMySQLCommand.java
@@ -25,15 +25,15 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.*;
 
-public class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
+public class ExtendedBatchQueryMySQLCommand<R> extends ExtendedQueryMySQLCommandBase<R, ExtendedQueryCommand<R>> {
 
   private final List<TupleBase> params;
   private final BitSet bindingFailures;
   private boolean pipeliningEnabled;
   private int sent;
   private int received;
 
-  public ExtendedBatchQueryCommandCodec(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
+  public ExtendedBatchQueryMySQLCommand(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
     super(cmd, statement);
     params = cmd.paramsList();
     bindingFailures = new BitSet(params.size());
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryMySQLCommand.java
@@ -26,8 +26,8 @@
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.CURSOR_TYPE_NO_CURSOR;
 import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.CURSOR_TYPE_READ_ONLY;
 
-public class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
-  public ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
+public class ExtendedQueryMySQLCommand<R> extends ExtendedQueryMySQLCommandBase<R, ExtendedQueryCommand<R>> {
+  public ExtendedQueryMySQLCommand(ExtendedQueryCommand<R> cmd, MySQLPreparedStatement statement) {
     super(cmd, statement);
     if (cmd.fetch() > 0 && statement.isCursorOpen) {
       // restore the state we need for decoding fetch response based on the prepared statement
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryMySQLCommandBase.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryMySQLCommandBase.java
@@ -21,11 +21,11 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.*;
 
-abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R>> extends QueryCommandBaseCodec<R, C> {
+abstract class ExtendedQueryMySQLCommandBase<R, C extends ExtendedQueryCommand<R>> extends QueryMySQLCommandBase<R, C> {
 
   protected final MySQLPreparedStatement statement;
 
-  ExtendedQueryCommandBaseCodec(C cmd, MySQLPreparedStatement statement) {
+  ExtendedQueryMySQLCommandBase(C cmd, MySQLPreparedStatement statement) {
     super(cmd, DataFormat.BINARY);
     this.statement = statement;
   }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitDbMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitDbMySQLCommand.java
@@ -17,8 +17,8 @@
 
 import java.nio.charset.StandardCharsets;
 
-class InitDbCommandCodec extends CommandCodec<Void, InitDbCommand> {
-  InitDbCommandCodec(InitDbCommand cmd) {
+class InitDbMySQLCommand extends MySQLCommand<Void, InitDbCommand> {
+  InitDbMySQLCommand(InitDbCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeMySQLCommand.java
@@ -36,9 +36,9 @@
 import static io.vertx.mysqlclient.impl.protocol.CapabilitiesFlag.*;
 import static io.vertx.mysqlclient.impl.protocol.Packets.*;
 
-class InitialHandshakeCommandCodec extends AuthenticationCommandBaseCodec<Connection, InitialHandshakeCommand> {
+class InitialHandshakeMySQLCommand extends AuthenticationMySQLCommandBase<Connection, InitialHandshakeCommand> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(InitialHandshakeCommandCodec.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(InitialHandshakeMySQLCommand.class);
 
   private static final int AUTH_PLUGIN_DATA_PART1_LENGTH = 8;
 
@@ -48,7 +48,7 @@ class InitialHandshakeCommandCodec extends AuthenticationCommandBaseCodec<Connec
 
   private int status = ST_CONNECTING;
 
-  InitialHandshakeCommandCodec(InitialHandshakeCommand cmd) {
+  InitialHandshakeMySQLCommand(InitialHandshakeCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java
@@ -26,7 +26,7 @@
 
 public class MySQLCodec extends CombinedChannelDuplexHandler<MySQLDecoder, MySQLEncoder> {
 
-  private final ArrayDeque<CommandCodec<?, ?>> inflight;
+  private final ArrayDeque<MySQLCommand<?, ?>> inflight;
   private ChannelHandlerContext chctx;
   private Throwable failure;
 
@@ -49,7 +49,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     super.channelInactive(ctx);
   }
 
-  public boolean add(CommandCodec<?, ?> codec) {
+  public boolean add(MySQLCommand<?, ?> codec) {
     if (failure == null) {
       inflight.add(codec);
       return true;
@@ -59,23 +59,23 @@ public boolean add(CommandCodec<?, ?> codec) {
     }
   }
 
-  public CommandCodec<?, ?> poll() {
+  public MySQLCommand<?, ?> poll() {
     return inflight.poll();
   }
 
-  public CommandCodec<?, ?> peek() {
+  public MySQLCommand<?, ?> peek() {
     return inflight.peek();
   }
 
   private void clearInflightCommands(Throwable cause) {
-    for (Iterator<CommandCodec<?, ?>> it = inflight.iterator(); it.hasNext(); ) {
-      CommandCodec<?, ?> codec = it.next();
+    for (Iterator<MySQLCommand<?, ?>> it = inflight.iterator(); it.hasNext(); ) {
+      MySQLCommand<?, ?> codec = it.next();
       it.remove();
       fail(codec, cause);
     }
   }
 
-  private void fail(CommandCodec<?, ?> codec, Throwable cause) {
+  private void fail(MySQLCommand<?, ?> codec, Throwable cause) {
     if (failure == null) {
       failure = cause;
       codec.fail(cause);
@@ -87,9 +87,9 @@ private void fail(CommandCodec<?, ?> codec, Throwable cause) {
    */
   void checkFireAndForgetCommands() {
     // check if there is any completed command
-    CommandCodec<?, ?> commandCodec;
-    while ((commandCodec = inflight.peek()) != null && commandCodec.expectNoResponsePacket()) {
-      commandCodec.decodePayload(null, 0);
+    MySQLCommand<?, ?> commandMsg;
+    while ((commandMsg = inflight.peek()) != null && commandMsg.expectNoResponsePacket()) {
+      commandMsg.decodePayload(null, 0);
     }
   }
 }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCommand.java
@@ -44,44 +44,44 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.*;
 
-public abstract class CommandCodec<R, C extends CommandBase<R>> extends CommandMessage<R, C> {
+public abstract class MySQLCommand<R, C extends CommandBase<R>> extends CommandMessage<R, C> {
 
   public Throwable failure;
   public R result;
   MySQLEncoder encoder;
   int sequenceId;
 
-  CommandCodec(C cmd) {
+  MySQLCommand(C cmd) {
     super(cmd);
   }
 
-  public static CommandCodec<?, ?> wrap(CommandBase<?> cmd) {
+  public static MySQLCommand<?, ?> wrap(CommandBase<?> cmd) {
     if (cmd instanceof InitialHandshakeCommand) {
-      return new InitialHandshakeCommandCodec((InitialHandshakeCommand) cmd);
+      return new InitialHandshakeMySQLCommand((InitialHandshakeCommand) cmd);
     } else if (cmd instanceof SimpleQueryCommand) {
-      return new SimpleQueryCommandCodec<>((SimpleQueryCommand<?>) cmd);
+      return new SimpleQueryMySQLCommand<>((SimpleQueryCommand<?>) cmd);
     } else if (cmd instanceof CloseConnectionCommand) {
-      return new CloseConnectionCommandCodec((CloseConnectionCommand) cmd);
+      return new CloseConnectionMySQLCommand((CloseConnectionCommand) cmd);
     } else if (cmd instanceof PrepareStatementCommand) {
-      return new PrepareStatementCodec((PrepareStatementCommand) cmd);
+      return new PrepareStatementMySQLCommand((PrepareStatementCommand) cmd);
     } else if (cmd instanceof CloseStatementCommand) {
-      return new CloseStatementCommandCodec((CloseStatementCommand) cmd);
+      return new CloseStatementMySQLCommand((CloseStatementCommand) cmd);
     } else if (cmd instanceof CloseCursorCommand) {
-      return new ResetStatementCommandCodec((CloseCursorCommand) cmd);
+      return new ResetStatementMySQLCommand((CloseCursorCommand) cmd);
     } else if (cmd instanceof PingCommand) {
-      return new PingCommandCodec((PingCommand) cmd);
+      return new PingMySQLCommand((PingCommand) cmd);
     } else if (cmd instanceof InitDbCommand) {
-      return new InitDbCommandCodec((InitDbCommand) cmd);
+      return new InitDbMySQLCommand((InitDbCommand) cmd);
     } else if (cmd instanceof StatisticsCommand) {
-      return new StatisticsCommandCodec((StatisticsCommand) cmd);
+      return new StatisticsMySQLCommand((StatisticsCommand) cmd);
     } else if (cmd instanceof SetOptionCommand) {
-      return new SetOptionCommandCodec((SetOptionCommand) cmd);
+      return new SetOptionMySQLCommand((SetOptionCommand) cmd);
     } else if (cmd instanceof ResetConnectionCommand) {
-      return new ResetConnectionCommandCodec((ResetConnectionCommand) cmd);
+      return new ResetConnectionMySQLCommand((ResetConnectionCommand) cmd);
     } else if (cmd instanceof DebugCommand) {
-      return new DebugCommandCodec((DebugCommand) cmd);
+      return new DebugMySQLCommand((DebugCommand) cmd);
     } else if (cmd instanceof ChangeUserCommand) {
-      return new ChangeUserCommandCodec((ChangeUserCommand) cmd);
+      return new ChangeUserMySQLCommand((ChangeUserCommand) cmd);
     } else {
       System.out.println("Unsupported command " + cmd);
       throw new UnsupportedOperationException("Todo");
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLDecoder.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLDecoder.java
@@ -61,7 +61,7 @@ private void releaseMessage() {
   private void decodePackets() {
     try {
       codec.checkFireAndForgetCommands();
-      CommandCodec<?, ?> ctx = codec.peek();
+      MySQLCommand<?, ?> ctx = codec.peek();
       if (ctx == null) {
         throw new IllegalStateException("No command codec for packet");
       }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java
@@ -41,23 +41,23 @@ public void handlerAdded(ChannelHandlerContext ctx) {
 
   @Override
   public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-    if (msg instanceof CommandCodec<?, ?>) {
-      CommandCodec<?, ?> cmd = (CommandCodec<?, ?>) msg;
+    if (msg instanceof MySQLCommand<?, ?>) {
+      MySQLCommand<?, ?> cmd = (MySQLCommand<?, ?>) msg;
       write(cmd);
       codec.checkFireAndForgetCommands();
     } else {
       super.write(ctx, msg, promise);
     }
   }
 
-  void write(CommandCodec<?, ?> cmd) {
+  void write(MySQLCommand<?, ?> cmd) {
     if (codec.add(cmd)) {
       cmd.encode(this);
     }
   }
 
   final void fireCommandResponse(CommandResponse<?> commandResponse) {
-    CommandCodec<?, ?> c = codec.poll();
+    MySQLCommand<?, ?> c = codec.poll();
     commandResponse.handler = (Completable) c.handler;
     chctx.fireChannelRead(commandResponse);
   }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingMySQLCommand.java
@@ -16,10 +16,10 @@
 import io.vertx.mysqlclient.impl.protocol.CommandType;
 import io.vertx.sqlclient.codec.CommandResponse;
 
-class PingCommandCodec extends CommandCodec<Void, PingCommand> {
+class PingMySQLCommand extends MySQLCommand<Void, PingCommand> {
   private static final int PAYLOAD_LENGTH = 1;
 
-  PingCommandCodec(PingCommand cmd) {
+  PingMySQLCommand(PingCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementMySQLCommand.java
@@ -28,14 +28,14 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.ERROR_PACKET_HEADER;
 
-class PrepareStatementCodec extends CommandCodec<PreparedStatement, PrepareStatementCommand> {
+class PrepareStatementMySQLCommand extends MySQLCommand<PreparedStatement, PrepareStatementCommand> {
 
   private CommandHandlerState commandHandlerState = CommandHandlerState.INIT;
   private long statementId;
   private int processingIndex;
   private ColumnDefinition[] paramDescs;
   private ColumnDefinition[] columnDescs;
-  PrepareStatementCodec(PrepareStatementCommand cmd) {
+  PrepareStatementMySQLCommand(PrepareStatementCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryMySQLCommandBase.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryMySQLCommandBase.java
@@ -31,7 +31,7 @@
 
 import static io.vertx.mysqlclient.impl.protocol.Packets.*;
 
-abstract class QueryCommandBaseCodec<T, C extends QueryCommandBase<T>> extends CommandCodec<Boolean, C> {
+abstract class QueryMySQLCommandBase<T, C extends QueryCommandBase<T>> extends MySQLCommand<Boolean, C> {
 
   private final DataFormat format;
 
@@ -40,7 +40,7 @@ abstract class QueryCommandBaseCodec<T, C extends QueryCommandBase<T>> extends C
   protected RowResultDecoder<?, T> decoder;
   private int currentColumn;
 
-  QueryCommandBaseCodec(C cmd, DataFormat format) {
+  QueryMySQLCommandBase(C cmd, DataFormat format) {
     super(cmd);
     this.format = format;
   }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetConnectionMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetConnectionMySQLCommand.java
@@ -15,10 +15,10 @@
 import io.vertx.mysqlclient.impl.command.ResetConnectionCommand;
 import io.vertx.mysqlclient.impl.protocol.CommandType;
 
-class ResetConnectionCommandCodec extends CommandCodec<Void, ResetConnectionCommand> {
+class ResetConnectionMySQLCommand extends MySQLCommand<Void, ResetConnectionCommand> {
   private static final int PAYLOAD_LENGTH = 1;
 
-  ResetConnectionCommandCodec(ResetConnectionCommand cmd) {
+  ResetConnectionMySQLCommand(ResetConnectionCommand cmd) {
     super(cmd);
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementMySQLCommand.java
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SetOptionMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SetOptionMySQLCommand.java
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryMySQLCommand.java
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsMySQLCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsMySQLCommand.java

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`import static io.vertx.mysqlclient.impl.protocol.CapabilitiesFlag.*;`
`27`	`27`	`import static io.vertx.mysqlclient.impl.protocol.Packets.*;`
`28`	`28`
`29`		`-class ChangeUserCommandCodec extends AuthenticationCommandBaseCodec<Void, ChangeUserCommand> {`
`30`		`- ChangeUserCommandCodec(ChangeUserCommand cmd) {`
	`29`	`+class ChangeUserMySQLCommand extends AuthenticationMySQLCommandBase<Void, ChangeUserCommand> {`
	`30`	`+ ChangeUserMySQLCommand(ChangeUserCommand cmd) {`
`31`	`31`	`super(cmd);`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`
`18`	`18`	`import java.nio.charset.StandardCharsets;`
`19`	`19`
`20`		`-class InitDbCommandCodec extends CommandCodec<Void, InitDbCommand> {`
`21`		`- InitDbCommandCodec(InitDbCommand cmd) {`
	`20`	`+class InitDbMySQLCommand extends MySQLCommand<Void, InitDbCommand> {`
	`21`	`+ InitDbMySQLCommand(InitDbCommand cmd) {`
`22`	`22`	`super(cmd);`
`23`	`23`	`}`
`24`	`24`