fixed minor issues

Author: chernser

jdbc-v2/src/main/java/com/clickhouse/jdbc/DriverProperties.java

@@ -18,7 +18,7 @@ public enum DriverProperties {
      * JDBC allows throwing SQLException for unsupported values and methods.
      * But driver can ignore them and continue execution. Driver will do no operation in such case.
      */
-    IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", "false"),
+    IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", String.valueOf(Boolean.FALSE)),
 
     /**
      * Schema term to be used in the connection URL. Only `schema` is supported right now.
@@ -28,7 +28,7 @@ public enum DriverProperties {
     /**
      * Indicates if driver should create a secure connection over SSL/TLS
      */
-    SECURE_CONNECTION("ssl", "false"),
+    SECURE_CONNECTION("ssl", String.valueOf(Boolean.FALSE)),
 
     /**
      * Query settings to be passed along with query operation.
@@ -41,12 +41,12 @@ public enum DriverProperties {
      * PreparedStatement is used. Has limitation and can be used with a simple form of insert like;
      * {@code INSERT INTO t VALUES (?, ?, ?...)}
      */
-    BETA_ROW_BINARY_WRITER("beta.row_binary_for_simple_insert", "false"),
+    BETA_ROW_BINARY_WRITER("beta.row_binary_for_simple_insert", String.valueOf(Boolean.FALSE)),
 
     /**
      *  Enables closing result set before
      */
-    RESULTSET_AUTO_CLOSE("jdbc_resultset_auto_close", "true"),
+    RESULTSET_AUTO_CLOSE("jdbc_resultset_auto_close", String.valueOf(Boolean.FALSE)),
 
     /**
      * Enables using server property `max_result_rows` ({@link ServerSettings#MAX_RESULT_ROWS} to limit number of rows returned by query.
@@ -56,7 +56,7 @@ public enum DriverProperties {
      * this is fine. It is recommended to set limit in SQL query.
      *
      */
-    USE_MAX_RESULT_ROWS("jdbc_use_max_result_rows", "false"),
+    USE_MAX_RESULT_ROWS("jdbc_use_max_result_rows", String.valueOf(Boolean.FALSE)),
     ;
 
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

@@ -16,7 +16,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.math.BigDecimal;
-import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
@@ -58,8 +57,9 @@ public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
 
     private int fetchSize;
     private int fetchDirection;
-    final private int maxFieldSize;
-    final private int maxRows;
+    @SuppressWarnings("unused")
+    private final int maxFieldSize;
+    private final int maxRows;
 
     private Consumer<Exception> onDataTransferException;
 
@@ -114,6 +114,7 @@ public boolean next() throws SQLException {
         }
 
         if (maxRows > 0 && rowPos == maxRows) {
+            // rowPos is at current position. if we reached here it means we stepped over maxRows
             rowPos = AFTER_LAST;
             return false;
         }

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java

@@ -4,7 +4,6 @@
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.data.ClickHouseVersion;
-import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;