[openrewrite] add tech.picnic.errorprone.refasterrules

.github/workflows/claude.yml

@@ -22,15 +22,29 @@ jobs:
         with:
           script: |
             try {
+              // Get username - prioritize sender (the person who triggered the event)
+              const username = github.event.sender?.login ||
+                              github.event.comment?.user?.login;
+
+              if (!username) {
+                console.log('Could not determine username from event payload');
+                console.log(`Event type: ${github.event_name}`);
+                console.log(`Event payload keys: ${Object.keys(github.event).join(', ')}`);
+                return false;
+              }
+
+              console.log(`Checking team membership for user: ${username} (triggered by ${github.event_name} event)`);
+
               const { data } = await github.rest.teams.getMembershipForUserInOrg({
                 org: 'diffplug',
                 team_slug: 'spotless',
-                username: github.event.sender.login
+                username: username
               });
-              console.log(`User ${github.event.sender.login} membership status: ${data.state}`);
+              console.log(`User ${username} membership status: ${data.state}`);
               return data.state === 'active';
             } catch (error) {
-              console.log(`User ${github.event.sender.login} is not a member of the Spotless team`);
+              const username = github.event.sender?.login || github.event.comment?.user?.login || 'unknown user';
+              console.log(`User ${username} is not a member of the Spotless team or error occurred: ${error.message}`);
               return false;
             }
 

build.gradle

@@ -32,4 +32,6 @@ spotless {
 dependencies {
 	rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.14.1"))
 	rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.18.0")
+	rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.17.0')
+	rewrite('org.openrewrite.recipe:rewrite-third-party:0.27.0')
 }

gradle/rewrite.gradle

@@ -1,7 +1,40 @@
 apply plugin: 'org.openrewrite.rewrite'
 
 rewrite {
-	activeRecipe("org.openrewrite.java.migrate.UpgradeToJava17")
+	activeRecipe(
+			'org.openrewrite.gradle.GradleBestPractices',
+			'org.openrewrite.java.RemoveUnusedImports',
+			'org.openrewrite.java.migrate.UpgradeToJava17',
+			'org.openrewrite.staticanalysis.LowercasePackage',
+			'org.openrewrite.staticanalysis.MissingOverrideAnnotation',
+			'org.openrewrite.staticanalysis.ModifierOrder',
+			'org.openrewrite.staticanalysis.NoFinalizer',
+			'org.openrewrite.staticanalysis.RemoveUnusedLocalVariables',
+			'org.openrewrite.staticanalysis.RemoveUnusedPrivateFields',
+			'org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods',
+			'tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.ClassRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.CollectionRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.FileRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.PatternRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.PreconditionsRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.StreamRulesRecipes',
+			'tech.picnic.errorprone.refasterrules.TimeRulesRecipes'
+			)
+	exclusions.addAll(
+			'**_gradle_node_plugin_example_**',
+			'**gradle/changelog.gradle',
+			'**gradle/java-publish.gradle',
+			'**lib-extra/build.gradle',
+			'**lib/build.gradle',
+			'**package-info.java',
+			'**plugin-maven/build.gradle',
+			'**settings.gradle'
+			)
 	exportDatatables = true
 	failOnDryRunResults = true
 }

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

@@ -146,7 +146,7 @@ static class CachedEndings implements Serializable {
 		private static final long serialVersionUID = -2534772773057900619L;
 
 		/** this is transient, to simulate PathSensitive.RELATIVE */
-		transient final String rootDir;
+		final transient String rootDir;
 		/** the line ending used for most files */
 		final String defaultEnding;
 		/** any exceptions to that default, in terms of relative path from rootDir */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,9 +132,9 @@ private static boolean worktreeIsCleanCheckout(TreeWalk treeWalk) {
 		return treeWalk.idEqual(TREE, WORKDIR);
 	}
 
-	private final static int TREE = 0;
-	private final static int INDEX = 1;
-	private final static int WORKDIR = 2;
+	private static final int TREE = 0;
+	private static final int INDEX = 1;
+	private static final int WORKDIR = 2;
 
 	Map<File, Repository> gitRoots = new HashMap<>();
 	Table<Repository, String, ObjectId> rootTreeShaCache = HashBasedTable.create();

lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java

@@ -251,7 +251,7 @@ public static Map.Entry<Integer, String> diff(Path rootDir, Formatter formatter,
 	}
 
 	private static Map.Entry<Integer, String> diff(CleanProvider formatter, File file) throws IOException {
-		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
+		String raw = Files.readString(file.toPath(), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
 		String formatted = formatter.getFormatted(file, rawUnix);
 		String formattedUnix = LineEnding.toUnix(formatted);

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.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.
@@ -24,8 +24,8 @@
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 public class GrEclipseFormatterStepTest extends EquoResourceHarness {
-	private final static String INPUT = "class F{ def m(){} }";
-	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
+	private static final String INPUT = "class F{ def m(){} }";
+	private static final String EXPECTED = "class F{\n\tdef m(){}\n}";
 
 	public GrEclipseFormatterStepTest() {
 		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()));

lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.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.
@@ -19,6 +19,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -33,7 +34,7 @@
 import com.diffplug.spotless.extra.eclipse.EclipseResourceHarness;
 
 public class EclipseWtpFormatterStepTest {
-	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.8.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.8.0");
 
 	private static class NestedTests extends EclipseResourceHarness {
 		private final String unformatted, formatted;
@@ -76,7 +77,7 @@ void multipleConfigurations() throws Exception {
 		private File createPropertyFile(Consumer<Properties> config) throws IOException {
 			Properties configProps = new Properties();
 			config.accept(configProps);
-			File tempFile = File.createTempFile("EclipseWtpFormatterStepTest-", ".properties");
+			File tempFile = Files.createTempFile("EclipseWtpFormatterStepTest-", ".properties").toFile();
 			OutputStream tempOut = new FileOutputStream(tempFile);
 			configProps.store(tempOut, "test properties");
 			tempOut.flush();

lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java

@@ -52,6 +52,7 @@ protected Class<?> inferType(String input) {
 	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
 	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
 	 */
+	@Override
 	protected JsonFactory makeJsonFactory() {
 		JsonFactory jsonFactory = new JsonFactoryBuilder().build();
 

lib/src/main/java/com/diffplug/spotless/FormatterProperties.java

@@ -113,7 +113,7 @@ public static FormatterProperties fromXmlContent(final Iterable<String> content)
 
 	public static FormatterProperties merge(Properties... properties) {
 		FormatterProperties merged = new FormatterProperties();
-		List.of(properties).stream().forEach((source) -> merged.properties.putAll(source));
+		List.of(properties).forEach((source) -> merged.properties.putAll(source));
 		return merged;
 	}
 

lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java

@@ -172,7 +172,7 @@ private void doInstall() throws Exception {
 	 *                  such as file reading or writing errors
 	 */
 	private void uninstall(File gitHookFile) throws Exception {
-		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
+		final var hook = Files.readString(gitHookFile.toPath());
 		final int hookStart = hook.indexOf(HOOK_HEADER);
 		final int hookEnd = hook.indexOf(HOOK_FOOTER) + HOOK_FOOTER.length(); // hookEnd exclusive, so must be last symbol \n
 
@@ -323,7 +323,7 @@ private boolean isGitInstalled() {
 	 * @throws Exception if an error occurs when reading the file.
 	 */
 	private boolean isGitHookInstalled(File gitHookFile) throws Exception {
-		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
+		final var hook = Files.readString(gitHookFile.toPath());
 		return hook.contains(HOOK_HEADER) && hook.contains(HOOK_FOOTER);
 	}
 

lib/src/main/java/com/diffplug/spotless/NoLambda.java

@@ -44,7 +44,7 @@ public interface NoLambda extends Serializable {
 	public byte[] toBytes();
 
 	/** An implementation of NoLambda in which equality is based on the serialized representation of itself. */
-	public static abstract class EqualityBasedOnSerialization implements NoLambda {
+	public abstract static class EqualityBasedOnSerialization implements NoLambda {
 		@Serial
 		private static final long serialVersionUID = 1733798699224768949L;
 

lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java

@@ -24,12 +24,12 @@
 public final class BiomeSettings {
 	private static final Logger logger = LoggerFactory.getLogger(BiomeSettings.class);
 
-	private final static String CONFIG_NAME = "biome.json";
-	private final static String DEFAULT_VERSION = "1.2.0";
-	private final static String DOWNLOAD_FILE_PATTERN = "biome-%s-%s-%s";
-	private final static String SHORT_NAME = "biome";
-	private final static String URL_PATTERN_1X = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
-	private final static String URL_PATTERN_2X = "https://github.com/biomejs/biome/releases/download/%%40biomejs%%2Fbiome%%40%s/biome-%s";
+	private static final String CONFIG_NAME = "biome.json";
+	private static final String DEFAULT_VERSION = "1.2.0";
+	private static final String DOWNLOAD_FILE_PATTERN = "biome-%s-%s-%s";
+	private static final String SHORT_NAME = "biome";
+	private static final String URL_PATTERN_1X = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
+	private static final String URL_PATTERN_2X = "https://github.com/biomejs/biome/releases/download/%%40biomejs%%2Fbiome%%40%s/biome-%s";
 
 	private BiomeSettings() {}
 

lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java

@@ -213,7 +213,7 @@ private static boolean isMacOs() {
 
 		private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanupResources, String unix, File file) throws Exception {
 			// since we cannot directly work with the file, we need to write the unix string to a temporary file
-			File tempFile = File.createTempFile("spotless", file.getName());
+			File tempFile = Files.createTempFile("spotless", file.getName()).toFile();
 			try {
 				Files.write(tempFile.toPath(), unix.getBytes(StandardCharsets.UTF_8));
 				List<String> params = getParams(tempFile);
@@ -224,7 +224,7 @@ private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanup
 				LOGGER.debug("command finished with exit code: {}", result.exitCode());
 				LOGGER.debug("command finished with stdout: {}",
 						result.assertExitZero(StandardCharsets.UTF_8));
-				return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
+				return Files.readString(tempFile.toPath());
 			} finally {
 				Files.delete(tempFile.toPath());
 			}

lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java

@@ -435,7 +435,6 @@ private static final class State implements Serializable {
 
 		// group 1 is the basename of the annotation.
 		private static final String annoNoArgRegex = "@(?:[A-Za-z_][A-Za-z0-9_.]*\\.)?([A-Za-z_][A-Za-z0-9_]*)";
-		private static final Pattern annoNoArgPattern = Pattern.compile(annoNoArgRegex);
 		// 3 non-empty cases:  ()  (".*")  (.*)
 		private static final String annoArgRegex = "(?:\\(\\)|\\(\"[^\"]*\"\\)|\\([^\")][^)]*\\))?";
 		// group 1 is the basename of the annotation.

lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java

@@ -82,9 +82,9 @@ public enum Style {
 		;
 		// @formatter:on
 
-		final private String format;
-		final private String since;
-		final private @Nullable String until;
+		private final String format;
+		private final String since;
+		private final @Nullable String until;
 
 		Style(String format, String since) {
 			this.format = format;

lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java

@@ -96,7 +96,7 @@ public boolean isNodeModulesPrepared() {
 		// check if it is NOT empty
 		return ThrowingEx.get(() -> {
 			try (Stream<Path> entries = Files.list(nodeModulesInstallDirPath)) {
-				return entries.findFirst().isPresent();
+				return entries.findAny().isPresent();
 			}
 		});
 	}

lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.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.
@@ -137,7 +137,7 @@ private String assertFilepathInConfigOptions(File file) {
 				return prettierConfigOptions;
 			}
 			// if the file has no name, we  cannot use it
-			if (file.getName().trim().length() == 0) {
+			if (file.getName().trim().isEmpty()) {
 				return prettierConfigOptions;
 			}
 			// if it is not there, we add it at the beginning of the Options

lib/src/main/java/com/diffplug/spotless/npm/SimpleRestClient.java

@@ -93,7 +93,7 @@ private String readInputStream(InputStream inputStream) throws IOException {
 		}
 	}
 
-	static abstract class SimpleRestException extends RuntimeException {
+	abstract static class SimpleRestException extends RuntimeException {
 		private static final long serialVersionUID = -8260821395756603787L;
 
 		public SimpleRestException() {}

lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java

@@ -42,7 +42,7 @@ public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLa
 		return new NpmServe(nodeServerLayout.nodeModulesDir(), formatterStepLocations, nodeServerInstanceId);
 	}
 
-	private static abstract class AbstractStandardNpmProcess {
+	private abstract static class AbstractStandardNpmProcess {
 		protected final ProcessRunner processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
 
 		protected final File workingDir;

lib/src/main/java/com/diffplug/spotless/sql/dbeaver/FormatterToken.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.
@@ -63,6 +63,7 @@ public int getPos() {
 		return fPos;
 	}
 
+	@Override
 	public String toString() {
 		final StringBuilder buf = new StringBuilder();
 		buf.append(getClass().getName());

lib/src/main/java/com/diffplug/spotless/sql/dbeaver/KeywordCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.
@@ -22,16 +22,19 @@
  */
 enum KeywordCase {
 	UPPER {
+		@Override
 		public String transform(String value) {
 			return value.toUpperCase(Locale.ENGLISH);
 		}
 	},
 	LOWER {
+		@Override
 		public String transform(String value) {
 			return value.toLowerCase(Locale.ENGLISH);
 		}
 	},
 	ORIGINAL {
+		@Override
 		public String transform(String value) {
 			return value;
 		}

lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java

@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 import org.scalafmt.Scalafmt;
@@ -43,7 +42,7 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 			config = (ScalafmtConfig) method.invoke(ScalafmtConfig$.MODULE$);
 		} else {
 			File file = configSignature.getOnlyFile();
-			String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+			String configStr = Files.readString(file.toPath());
 			config = Scalafmt.parseHoconConfig(configStr).get();
 		}