[openrewrite] exclude testlib/src/main/resources

Author: Vincent Potucek

gradle/rewrite.gradle

@@ -14,7 +14,8 @@ rewrite {
 			'**package-info.java',
 			'**plugin-maven/build.gradle',
 			'**settings.gradle',
-			'**special-tests.gradle'
+			'**special-tests.gradle',
+			'**testlib/src/main/resources**'
 			)
 	exportDatatables = true
 	failOnDryRunResults = true

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

@@ -71,31 +71,35 @@ private static boolean isDigit(final char argChar) {
 	}
 
 	private static boolean isSymbol(final char argChar) {
-		// double quote
-		// question mark
-		// percent
-		// ampersand
-		// quote
-		// left paren
-		// right paren
-		// vertical bar
-		// asterisk
-		// plus sign
-		// comma
-		// minus sign
-		// period
-		// solidus
-		// colon
-		// semicolon
-		// less than operator
-		// equals operator
-		// greater than operator
-		// greater than operator
-		// greater than operator
-		// apos
-		// bracket open
-		// bracket close
-		return switch(argChar){case'"','?','%','&','\'','(',')','|','*','+',',','-','.','/',':',';','<','=','>','!','~','`','[',']'->true;default->false;};
+		switch (argChar) {
+		case '"': // double quote
+		case '?': // question mark
+		case '%': // percent
+		case '&': // ampersand
+		case '\'': // quote
+		case '(': // left paren
+		case ')': // right paren
+		case '|': // vertical bar
+		case '*': // asterisk
+		case '+': // plus sign
+		case ',': // comma
+		case '-': // minus sign
+		case '.': // period
+		case '/': // solidus
+		case ':': // colon
+		case ';': // semicolon
+		case '<': // less than operator
+		case '=': // equals operator
+		case '>': // greater than operator
+		case '!': // greater than operator
+		case '~': // greater than operator
+		case '`': // apos
+		case '[': // bracket open
+		case ']': // bracket close
+			return true;
+		default:
+			return false;
+		}
 	}
 
 	private FormatterToken nextToken() {

testlib/src/main/java/com/diffplug/spotless/ReflectionUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * just copy-paste these methods where you need
  * them.
  */
-public final class ReflectionUtil {
+public class ReflectionUtil {
 	public static void dumpAllInfo(String name, Object obj) {
 		System.out.println(name + " of type " + obj.getClass());
 		for (Method method : obj.getClass().getMethods()) {
@@ -50,6 +50,4 @@ public static void dumpMethod(Method method) {
 		}
 		System.out.println(")");
 	}
-
-	private ReflectionUtil() {}
 }

testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java

@@ -178,7 +178,7 @@ public ReadAsserter assertFile(File file) {
 		return new ReadAsserter(file);
 	}
 
-	public static final class ReadAsserter {
+	public static class ReadAsserter {
 		private final File file;
 
 		private ReadAsserter(File file) {
@@ -223,7 +223,7 @@ public WriteAsserter setFile(String path) {
 		return new WriteAsserter(newFile(path));
 	}
 
-	public static final class WriteAsserter {
+	public static class WriteAsserter {
 		private File file;
 
 		private WriteAsserter(File file) {
@@ -240,12 +240,16 @@ public File toContent(String content) {
 		}
 
 		public File toContent(String content, Charset charset) {
-			ThrowingEx.run(() -> Files.write(file.toPath(), content.getBytes(charset)));
+			ThrowingEx.run(() -> {
+				Files.write(file.toPath(), content.getBytes(charset));
+			});
 			return file;
 		}
 
 		public File toResource(String path) {
-			ThrowingEx.run(() -> Files.write(file.toPath(), getTestResource(path).getBytes(StandardCharsets.UTF_8)));
+			ThrowingEx.run(() -> {
+				Files.write(file.toPath(), getTestResource(path).getBytes(StandardCharsets.UTF_8));
+			});
 			return file;
 		}
 

testlib/src/main/java/com/diffplug/spotless/StepHarness.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package com.diffplug.spotless;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
@@ -25,7 +25,7 @@
 import com.diffplug.selfie.StringSelfie;
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
-public final class StepHarness extends StepHarnessBase {
+public class StepHarness extends StepHarnessBase {
 	private StepHarness(Formatter formatter, RoundTrip roundTrip) {
 		super(formatter, roundTrip);
 	}

testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java

@@ -15,7 +15,7 @@
  */
 package com.diffplug.spotless;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,7 +26,7 @@
 import com.diffplug.selfie.StringSelfie;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
-public final class StepHarnessWithFile extends StepHarnessBase {
+public class StepHarnessWithFile extends StepHarnessBase {
 	private final ResourceHarness harness;
 
 	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter, RoundTrip roundTrip) {

testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java

@@ -42,7 +42,7 @@
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
 
-public final class TestProvisioner {
+public class TestProvisioner {
 	public static Project gradleProject(File dir) {
 		File userHome = new File(StandardSystemProperty.USER_HOME.value());
 		return ProjectBuilder.builder()
@@ -143,7 +143,9 @@ public static Provisioner mavenCentral() {
 		return mavenCentral.get();
 	}
 
-	private static final Supplier<Provisioner> mavenCentral = Suppliers.memoize(() -> caching("mavenCentral", () -> createWithRepositories(repo -> repo.mavenCentral())));
+	private static final Supplier<Provisioner> mavenCentral = Suppliers.memoize(() -> {
+		return caching("mavenCentral", () -> createWithRepositories(repo -> repo.mavenCentral()));
+	});
 
 	/** Creates a Provisioner for the local maven repo for development purpose. */
 	public static Provisioner mavenLocal() {
@@ -157,7 +159,9 @@ public static Provisioner snapshots() {
 		return snapshots.get();
 	}
 
-	private static final Supplier<Provisioner> snapshots = () -> createWithRepositories(repo -> repo.maven(setup -> setup.setUrl("https://oss.sonatype.org/content/repositories/snapshots")));
-
-	private TestProvisioner() {}
+	private static final Supplier<Provisioner> snapshots = () -> createWithRepositories(repo -> {
+		repo.maven(setup -> {
+			setup.setUrl("https://oss.sonatype.org/content/repositories/snapshots");
+		});
+	});
 }

testlib/src/test/java/com/diffplug/spotless/JvmTest.java

@@ -42,7 +42,7 @@ void initialize() {
 
 	@Test
 	void supportAdd() {
-		Integer[] differentVersions = {0, 1, 2};
+		Integer differentVersions[] = {0, 1, 2};
 		Arrays.asList(differentVersions).forEach(v -> testSupport.add(v + Jvm.version(), v.toString()));
 		Arrays.asList(differentVersions).forEach(v -> assertThat(testSupport.toString()).contains("Version %d".formatted(v)));
 		assertThat(testSupport.toString()).contains("%s alternatives".formatted(TEST_NAME));
@@ -51,7 +51,9 @@ void supportAdd() {
 	@ParameterizedTest(name = "{index} {1}")
 	@MethodSource
 	void supportAddFailsFor(Consumer<Jvm.Support<String>> configuration, String nameNotUsed) {
-		assertThrows(IllegalArgumentException.class, () -> configuration.accept(testSupport));
+		assertThrows(IllegalArgumentException.class, () -> {
+			configuration.accept(testSupport);
+		});
 	}
 
 	private static Stream<Arguments> supportAddFailsFor() {
@@ -74,9 +76,11 @@ void supportEmptyConfiguration() {
 		testSupport.assertFormatterSupported("0.1");
 
 		Exception expected = new Exception("Some test exception");
-		Exception actual = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError("0.0", unused -> {
-			throw expected;
-		}).apply(""));
+		Exception actual = assertThrows(Exception.class, () -> {
+			testSupport.suggestLaterVersionOnError("0.0", unused -> {
+				throw expected;
+			}).apply("");
+		});
 		assertEquals(expected, actual);
 	}
 
@@ -90,26 +94,34 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 		assertNull(testSupport.getRecommendedFormatterVersion(), "No formatter version is supported");
 
 		for (String fmtVersion : Arrays.asList("1.2", "1.2.3", "1.2-SNAPSHOT", "1.2.3-SNAPSHOT")) {
-			String proposal = assertThrows(Lint.ShortcutException.class, () -> testSupport.assertFormatterSupported(fmtVersion)).getLints().get(0).getDetail();
+			String proposal = assertThrows(Lint.ShortcutException.class, () -> {
+				testSupport.assertFormatterSupported(fmtVersion);
+			}).getLints().get(0).getDetail();
 			assertThat(proposal).contains(String.format("on JVM %d", Jvm.version()));
 			assertThat(proposal).contains("%s %s requires JVM %d+".formatted(TEST_NAME, fmtVersion, higherJvmVersion));
 			assertThat(proposal).contains("try %s alternatives".formatted(TEST_NAME));
 
-			proposal = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
-				throw testException;
-			}).apply("")).getMessage();
+			proposal = assertThrows(Exception.class, () -> {
+				testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
+					throw testException;
+				}).apply("");
+			}).getMessage();
 			assertThat(proposal).contains(String.format("on JVM %d", Jvm.version()));
 			assertThat(proposal).contains("%s %s requires JVM %d+".formatted(TEST_NAME, fmtVersion, higherJvmVersion));
 			assertThat(proposal).contains("try %s alternatives".formatted(TEST_NAME));
 		}
 
 		for (String fmtVersion : Arrays.asList("1.2.4", "2", "1.2.5-SNAPSHOT")) {
-			String proposal = assertThrows(Lint.ShortcutException.class, () -> testSupport.assertFormatterSupported(fmtVersion)).getLints().get(0).getDetail();
+			String proposal = assertThrows(Lint.ShortcutException.class, () -> {
+				testSupport.assertFormatterSupported(fmtVersion);
+			}).getLints().get(0).getDetail();
 			assertThat(proposal).contains("%s %s requires JVM %d+".formatted(TEST_NAME, fmtVersion, higherJvmVersion + 1));
 
-			proposal = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
-				throw testException;
-			}).apply("")).getMessage();
+			proposal = assertThrows(Exception.class, () -> {
+				testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
+					throw testException;
+				}).apply("");
+			}).getMessage();
 			assertThat(proposal).contains("%s %s requires JVM %d+".formatted(TEST_NAME, fmtVersion, higherJvmVersion + 1));
 		}
 	}
@@ -123,12 +135,14 @@ void supportProposesFormatterUpgrade() {
 		for (String fmtVersion : Arrays.asList("0", "1", "1.9", "1.9-SNAPSHOT")) {
 			testSupport.assertFormatterSupported(fmtVersion);
 
-			String proposal = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
-				throw new Exception("Some test exception");
-			}).apply("")).getMessage();
-			assertThat(proposal.replace("\r", "")).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n"
-					+ "My Test Formatter 2 is the recommended version, which may have fixed this problem.\n"
-					+ "My Test Formatter 2 requires JVM " + requiredJvm + "+.");
+			String proposal = assertThrows(Exception.class, () -> {
+				testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
+					throw new Exception("Some test exception");
+				}).apply("");
+			}).getMessage();
+			assertThat(proposal.replace("\r", "")).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n" +
+					"My Test Formatter 2 is the recommended version, which may have fixed this problem.\n" +
+					"My Test Formatter 2 requires JVM " + requiredJvm + "+.");
 		}
 	}
 
@@ -139,9 +153,11 @@ void supportProposesJvmUpgrade() {
 		testSupport.add(higherJvm, "2");
 		testSupport.add(higherJvm + 1, "3");
 		for (String fmtVersion : Arrays.asList("1", "1.0")) {
-			String proposal = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
-				throw new Exception("Some test exception");
-			}).apply("")).getMessage();
+			String proposal = assertThrows(Exception.class, () -> {
+				testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
+					throw new Exception("Some test exception");
+				}).apply("");
+			}).getMessage();
 			assertThat(proposal).contains(String.format("on JVM %d", Jvm.version()));
 			assertThat(proposal).contains("limits you to %s %s".formatted(TEST_NAME, "1"));
 			assertThat(proposal).contains("upgrade your JVM to %d+".formatted(higherJvm));
@@ -156,9 +172,11 @@ void supportAllowsExperimentalVersions() {
 			testSupport.assertFormatterSupported(fmtVersion);
 
 			Exception testException = new Exception("Some test exception");
-			Exception exception = assertThrows(Exception.class, () -> testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
-				throw testException;
-			}).apply(""));
+			Exception exception = assertThrows(Exception.class, () -> {
+				testSupport.suggestLaterVersionOnError(fmtVersion, unused -> {
+					throw testException;
+				}).apply("");
+			});
 			assertEquals(testException, exception);
 		}
 	}

testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ void diverging() throws IOException {
 	void cycleOrder() {
 		BiConsumer<String, String> testCase = (unorderedStr, canonical) -> {
 			List<String> unordered = Arrays.asList(unorderedStr.split(","));
-			for (int i = 0; i < unordered.size(); i++) {
+			for (int i = 0; i < unordered.size(); ++i) {
 				// try every rotation of the list
 				Collections.rotate(unordered, 1);
 				PaddedCell result = CYCLE.create(rootFolder, unordered);

testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java

@@ -104,7 +104,7 @@ void configureFile() throws Exception {
 				"formatting was applied to clean file");
 	}
 
-	private File buildDir;
+	private File buildDir = null;
 
 	protected File buildDir() {
 		if (this.buildDir == null) {