From 8c4cad50838e8030efb2da0b4def9b6a5a687717 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Wed, 22 May 2024 20:56:40 +0200
Subject: [PATCH 1/2] Apply spotless to templates so that they're neat and
 clean.

---
 hppc/build.gradle | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/hppc/build.gradle b/hppc/build.gradle
index eb1309ae..14d1f140 100644
--- a/hppc/build.gradle
+++ b/hppc/build.gradle
@@ -1,5 +1,6 @@
 plugins {
   id 'java-library'
+  alias(deps.plugins.spotless)
 }
 
 sourceSets {
@@ -45,7 +46,7 @@ task generateMainTemplates(type: GenerateTemplatesTask) {
 }
 
 compileJava {
-  dependsOn generateMainTemplates
+  dependsOn generateMainTemplates, "spotlessTemplatesApply"
 
   options.compilerArgs.addAll([
     '--module-version',
@@ -58,6 +59,23 @@ task generateTestTemplates(type: GenerateTemplatesTask) {
   outputDir file("$buildDir/generated/test/templates")
 }
 
+spotless {
+  format('templates', com.diffplug.gradle.spotless.JavaExtension, {
+    target "$buildDir/generated/main/templates"
+
+    bumpThisNumberIfACustomStepChanges(1)
+    custom 'cleanimports', { str -> str.replaceAll('/\\*\\s*\\*/', "") }
+
+    lineEndings 'UNIX'
+    endWithNewline()
+    googleJavaFormat(deps.versions.googleJavaFormat.get())
+  })
+}
+
+tasks.named("spotlessTemplates").configure {
+  dependsOn(generateMainTemplates)
+}
+
 compileTestJava {
   dependsOn generateTestTemplates
 }

From 7beff6a3b67609b478cb42e21508a73a03413021 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Wed, 22 May 2024 20:58:43 +0200
Subject: [PATCH 2/2] Add clarifying comment.

---
 hppc/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hppc/build.gradle b/hppc/build.gradle
index 14d1f140..2e0c0055 100644
--- a/hppc/build.gradle
+++ b/hppc/build.gradle
@@ -63,6 +63,8 @@ spotless {
   format('templates', com.diffplug.gradle.spotless.JavaExtension, {
     target "$buildDir/generated/main/templates"
 
+    // This is needed to remove left-over conditional processing
+    // comments from within imports - gjf doesn't handle these well.
     bumpThisNumberIfACustomStepChanges(1)
     custom 'cleanimports', { str -> str.replaceAll('/\\*\\s*\\*/', "") }