From 841968ec74439f3062723766320d5920b7ea6e0d Mon Sep 17 00:00:00 2001
From: Harsh Verma <harsh.verma@slack-corp.com>
Date: Fri, 24 Oct 2025 12:09:15 -0700
Subject: [PATCH 1/2] Exclude generated code from spotless

---
 build.gradle                                      | 14 ++------------
 entity-registry/build.gradle                      |  2 --
 entity-registry/custom-test-model/build.gradle    |  2 --
 metadata-service/restli-servlet-impl/build.gradle |  3 ---
 test-models/build.gradle                          |  3 +--
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 566c2f4a8f0bd2..85a203c3737996 100644
--- a/build.gradle
+++ b/build.gradle
@@ -530,6 +530,8 @@ subprojects {
           exclude 'src/**/resources/'
           exclude 'src/**/generated/'
           exclude 'src/**/mainGeneratedDataTemplate/'
+          exclude 'src/**/mainGeneratedAvroSchema/'
+          exclude 'src/**/generatedJsonSchema/'
           exclude 'src/**/mainGeneratedRest/'
           exclude 'src/renamed/avro/'
           exclude 'src/test/sample-test-plugins/'
@@ -568,18 +570,6 @@ subprojects {
         }
       }
     }
-
-    afterEvaluate {
-      def spotlessJavaTask = tasks.findByName('spotlessJava')
-      def processTask = tasks.findByName('processResources')
-      if (processTask != null) {
-        spotlessJavaTask.dependsOn processTask
-      }
-      def compileJavaTask = tasks.findByName('compileJava')
-      if (compileJavaTask != null) {
-        spotlessJavaTask.dependsOn compileJavaTask
-      }
-    }
   }
 
   afterEvaluate {
diff --git a/entity-registry/build.gradle b/entity-registry/build.gradle
index 6a0ea4d7105aea..fabc4e069cb15c 100644
--- a/entity-registry/build.gradle
+++ b/entity-registry/build.gradle
@@ -56,5 +56,3 @@ dependencies {
   testFixturesAnnotationProcessor externalDependency.lombok
 }
 compileTestJava.dependsOn tasks.getByPath(':entity-registry:custom-test-model:modelDeploy')
-
-spotlessJava.dependsOn generateTestDataTemplate
\ No newline at end of file
diff --git a/entity-registry/custom-test-model/build.gradle b/entity-registry/custom-test-model/build.gradle
index c4303691360b9c..8e17de0709188b 100644
--- a/entity-registry/custom-test-model/build.gradle
+++ b/entity-registry/custom-test-model/build.gradle
@@ -78,8 +78,6 @@ configurations {
     }
 }
 
-spotlessJava.dependsOn generateTestDataTemplate
-
 //artifacts {
 //   builtModels(modelArtifact)
 //}
diff --git a/metadata-service/restli-servlet-impl/build.gradle b/metadata-service/restli-servlet-impl/build.gradle
index fc45653974d602..bd26e08ffa7b47 100644
--- a/metadata-service/restli-servlet-impl/build.gradle
+++ b/metadata-service/restli-servlet-impl/build.gradle
@@ -107,6 +107,3 @@ pegasus.main.idlOptions.addIdlItem([
 ])
 
 ext.apiProject = project(':metadata-service:restli-api')
-
-spotlessJava.dependsOn generateTestDataTemplate
-spotlessJava.dependsOn generateIntegTestDataTemplate
diff --git a/test-models/build.gradle b/test-models/build.gradle
index 89bf4ec445440d..3cb7793605609e 100644
--- a/test-models/build.gradle
+++ b/test-models/build.gradle
@@ -17,5 +17,4 @@ idea {
   }
 }
 
-sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/')
-spotlessJava.dependsOn generateTestDataTemplate
\ No newline at end of file
+sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/')
\ No newline at end of file

From d1795e8fc1de4d5fe0622bf84a2fb30d16f73532 Mon Sep 17 00:00:00 2001
From: Harsh Verma <harsh.verma@slack-corp.com>
Date: Sun, 26 Oct 2025 11:45:55 -0700
Subject: [PATCH 2/2] Fix few gradle build files to exclude generated code from
 spotless plugin

---
 build.gradle                             | 1 +
 datahub-graphql-core/build.gradle        | 5 -----
 metadata-events/mxe-schemas/build.gradle | 6 +++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 85a203c3737996..750b88226fec2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -531,6 +531,7 @@ subprojects {
           exclude 'src/**/generated/'
           exclude 'src/**/mainGeneratedDataTemplate/'
           exclude 'src/**/mainGeneratedAvroSchema/'
+          exclude 'src/**/mainGeneratedGraphQL/'
           exclude 'src/**/generatedJsonSchema/'
           exclude 'src/**/mainGeneratedRest/'
           exclude 'src/renamed/avro/'
diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle
index f7024d16d7f491..6151af72fb65cc 100644
--- a/datahub-graphql-core/build.gradle
+++ b/datahub-graphql-core/build.gradle
@@ -57,11 +57,6 @@ clean {
     delete 'src/mainGeneratedGraphQL'
 }
 
-tasks.withType(Checkstyle) {
-    exclude "**/generated/**"
-}
-
 compileJava.dependsOn 'graphqlCodegen'
 build.dependsOn ':datahub-web-react:graphqlPrettierCheck'
-spotlessApply.dependsOn ':datahub-web-react:graphqlPrettierWrite'
 sourceSets.main.java.srcDir "$projectDir/src/mainGeneratedGraphQL/java"
diff --git a/metadata-events/mxe-schemas/build.gradle b/metadata-events/mxe-schemas/build.gradle
index 2d6284dadb2622..49351516e5f854 100644
--- a/metadata-events/mxe-schemas/build.gradle
+++ b/metadata-events/mxe-schemas/build.gradle
@@ -39,4 +39,8 @@ clean {
   delete 'bin'
 }
 
-generateTestDataTemplate.dependsOn spotlessJava
+// This project only contains generated code, so disable Spotless
+tasks.withType(com.diffplug.gradle.spotless.SpotlessTask).configureEach {
+  enabled = false
+}
+