Re-enable and apply the Spotless plugin for formatting

.github/workflows/reusable-build-publish.yml

@@ -27,6 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - run: git fetch --no-tags --depth=1 origin main
       - name: Setup Java with 8 and 17 toolchains
         uses: actions/setup-java@v4
         with:

buildSrc/src/main/kotlin/java-conventions.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("base-conventions")
     `java-library`
-//    id("com.diffplug.spotless")
+    id("com.diffplug.spotless")
 }
 
 repositories {
@@ -55,3 +55,22 @@ tasks.withType<Test>().configureEach {
 
     jvmArgs("-Xmx2g", "-Xms512m")
 }
+
+spotless {
+    ratchetFrom("origin/main")
+
+    format("misc") {
+        target(".gitattributes", ".gitignore")
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+
+    java {
+        target("src/main/java/**/*.java", "src/test/java/**/*.java")
+        palantirJavaFormat("2.62.0")
+        formatAnnotations()
+        importOrder()
+        removeUnusedImports()
+        licenseHeaderFile(rootProject.file("license-header.txt"))
+    }
+}

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnection.java

@@ -15,6 +15,10 @@
  */
 package com.salesforce.datacloud.jdbc.core;
 
+import static com.salesforce.datacloud.jdbc.util.Constants.LOGIN_URL;
+import static com.salesforce.datacloud.jdbc.util.Constants.USER;
+import static com.salesforce.datacloud.jdbc.util.Constants.USER_NAME;
+
 import com.salesforce.datacloud.jdbc.auth.AuthenticationSettings;
 import com.salesforce.datacloud.jdbc.auth.DataCloudTokenProcessor;
 import com.salesforce.datacloud.jdbc.auth.TokenProcessor;
@@ -30,14 +34,6 @@
 import com.salesforce.datacloud.query.v3.DataCloudQueryStatus;
 import io.grpc.ClientInterceptor;
 import io.grpc.ManagedChannelBuilder;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import salesforce.cdp.hyperdb.v1.HyperServiceGrpc;
-
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.CallableStatement;
@@ -63,10 +59,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static com.salesforce.datacloud.jdbc.util.Constants.LOGIN_URL;
-import static com.salesforce.datacloud.jdbc.util.Constants.USER;
-import static com.salesforce.datacloud.jdbc.util.Constants.USER_NAME;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 
 @Slf4j
 @Builder(access = AccessLevel.PACKAGE)
@@ -151,8 +149,6 @@ public static DataCloudConnection of(String url, Properties properties) throws S
                 .build();
     }
 
-
-
     @Override
     public Statement createStatement() {
         return createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java

@@ -15,19 +15,17 @@
  */
 package com.salesforce.datacloud.jdbc.core;
 
+import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCDateFromDateAndCalendar;
+import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCTimeFromTimeAndCalendar;
+import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCTimestampFromTimestampAndCalendar;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.protobuf.ByteString;
 import com.salesforce.datacloud.jdbc.core.listener.AsyncQueryStatusListener;
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
 import com.salesforce.datacloud.jdbc.util.ArrowUtils;
 import com.salesforce.datacloud.jdbc.util.SqlErrorCodes;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import salesforce.cdp.hyperdb.v1.QueryParam;
-import salesforce.cdp.hyperdb.v1.QueryParameterArrow;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -53,10 +51,11 @@
 import java.util.Calendar;
 import java.util.Map;
 import java.util.TimeZone;
-
-import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCDateFromDateAndCalendar;
-import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCTimeFromTimeAndCalendar;
-import static com.salesforce.datacloud.jdbc.util.DateTimeUtils.getUTCTimestampFromTimestampAndCalendar;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryParam;
+import salesforce.cdp.hyperdb.v1.QueryParameterArrow;
 
 @Slf4j
 public class DataCloudPreparedStatement extends DataCloudStatement implements PreparedStatement {

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java

@@ -15,6 +15,9 @@
  */
 package com.salesforce.datacloud.jdbc.core;
 
+import static com.salesforce.datacloud.jdbc.util.PropertiesExtensions.getIntegerOrDefault;
+import static com.salesforce.datacloud.jdbc.util.PropertiesExtensions.optional;
+
 import com.salesforce.datacloud.jdbc.core.listener.AdaptiveQueryStatusListener;
 import com.salesforce.datacloud.jdbc.core.listener.AsyncQueryStatusListener;
 import com.salesforce.datacloud.jdbc.core.listener.QueryStatusListener;
@@ -23,19 +26,15 @@
 import com.salesforce.datacloud.jdbc.util.Constants;
 import com.salesforce.datacloud.jdbc.util.SqlErrorCodes;
 import com.salesforce.datacloud.jdbc.util.Unstable;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.time.Duration;
-
-import static com.salesforce.datacloud.jdbc.util.PropertiesExtensions.getIntegerOrDefault;
-import static com.salesforce.datacloud.jdbc.util.PropertiesExtensions.optional;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 
 @Slf4j
 public class DataCloudStatement implements Statement, AutoCloseable {

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataResultSet.java

@@ -18,6 +18,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.TimeZone;
 import lombok.experimental.UtilityClass;
 import lombok.val;
 import org.apache.calcite.avatica.AvaticaResultSet;
@@ -26,11 +30,6 @@
 import org.apache.calcite.avatica.Meta;
 import org.apache.calcite.avatica.QueryState;
 
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.TimeZone;
-
 @UtilityClass
 public class MetadataResultSet {
     public static AvaticaResultSet of() throws SQLException {

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java

@@ -24,6 +24,13 @@
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
 import com.salesforce.datacloud.query.v3.DataCloudQueryStatus;
 import io.grpc.StatusRuntimeException;
+import java.sql.SQLException;
+import java.time.Duration;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -33,14 +40,6 @@
 import salesforce.cdp.hyperdb.v1.ExecuteQueryResponse;
 import salesforce.cdp.hyperdb.v1.QueryResult;
 
-import java.sql.SQLException;
-import java.time.Duration;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
 @Slf4j
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Deprecated

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java

@@ -24,17 +24,16 @@
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
 import com.salesforce.datacloud.query.v3.DataCloudQueryStatus;
 import io.grpc.StatusRuntimeException;
+import java.sql.SQLException;
+import java.time.Duration;
+import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import salesforce.cdp.hyperdb.v1.QueryResult;
 
-import java.sql.SQLException;
-import java.time.Duration;
-import java.util.stream.Stream;
-
 @Slf4j
 @Builder(access = AccessLevel.PRIVATE)
 @Deprecated

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListener.java

@@ -22,6 +22,11 @@
 import com.salesforce.datacloud.jdbc.exception.QueryExceptionHandler;
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
 import io.grpc.StatusRuntimeException;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,12 +38,6 @@
 import salesforce.cdp.hyperdb.v1.QueryResult;
 import salesforce.cdp.hyperdb.v1.QueryStatus;
 
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Stream;
-
 @Slf4j
 @Builder(access = AccessLevel.PRIVATE)
 @Deprecated

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/partial/ChunkBased.java

@@ -17,17 +17,16 @@
 
 import com.salesforce.datacloud.jdbc.core.HyperGrpcClientExecutor;
 import com.salesforce.datacloud.jdbc.util.Unstable;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import salesforce.cdp.hyperdb.v1.QueryResult;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
 @Slf4j
 @Unstable
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@@ -61,7 +60,11 @@ public static ChunkBased of(
     @Override
     public boolean hasNext() {
         if (iterator == null) {
-            log.info("Fetching chunk based query result stream. queryId={}, chunkId={}, limit={}", queryId, chunkId, limitId);
+            log.info(
+                    "Fetching chunk based query result stream. queryId={}, chunkId={}, limit={}",
+                    queryId,
+                    chunkId,
+                    limitId);
             iterator = client.getQueryResult(queryId, chunkId.getAndIncrement(), omitSchema.getAndSet(true));
         }
 
@@ -70,7 +73,11 @@ public boolean hasNext() {
         }
 
         if (chunkId.get() < limitId) {
-            log.info("Fetching new chunk based query result stream. queryId={}, chunkId={}, limit={}", queryId, chunkId, limitId);
+            log.info(
+                    "Fetching new chunk based query result stream. queryId={}, chunkId={}, limit={}",
+                    queryId,
+                    chunkId,
+                    limitId);
             iterator = client.getQueryResult(queryId, chunkId.getAndIncrement(), omitSchema.get());
         }
 

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/core/partial/DataCloudQueryPolling.java

@@ -20,6 +20,12 @@
 import com.salesforce.datacloud.jdbc.util.Unstable;
 import com.salesforce.datacloud.query.v3.DataCloudQueryStatus;
 import io.grpc.StatusRuntimeException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
@@ -30,13 +36,6 @@
 import salesforce.cdp.hyperdb.v1.HyperServiceGrpc;
 import salesforce.cdp.hyperdb.v1.QueryInfoParam;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Predicate;
-
 @Unstable
 @Slf4j
 @UtilityClass
@@ -146,7 +145,10 @@ static DataCloudQueryStatus waitForQueryStatusWithoutRetry(
             AtomicInteger times,
             Predicate<DataCloudQueryStatus> predicate) {
         times.getAndIncrement();
-        val param = QueryInfoParam.newBuilder().setQueryId(queryId).setStreaming(true).build();
+        val param = QueryInfoParam.newBuilder()
+                .setQueryId(queryId)
+                .setStreaming(true)
+                .build();
         while (Instant.now().isBefore(deadline)) {
             val info = stub.getQueryInfo(param);
             val matched = StreamUtilities.toStream(info)
@@ -161,7 +163,10 @@ static DataCloudQueryStatus waitForQueryStatusWithoutRetry(
                 return matched.get();
             }
 
-            log.info("end of info stream, starting a new one if the timeout allows. last={}, remaining={}", last.get(), remaining(deadline));
+            log.info(
+                    "end of info stream, starting a new one if the timeout allows. last={}, remaining={}",
+                    last.get(),
+                    remaining(deadline));
         }
 
         log.warn("exceeded deadline getting query info. last={}", last.get());

jdbc-core/src/main/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptor.java

@@ -19,7 +19,6 @@
 import com.salesforce.datacloud.jdbc.util.MetadataCacheUtil;
 import java.io.IOException;
 import java.net.HttpURLConnection;
-
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Interceptor;
@@ -32,8 +31,7 @@
 @Slf4j
 public class MetadataCacheInterceptor implements Interceptor {
 
-    @NonNull
-    @Override
+    @NonNull @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
         Request request = chain.request();
         Response response;