[misc] small code improvement

Author: diego Dupin

src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java

@@ -57,7 +57,7 @@ protected String preSqlCmd() {
  if (queryTimeout != 0 && canUseServerTimeout) {
  return "SET STATEMENT max_statement_time=" + queryTimeout + " FOR ";
  }
- return "";
+ return null;
  }
 
  private void executeInternal() throws SQLException {

src/main/java/org/mariadb/jdbc/client/ReadableByteBuf.java

@@ -5,7 +5,6 @@
 package org.mariadb.jdbc.client;
 
 import org.mariadb.jdbc.MariaDbBlob;
-import org.mariadb.jdbc.client.util.MutableInt;
 
 public interface ReadableByteBuf {
 
@@ -21,12 +20,10 @@ public interface ReadableByteBuf {
 
  void skip();
 
- ReadableByteBuf skip(int length);
+ void skip(int length);
 
  MariaDbBlob readBlob(int length);
 
- MutableInt getSequence();
-
  byte getByte();
 
  byte getByte(int index);

src/main/java/org/mariadb/jdbc/client/impl/StandardReadableByteBuf.java

@@ -7,16 +7,14 @@
 import java.nio.charset.StandardCharsets;
 import org.mariadb.jdbc.MariaDbBlob;
 import org.mariadb.jdbc.client.ReadableByteBuf;
-import org.mariadb.jdbc.client.util.MutableInt;
 
 public final class StandardReadableByteBuf implements ReadableByteBuf {
- private final MutableInt sequence;
+
  private int limit;
  private byte[] buf;
  private int pos;
 
- public StandardReadableByteBuf(MutableInt sequence, byte[] buf, int limit) {
- this.sequence = sequence;
+ public StandardReadableByteBuf(byte[] buf, int limit) {
  this.pos = 0;
  this.buf = buf;
  this.limit = limit;
@@ -48,20 +46,15 @@ public void skip() {
  pos++;
  }
 
- public StandardReadableByteBuf skip(int length) {
+ public void skip(int length) {
  pos += length;
- return this;
  }
 
  public MariaDbBlob readBlob(int length) {
  pos += length;
  return MariaDbBlob.safeMariaDbBlob(buf, pos - length, length);
  }
 
- public MutableInt getSequence() {
- return sequence;
- }
-
  public byte getByte() {
  return buf[pos];
  }
@@ -94,12 +87,8 @@ public int readLengthNotNull() {
  * @return current pos
  */
  public int skipIdentifier() {
- int type = (buf[pos++] & 0xff);
- if (type == 252) {
- pos += readUnsignedShort();
- return pos;
- }
- pos += type;
+ int type = buf[pos++] & 0xff;
+ pos += (type == 252) ? readUnsignedShort() : type;
  return pos;
  }
 
@@ -211,7 +200,7 @@ public StandardReadableByteBuf readLengthBuffer() {
  int len = readLengthNotNull();
  byte[] tmp = new byte[len];
  readBytes(tmp);
- return new StandardReadableByteBuf(sequence, tmp, len);
+ return new StandardReadableByteBuf(tmp, len);
  }
 
  public String readString(int length) {

src/main/java/org/mariadb/jdbc/client/result/Result.java

@@ -102,14 +102,14 @@ protected boolean readNext() throws SQLException, IOException {
  case (byte) 0xFF:
  loaded = true;
  ErrorPacket errorPacket =
- new ErrorPacket(new StandardReadableByteBuf(null, buf, buf.length), context);
+ new ErrorPacket(new StandardReadableByteBuf(buf, buf.length), context);
  throw exceptionFactory.create(
  errorPacket.getMessage(), errorPacket.getSqlState(), errorPacket.getErrorCode());
 
  case (byte) 0xFE:
  if ((context.isEofDeprecated() && buf.length < 16777215)
  || (!context.isEofDeprecated() && buf.length < 8)) {
- ReadableByteBuf readBuf = new StandardReadableByteBuf(null, buf, buf.length);
+ ReadableByteBuf readBuf = new StandardReadableByteBuf(buf, buf.length);
  readBuf.skip(); // skip header
  int serverStatus;
  int warnings;

src/main/java/org/mariadb/jdbc/client/socket/impl/PacketReader.java

@@ -176,7 +176,7 @@ public ReadableByteBuf readPacket(boolean reUsable, boolean traceEnable) throws
  } while (packetLength == MAX_PACKET_SIZE);
  }
 
- return new StandardReadableByteBuf(sequence, rawBytes, lastPacketLength);
+ return new StandardReadableByteBuf(rawBytes, lastPacketLength);
  }
 
  public MutableInt getSequence() {

src/main/java/org/mariadb/jdbc/client/socket/impl/PacketWriter.java

@@ -663,7 +663,7 @@ public void writeEmptyPacket() throws IOException {
  */
  public void flush() throws IOException {
  writeSocket(true);
- out.flush();
+
  // if buf is big, and last query doesn't use at least half of it, resize buf to default
  // value
  if (buf.length > SMALL_BUFFER_SIZE && cmdLength * 2 < buf.length) {

src/main/java/org/mariadb/jdbc/codec/RowDecoder.java

@@ -16,7 +16,7 @@
 public abstract class RowDecoder {
  protected static final int NULL_LENGTH = -1;
  private final Configuration conf;
- protected final ReadableByteBuf readBuf = new StandardReadableByteBuf(null, null, 0);
+ protected final ReadableByteBuf readBuf = new StandardReadableByteBuf(null, 0);
  protected final Column[] columns;
 
  protected int length;

src/main/java/org/mariadb/jdbc/message/client/QueryWithParametersPacket.java

@@ -45,7 +45,7 @@ public void saveParameters() {
  public int encode(Writer encoder, Context context) throws IOException, SQLException {
  encoder.initPacket();
  encoder.writeByte(0x03);
- if (!preSqlCmd.isEmpty()) encoder.writeAscii(preSqlCmd);
+ if (preSqlCmd != null) encoder.writeAscii(preSqlCmd);
  if (parser.getParamCount() == 0) {
  encoder.writeBytes(parser.getQueryParts().get(0));
  } else {

src/main/java/org/mariadb/jdbc/message/server/ColumnDefinitionPacket.java

@@ -125,7 +125,7 @@ public static ColumnDefinitionPacket create(String name, DataType type) {
  }
 
  return new ColumnDefinitionPacket(
- new StandardReadableByteBuf(null, arr, arr.length), len, type, stringPos);
+ new StandardReadableByteBuf(arr, arr.length), len, type, stringPos);
  }
 
  public String getSchema() {

src/main/java/org/mariadb/jdbc/plugin/authentication/addon/SendGssApiAuthPacket.java

@@ -64,7 +64,7 @@ public void initialize(String authenticationData, byte[] seed, Configuration con
  */
  public ReadableByteBuf process(Writer out, Reader in, Context context)
  throws IOException, SQLException {
- ReadableByteBuf buf = new StandardReadableByteBuf(in.getSequence(), seed, seed.length);
+ ReadableByteBuf buf = new StandardReadableByteBuf(seed, seed.length);
 
  final String serverSpn = buf.readStringNullEnd();
  // using provided connection string SPN if set, or if not, using to server information