Add error-prone.picnic.tech featuring ConstantNaming

Author: Vincent Potucek

build.gradle

@@ -12,6 +12,7 @@ repositories {
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
+	apply from: rootProject.file('gradle/error-prone.gradle')
 	apply from: rootProject.file('gradle/rewrite.gradle')
 	apply from: rootProject.file('gradle/spotless.gradle')
 }

gradle/error-prone.gradle

@@ -0,0 +1,76 @@
+import static java.lang.System.getenv
+
+apply plugin: 'net.ltgt.errorprone'
+
+dependencies {
+	errorprone('com.google.errorprone:error_prone_core:2.42.0')
+	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.25.0')
+	errorprone('tech.picnic.error-prone-support:refaster-runner:0.25.0')
+	constraints {
+		errorprone('com.google.guava:guava') {
+			version {
+				require('33.4.8-jre')
+			}
+			because('Older versions use deprecated methods in sun.misc.Unsafe')
+			// https://github.com/junit-team/junit-framework/pull/5039#discussion_r2414490581
+		}
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	options.errorprone {
+		allErrorsAsWarnings = true // ModuleHelper.java:37: warning: Unsafe is internal proprietary API and may be removed in a future release
+		disableWarningsInGeneratedCode = true
+		error(
+				'ConstantNaming',
+				'DirectReturn',
+				'EmptyMethod',
+				'EmptyMonoZip',
+				'LexicographicalAnnotationAttributeListing',
+				'LexicographicalAnnotationListing',
+				'MissingTestCall',
+				'NonEmptyMono',
+				'NonStaticImport',
+				'OptionalMapUnusedValue',
+				'OptionalOfRedundantMethod',
+				'RedundantSetterCall',
+				'RedundantStringConversion',
+				'RedundantStringEscape',
+				'StringJoin',
+				'UnnecessaryCheckNotNull',
+				'UnnecessaryTypeArgument',
+				'UnusedAnonymousClass',
+				'UnusedCollectionModifiedInPlace',
+				// 'MissingOverride',
+				// 'StaticImport',
+				)
+		errorproneArgs.add('-XepOpt:Refaster:NamePattern=^(?!.*Rules\\$).*')
+		if (!getenv().containsKey('CI') && getenv('IN_PLACE')?.toBoolean()) {
+			errorproneArgs.addAll(
+					'-XepPatchLocation:IN_PLACE',
+					'-XepPatchChecks:' +
+					'ConstantNaming,' +
+					'DirectReturn,' +
+					'EmptyMethod,' +
+					'EmptyMonoZip,' +
+					'LexicographicalAnnotationAttributeListing,' +
+					'LexicographicalAnnotationListing,' +
+					'MissingTestCall,' +
+					'NonEmptyMono,' +
+					'NonStaticImport,' +
+					'OptionalMapUnusedValue,' +
+					'OptionalOfRedundantMethod,' +
+					'RedundantSetterCall,' +
+					'RedundantStringConversion,' +
+					'RedundantStringEscape,' +
+					'StringJoin,' +
+					'UnnecessaryCheckNotNull,' +
+					'UnnecessaryTypeArgument,' +
+					'UnusedAnonymousClass,' +
+					'UnusedCollectionModifiedInPlace,'
+					// 'MissingOverride,' +
+					// 'StaticImport,' +
+					)
+		}
+	}
+}

lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java

@@ -202,8 +202,8 @@ private static IOException emptyFile(File commonDir) {
 			return new IOException("Empty 'commondir' file: " + commonDir.getAbsolutePath());
 		}
 
-		@SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE")
 		@Override
+		@SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE")
 		public FileRepositoryBuilder readEnvironment(SystemReader sr) {
 			super.readEnvironment(sr);
 

lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 DiffPlug
+ * Copyright 2022-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,8 +52,8 @@ void external() throws IOException, GitAPIException {
 		Assertions.assertThat(repositorySpecificResolver.getGitDir()).isEqualTo(gitDir);
 	}
 
-	@Nested
 	@DisplayName("Worktrees")
+	@Nested
 	class Worktrees {
 		private File project1Tree;
 		private File project1GitDir;

lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java

@@ -28,8 +28,8 @@ public EclipseCdtFormatterStepTest() {
 		super(EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
-	@ParameterizedTest
 	@MethodSource
+	@ParameterizedTest
 	void formatWithVersion(String version) throws Exception {
 		harnessFor(version).test("main.c",
 				"#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}",

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java

@@ -31,8 +31,8 @@ public GrEclipseFormatterStepTest() {
 		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
-	@ParameterizedTest
 	@MethodSource
+	@ParameterizedTest
 	void formatWithVersion(String version) throws Exception {
 		harnessFor(version).test("test.groovy",
 				"class F{ def m(){} }", "class F{\n\tdef m(){}\n}");

lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,8 @@ public EclipseJdtFormatterStepTest() {
 		super(createBuilder());
 	}
 
-	@ParameterizedTest
 	@MethodSource
+	@ParameterizedTest
 	void formatWithVersion(String version) throws Exception {
 		harnessFor(version).test("test.java",
 				"package p; class C{}",

lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java

@@ -46,8 +46,8 @@ public NestedTests(String unformatted, String formatted, EclipseWtpFormatterStep
 			this.formatted = formatted;
 		}
 
-		@ParameterizedTest
 		@MethodSource
+		@ParameterizedTest
 		void formatWithVersion(String version) throws Exception {
 			harnessFor(version).test("someFilename", unformatted, formatted);
 		}

lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 
 public class KtLintCompat0Dot49Dot0Adapter implements KtLintCompatAdapter {
 
-	private static final Logger logger = LoggerFactory.getLogger(KtLintCompat0Dot49Dot0Adapter.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(KtLintCompat0Dot49Dot0Adapter.class);
 
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 

lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 
 public class KtLintCompat0Dot50Dot0Adapter implements KtLintCompatAdapter {
 
-	private static final Logger logger = LoggerFactory.getLogger(KtLintCompat0Dot50Dot0Adapter.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(KtLintCompat0Dot50Dot0Adapter.class);
 
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;