enable groovy formatting in airbyte-ci format config, remove spotless…

… from gradle build (#33013)

Co-authored-by: postamar <postamar@users.noreply.github.com>

airbyte-cdk/java/airbyte-cdk/build.gradle

@@ -29,12 +29,12 @@ subprojects { subproject ->
             }
         }
         // This repository is only defined and used in the context of an artifact publishing
-        // It's different from the 'airbyte-public-jars' defined in settings.graddle only in its omission 
+        // It's different from the 'airbyte-public-jars' defined in settings.graddle only in its omission
         // of the 'public' directory. Any artifacts publish here will be available in the 'airbyte-public-jars' repo
         repositories {
             maven {
                 name 'airbyte-repo'
-                url 'https://airbyte.mycloudrepo.io/repositories/airbyte-public-jars/' 
+                url 'https://airbyte.mycloudrepo.io/repositories/airbyte-public-jars/'
                 credentials {
                     username System.getenv('CLOUDREPO_USER')
                     password System.getenv('CLOUDREPO_PASSWORD')
@@ -53,10 +53,10 @@ subprojects { subproject ->
 description = "Airbyte Connector Development Kit (CDK) for Java."
 
 def recursiveTasks = [
-    'assemble', 
-    'build', 
-    'integrationTestJava', 
-    'publish', 
+    'assemble',
+    'build',
+    'integrationTestJava',
+    'publish',
     'publishToMavenLocal',
     'test',
 ]
@@ -117,4 +117,4 @@ def cleanLocalCache = tasks.register('cleanLocalCache') {
 cleanLocalCache.configure {
     dependsOn tasks.named('clean')
     dependsOn subprojects.collect { it.tasks.named('clean') }
-}
+}

airbyte-cdk/java/airbyte-cdk/core/build.gradle

@@ -90,7 +90,7 @@ dependencies {
     implementation 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
     testFixturesImplementation 'org.projectlombok:lombok:1.18.20'
-    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20' 
+    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
     testImplementation libs.junit.jupiter.system.stubs
 

airbyte-cdk/java/airbyte-cdk/db-destinations/build.gradle

@@ -79,7 +79,7 @@ dependencies {
     implementation 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
     testFixturesImplementation 'org.projectlombok:lombok:1.18.20'
-    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20' 
+    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
     implementation ('org.apache.hadoop:hadoop-common:3.3.3') {exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-reload4j'}
     implementation ('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.3') {exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-reload4j'}

airbyte-cdk/java/airbyte-cdk/db-sources/build.gradle

@@ -1,5 +1,5 @@
 import org.jsonschema2pojo.SourceType
-import org.jsoup.Jsoup;
+import org.jsoup.Jsoup
 
 buildscript {
     dependencies {
@@ -113,7 +113,7 @@ dependencies {
     implementation 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
     testFixturesImplementation 'org.projectlombok:lombok:1.18.20'
-    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20' 
+    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
     testImplementation libs.junit.jupiter.system.stubs
 

airbyte-cdk/java/airbyte-cdk/s3-destinations/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     implementation 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
     testFixturesImplementation 'org.projectlombok:lombok:1.18.20'
-    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20' 
+    testFixturesAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
     implementation ('org.apache.hadoop:hadoop-aws:3.3.3') { exclude group: 'org.slf4j', module: 'slf4j-log4j12'}
     implementation ('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.3') {exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'org.slf4j', module: 'slf4j-reload4j'}
@@ -53,4 +53,4 @@ java {
     compileTestJava {
         options.compilerArgs += "-Xlint:-try"
     }
-}
+}

airbyte-cdk/java/airbyte-cdk/typing-deduping/build.gradle

@@ -23,4 +23,4 @@ java {
     compileJava {
         options.compilerArgs.remove("-Werror")
     }
-}
+}

airbyte-integrations/connectors/destination-databricks/build.gradle

@@ -55,6 +55,6 @@ dependencies {
     }
     implementation ('org.apache.parquet:parquet-avro:1.12.0') { exclude group: 'org.slf4j', module: 'slf4j-log4j12'}
     implementation ('com.github.airbytehq:json-avro-converter:1.1.0') { exclude group: 'ch.qos.logback', module: 'logback-classic'}
-    
+
     implementation 'com.azure:azure-storage-blob:12.18.0'
 }

airbyte-integrations/connectors/destination-gcs/build.gradle

@@ -49,12 +49,3 @@ dependencies {
     testImplementation 'org.apache.commons:commons-lang3:3.11'
     testImplementation 'org.xerial.snappy:snappy-java:1.1.8.4'
 }
-
-
-
-
-
-
-
-
-

airbyte-integrations/connectors/source-bigquery/build.gradle

@@ -33,4 +33,3 @@ dependencies {
     testImplementation 'org.apache.commons:commons-lang3:3.11'
     // integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-bigquery')
 }
-

airbyte-integrations/connectors/source-db2/build.gradle

@@ -34,4 +34,3 @@ dependencies {
 
     integrationTestJavaImplementation 'org.apache.commons:commons-lang3:3.11'
 }
-

airbyte-integrations/connectors/source-mysql/build.gradle

@@ -53,4 +53,3 @@ jsonSchema2Pojo {
     includeConstructors = false
     includeSetters = true
 }
-

airbyte-integrations/connectors/source-redshift/build.gradle

@@ -37,4 +37,3 @@ dependencies {
 
 
 }
-

airbyte-integrations/connectors/source-snowflake/build.gradle

@@ -39,4 +39,3 @@ dependencies {
 
     integrationTestJavaImplementation 'org.apache.commons:commons-lang3:3.11'
 }
-

build.gradle

@@ -1,13 +1,5 @@
 import com.github.spotbugs.snom.SpotBugsTask
 
-// The buildscript block defines dependencies in order for .gradle file evaluation.
-// This is separate from application dependencies.
-// See https://stackoverflow.com/questions/17773817/purpose-of-buildscript-block-in-gradle.
-buildscript {
-    dependencies {
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.20.0'
-    }
-}
 
 plugins {
     id 'base'
@@ -107,48 +99,6 @@ rootProject.tasks.named('clean').configure {
     dependsOn cleanPythonVenv
 }
 
-// format tasks per project
-allprojects {
-
-    def createFormatTarget = { pattern ->
-        ArrayList<String> excludes = [
-            '**/build', // Ignore new build files as well as the ones ignored when running this through airbyte-ci
-            '.gradle' // Ignore the gradle version that is downloaded in the container
-        ]
-        // Build the FileTree.
-        return fileTree(dir: projectDir, include: pattern, exclude: excludes)
-    }
-
-    // Apply spotless formatting.
-    apply plugin: 'com.diffplug.spotless'
-    spotless {
-        def javaTarget = createFormatTarget('**/*.java')
-        if (!javaTarget.isEmpty()) {
-            java {
-                // See also spotless-maven-pom.xml which is used by airbyte-ci, its config should stay in sync with this one.
-                target javaTarget
-                importOrder()
-                eclipse('4.21').configFile(rootProject.file('tools/gradle/codestyle/java-google-style.xml'))
-                removeUnusedImports()
-                trimTrailingWhitespace()
-            }
-        }
-        def groovyGradleTarget = createFormatTarget('**/*.gradle')
-        if (!groovyGradleTarget.isEmpty()) {
-            groovyGradle {
-                target groovyGradleTarget
-            }
-        }
-    }
-
-    if (rootProject.ext.skipSlowTests) {
-        // Format checks should be run via airbyte-ci.
-        tasks.matching { it.name =~ /spotless.*Check/ }.configureEach {
-            enabled = false
-        }
-    }
-}
-
 
 def getCDKTargetVersion() {
     def props = new Properties()

buildSrc/build.gradle

@@ -22,4 +22,4 @@ dependencies {
 
 tasks.withType(Jar).configureEach {
     duplicatesStrategy DuplicatesStrategy.INCLUDE
-}
+}

buildSrc/src/main/groovy/airbyte-docker-legacy.gradle

@@ -1,4 +1,7 @@
+import java.nio.file.Paths
+import java.security.MessageDigest
 import java.util.concurrent.ConcurrentHashMap
+import org.apache.commons.text.StringSubstitutor
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
@@ -14,11 +17,6 @@ import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 
-import java.security.MessageDigest
-import java.nio.file.Paths
-
-import org.apache.commons.text.StringSubstitutor
-
 /**
  * AirbyteDockerLegacyTask is the task which builds a docker image based on a Dockerfile.
  *

buildSrc/src/main/groovy/airbyte-java-cdk.gradle

@@ -2,10 +2,10 @@
 This class facilites detecting the Java CDK target version via readCdkTargetVersion().
 */
 
+import java.util.Properties
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
-import java.util.Properties
 
 class AirbyteJavaCdkPlugin implements Plugin<Project> {
 
@@ -24,35 +24,35 @@ class AirbyteJavaCdkPlugin implements Plugin<Project> {
         project.ext.getCdkTargetVersion = {
             return readCdkTargetVersion(project)
         }
-        project.getTasks().create("disableLocalCdkRefs", DisableLocalCdkRefsTask.class);
-        project.getTasks().create("assertNotUsingLocalCdk", AssertNotUsingLocalCdkTask.class);
+        project.getTasks().create("disableLocalCdkRefs", DisableLocalCdkRefsTask.class)
+        project.getTasks().create("assertNotUsingLocalCdk", AssertNotUsingLocalCdkTask.class)
     }
 
     public static class DisableLocalCdkRefsTask extends DefaultTask {
         @TaskAction
         public void disableLocalCdkRefs() {
             // Step through the project tree and set useLocalCdk to false on all connectors
             getProject().fileTree(dir: '.', include: '**/build.gradle').forEach(file -> {
-                String content = file.getText();
+                String content = file.getText()
                 if (content.contains("useLocalCdk = true")) {
-                    content = content.replace("useLocalCdk = true", "useLocalCdk = false");
-                    file.setText(content);
-                    System.out.println("Updated " + file.getPath());
+                    content = content.replace("useLocalCdk = true", "useLocalCdk = false")
+                    file.setText(content)
+                    System.out.println("Updated " + file.getPath())
                 }
-            });
+            })
         }
     }
 
     public static class AssertNotUsingLocalCdkTask extends DefaultTask {
         @TaskAction
         public void assertNotUsingLocalCdk() {
-            List<String> foundPaths = new ArrayList<>();
+            List<String> foundPaths = new ArrayList<>()
 
             for (File file : getProject().fileTree(dir: '.', include: '**/build.gradle')) {
-                String content = file.getText();
+                String content = file.getText()
                 if (content.contains("useLocalCdk = true")) {
-                    System.err.println("Found usage of 'useLocalCdk = true' in " + file.getPath());
-                    foundPaths.add(file.getPath());
+                    System.err.println("Found usage of 'useLocalCdk = true' in " + file.getPath())
+                    foundPaths.add(file.getPath())
                 }
             }
 
@@ -62,8 +62,8 @@ class AirbyteJavaCdkPlugin implements Plugin<Project> {
                     "This must be set to 'false' before merging to the main branch. \n" +
                     "NOTE: You can run './gradlew disableLocalCdkRefs' to automatically set it to 'false' on all projects.",
                     String.join("\n", foundPaths)
-                );
-                throw new RuntimeException(errorMessage);
+                )
+                throw new RuntimeException(errorMessage)
             }
         }
     }

buildSrc/src/main/groovy/airbyte-python.gradle

@@ -183,4 +183,3 @@ class AirbytePythonPlugin implements Plugin<Project> {
         }
     }
 }
-

spotless-maven-pom.xml

@@ -39,12 +39,10 @@
                             <includes>
                                 <include>**/*.gradle</include>
                             </includes>
-                            <!-- TODO enable a better gradle formatting config
                             <importOrder />
                             <removeSemicolons />
                             <trimTrailingWhitespace />
                             <endWithNewline />
-                            -->
                         </groovy>
                     </configuration>
                 </plugin>