Code linting and formatting

Use lombok, JDK 17 syntax, improve formatting, ...

Author: maximevw

CONTRIBUTING.md

@@ -95,6 +95,9 @@ Please find here some of the main coding guidelines:
 * Left braces are located at the end of the line.
 * Braces are mandatory around conditional and loops blocks.
 * Don't write more than one statement by line.
+* Use Lombok annotations for logging (with `@Slf4j`), and for getters and setters, when applicable.
+* For constructors and methods with more than 2 parameters, write them one below the other, especially if the method
+  throws an exception (avoid having `throws` clause isolated on a separate line)
 
 ### Javadoc
 

pom.xml

@@ -120,14 +120,14 @@
         <java.driver.version>4.19.1</java.driver.version>
         <jackson.version>3.0.2</jackson.version>
         <jakarta.version>3.0.0</jakarta.version>
+        <lombok.version>1.18.42</lombok.version>
         <opencsv.version>5.12.0</opencsv.version>
         <semver4j.version>6.0.0</semver4j.version>
         <!-- Versions for test dependencies -->
         <approvaltests.version>25.7.0</approvaltests.version>
         <dotenv.version>3.2.0</dotenv.version>
         <hamcrest.version>3.0</hamcrest.version>
         <junit.version>6.0.1</junit.version>
-        <lombok.version>1.18.42</lombok.version>
         <mockito.version>5.20.0</mockito.version>
         <slf4j.version>2.0.17</slf4j.version>
         <testcontainers.version>2.0.2</testcontainers.version>
@@ -219,6 +219,14 @@
             <version>${jakarta.version}</version>
         </dependency>
 
+        <!-- Lombok annotations -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>optional</scope>
+        </dependency>
+
         <!-- AWS Auth provider support -->
         <dependency>
             <groupId>software.aws.mcs</groupId>
@@ -343,13 +351,6 @@
             <version>${approvaltests.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- Lombok (used only for some tests) -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Dotenv for tests only running locally (integration with DBaaS) -->
         <dependency>
             <groupId>io.github.cdimascio</groupId>

src/main/java/com/ing/data/cassandra/jdbc/AbstractConnection.java

@@ -67,12 +67,15 @@ public CallableStatement prepareCall(final String cql) throws SQLException {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }
 
-    public CallableStatement prepareCall(final String cql, final int resultSetType, final int resultSetConcurrency)
-        throws SQLException {
+    public CallableStatement prepareCall(final String cql,
+                                         final int resultSetType,
+                                         final int resultSetConcurrency) throws SQLException {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }
 
-    public CallableStatement prepareCall(final String cql, final int resultSetType, final int resultSetConcurrency,
+    public CallableStatement prepareCall(final String cql,
+                                         final int resultSetType,
+                                         final int resultSetConcurrency,
                                          final int resultSetHoldability) throws SQLException {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }

src/main/java/com/ing/data/cassandra/jdbc/AbstractResultSet.java

@@ -38,8 +38,10 @@
 import java.sql.Wrapper;
 import java.util.Map;
 
+import static com.ing.data.cassandra.jdbc.types.DataTypeEnum.cqlName;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.NOT_SUPPORTED;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.NO_INTERFACE;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
 
 /**
  * Provides a default implementation (returning a {@link SQLFeatureNotSupportedException}) to hold the unimplemented
@@ -58,7 +60,7 @@ abstract class AbstractResultSet implements Wrapper {
      * @throws SQLException when the CQL type cannot be determined for the given column.
      */
     boolean isCqlType(final int columnIndex, @Nonnull final DataTypeEnum type) throws SQLException {
-        final String columnType = StringUtils.substringBefore(DataTypeEnum.cqlName(getCqlDataType(columnIndex)), "<");
+        final String columnType = substringBefore(cqlName(getCqlDataType(columnIndex)), "<");
         return type.cqlType.equalsIgnoreCase(columnType);
     }
 
@@ -71,7 +73,7 @@ boolean isCqlType(final int columnIndex, @Nonnull final DataTypeEnum type) throw
      * @throws SQLException when the CQL type cannot be determined for the given column.
      */
     boolean isCqlType(final String columnLabel, @Nonnull final DataTypeEnum type) throws SQLException {
-        final String columnType = StringUtils.substringBefore(DataTypeEnum.cqlName(getCqlDataType(columnLabel)), "<");
+        final String columnType = substringBefore(cqlName(getCqlDataType(columnLabel)), "<");
         return type.cqlType.equalsIgnoreCase(columnType);
     }