[misc] code cleaning

mariadb-corporation · Jan 14, 2020 · 71ea050 · 71ea050
1 parent ab27ba9
commit 71ea050
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 25 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/ComQuery.java b/src/main/java/org/mariadb/jdbc/internal/com/send/ComQuery.java
@@ -155,7 +155,7 @@ public static int sendRewriteCmd(
         int parameterLength = 0;
         boolean knownParameterSize = true;
         for (ParameterHolder parameter : parameters) {
-          long paramSize = parameter.getApproximateTextProtocolLength();
+          int paramSize = parameter.getApproximateTextProtocolLength();
           if (paramSize == -1) {
             knownParameterSize = false;
             break;
@@ -214,7 +214,7 @@ public static int sendRewriteCmd(
         int parameterLength = 0;
         boolean knownParameterSize = true;
         for (ParameterHolder parameter : parameters) {
-          long paramSize = parameter.getApproximateTextProtocolLength();
+          int paramSize = parameter.getApproximateTextProtocolLength();
           if (paramSize == -1) {
             knownParameterSize = false;
             break;

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/BigDecimalParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/BigDecimalParameter.java
@@ -70,7 +70,7 @@ public void writeTo(PacketOutputStream pos) throws IOException {
     pos.write(bigDecimal.toPlainString().getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return bigDecimal.toPlainString().getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/BooleanParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/BooleanParameter.java
@@ -39,7 +39,7 @@ public void writeTo(final PacketOutputStream os) throws IOException {
     os.write(value ? '1' : '0');
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 1;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ByteArrayParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ByteArrayParameter.java
@@ -80,7 +80,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return bytes.length * 2;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ByteParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ByteParameter.java
@@ -76,7 +76,7 @@ public void writeTo(final PacketOutputStream os) throws IOException {
     os.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).length();
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DateParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DateParameter.java
@@ -103,7 +103,7 @@ private byte[] dateByteFormat() {
     return sdf.format(date).getBytes();
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 16;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DefaultParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DefaultParameter.java
@@ -70,7 +70,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(defaultBytes);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 7;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DoubleParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/DoubleParameter.java
@@ -69,7 +69,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/FloatParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/FloatParameter.java
@@ -69,7 +69,7 @@ public void writeTo(final PacketOutputStream os) throws IOException {
     os.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/IntParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/IntParameter.java
@@ -69,7 +69,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/LocalTimeParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/LocalTimeParameter.java
@@ -74,7 +74,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 15;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/LongParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/LongParameter.java
@@ -69,7 +69,7 @@ public void writeTo(final PacketOutputStream os) throws IOException {
     os.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/NullParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/NullParameter.java
@@ -74,7 +74,7 @@ public void writeTo(final PacketOutputStream os) throws IOException {
     os.write(NULL);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 4;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/OffsetTimeParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/OffsetTimeParameter.java
@@ -106,7 +106,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 15;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ParameterHolder.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ParameterHolder.java
@@ -72,7 +72,7 @@ public interface ParameterHolder {
 
   void writeBinary(PacketOutputStream pos) throws IOException;
 
-  long getApproximateTextProtocolLength() throws IOException;
+  int getApproximateTextProtocolLength() throws IOException;
 
   String toString();
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ReaderParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ReaderParameter.java
@@ -102,7 +102,7 @@ public void writeTo(PacketOutputStream pos) throws IOException {
    *
    * @return approximated data length.
    */
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return -1;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/SerializableParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/SerializableParameter.java
@@ -99,7 +99,7 @@ private void writeObjectToBytes() throws IOException {
    * @return approximated data length.
    * @throws IOException if error reading stream
    */
-  public long getApproximateTextProtocolLength() throws IOException {
+  public int getApproximateTextProtocolLength() throws IOException {
     writeObjectToBytes();
     return loadedStream.length;
   }

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ShortParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ShortParameter.java
@@ -69,7 +69,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(String.valueOf(value).getBytes());
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return String.valueOf(value).getBytes().length;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/StreamParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/StreamParameter.java
@@ -102,7 +102,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
    *
    * @return approximated data length.
    */
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return -1;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/StringParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/StringParameter.java
@@ -77,7 +77,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(stringValue, true, noBackslashEscapes);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return stringValue.length() * 3;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/TimeParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/TimeParameter.java
@@ -106,7 +106,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 15;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/TimestampParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/TimestampParameter.java
@@ -106,7 +106,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 27;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ZonedDateTimeParameter.java b/src/main/java/org/mariadb/jdbc/internal/com/send/parameters/ZonedDateTimeParameter.java
@@ -102,7 +102,7 @@ public void writeTo(final PacketOutputStream pos) throws IOException {
     pos.write(QUOTE);
   }
 
-  public long getApproximateTextProtocolLength() {
+  public int getApproximateTextProtocolLength() {
     return 27;
   }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -893,7 +893,6 @@ private void executeBatchRewrite(
 
     cmdPrologue();
 
-    ParameterHolder[] parameters;
     int currentIndex = 0;
     int totalParameterList = parameterList.size();