Add UseStaticImport #48630

Signed-off-by: Vincent Potucek <vpotucek@me.com>

Author: Vincent Potucek

.github/actions/build/action.yml

@@ -69,6 +69,16 @@ runs:
         COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
         COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
       run: ./gradlew build
+    - name: Sanity Check
+      id: sanity
+      if: ${{ inputs.publish == 'false' }}
+      shell: bash
+      env:
+        COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
+        COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
+        COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
+        COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
+      run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx12G
     - name: Publish
       id: publish
       if: ${{ inputs.publish == 'true' }}

.github/workflows/build-pull-request.yml

@@ -13,6 +13,9 @@ jobs:
       - name: Build
         id: build
         uses: ./.github/actions/build
+      - name: Sanity
+        id: sanity
+        uses: ./.github/actions/build
       - name: Print JVM Thread Dumps When Cancelled
         if: cancelled()
         uses: ./.github/actions/print-jvm-thread-dumps

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java

@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -37,6 +36,9 @@
 import org.gradle.api.tasks.Optional;
 import org.jspecify.annotations.Nullable;
 
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.emptySet;
+
 /**
  * The properties that are written into the {@code build-info.properties} file.
  *
@@ -139,7 +141,7 @@ public BuildInfoProperties(Project project, SetProperty<String> excludes) {
 
 	@Input
 	Map<String, String> getAdditionalIfNotExcluded() {
-		return coerceToStringValues(applyExclusions(getAdditional().getOrElse(Collections.emptyMap())));
+		return coerceToStringValues(applyExclusions(getAdditional().getOrElse(emptyMap())));
 	}
 
 	private <T> @Nullable T getIfNotExcluded(Property<T> property, String name) {
@@ -148,7 +150,7 @@ Map<String, String> getAdditionalIfNotExcluded() {
 	}
 
 	private <T> @Nullable T getIfNotExcluded(Property<T> property, String name, Supplier<@Nullable T> defaultValue) {
-		if (this.excludes.getOrElse(Collections.emptySet()).contains(name)) {
+		if (this.excludes.getOrElse(emptySet()).contains(name)) {
 			return null;
 		}
 		if (property.isPresent()) {
@@ -172,7 +174,7 @@ private Map<String, String> coerceToStringValues(Map<String, Object> input) {
 
 	private Map<String, Object> applyExclusions(Map<String, Object> input) {
 		Map<String, Object> output = new HashMap<>();
-		Set<String> exclusions = this.excludes.getOrElse(Collections.emptySet());
+		Set<String> exclusions = this.excludes.getOrElse(emptySet());
 		input.forEach((key, value) -> {
 			boolean isExcluded = exclusions.contains(key);
 			if (!isExcluded) {

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.gradle.tasks.bundling;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Function;
@@ -38,6 +37,8 @@
 import org.gradle.work.DisableCachingByDefault;
 import org.jspecify.annotations.Nullable;
 
+import static java.util.Collections.emptyList;
+
 /**
  * A custom {@link Jar} task that produces a Spring Boot executable jar.
  *
@@ -106,7 +107,7 @@ private Iterable<File> classpathFiles() {
 	}
 
 	private Iterable<File> classpathEntries(Spec<File> filter) {
-		return (this.classpath != null) ? this.classpath.filter(filter) : Collections.emptyList();
+		return (this.classpath != null) ? this.classpath.filter(filter) : emptyList();
 	}
 
 	private void moveMetaInfToRoot(CopySpec spec) {
@@ -192,7 +193,7 @@ public void layered(Action<LayeredSpec> action) {
 	@Override
 	public void classpath(Object... classpath) {
 		FileCollection existingClasspath = this.classpath;
-		this.classpath = getProject().files((existingClasspath != null) ? existingClasspath : Collections.emptyList(),
+		this.classpath = getProject().files((existingClasspath != null) ? existingClasspath : emptyList(),
 				classpath);
 	}
 

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.gradle.tasks.bundling;
 
-import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Function;
@@ -38,6 +37,8 @@
 import org.gradle.work.DisableCachingByDefault;
 import org.jspecify.annotations.Nullable;
 
+import static java.util.Collections.emptyList;
+
 /**
  * A custom {@link War} task that produces a Spring Boot executable war.
  *
@@ -90,7 +91,7 @@ public BootWar() {
 	}
 
 	private Object getProvidedLibFiles() {
-		return (this.providedClasspath != null) ? this.providedClasspath : Collections.emptyList();
+		return (this.providedClasspath != null) ? this.providedClasspath : emptyList();
 	}
 
 	@Override
@@ -159,7 +160,7 @@ public void requiresUnpack(Spec<FileTreeElement> spec) {
 	public void providedClasspath(Object... classpath) {
 		FileCollection existingClasspath = this.providedClasspath;
 		this.providedClasspath = getProject()
-			.files((existingClasspath != null) ? existingClasspath : Collections.emptyList(), classpath);
+			.files((existingClasspath != null) ? existingClasspath : emptyList(), classpath);
 	}
 
 	/**

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java

@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,6 +34,7 @@
 import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
 import org.springframework.boot.gradle.junit.GradleProjectBuilder;
 
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -315,7 +315,7 @@ void whenSecurityOptionsAreNotConfiguredThenRequestHasNoSecurityOptions() {
 
 	@Test
 	void whenSecurityOptionsAreEmptyThenRequestHasEmptySecurityOptions() {
-		this.buildImage.getSecurityOptions().set(Collections.emptyList());
+		this.buildImage.getSecurityOptions().set(emptyList());
 		assertThat(this.buildImage.createRequest().getSecurityOptions()).isEmpty();
 	}
 

build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java

@@ -40,6 +40,7 @@
 
 import org.springframework.lang.CheckReturnValue;
 
+import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.contentOf;
 
@@ -69,7 +70,7 @@ public JarAssert assertThat() {
 
 	protected Map<String, List<String>> readLayerIndex(JarFile jarFile) throws IOException {
 		if (getLayersIndexLocation() == null) {
-			return Collections.emptyMap();
+			return emptyMap();
 		}
 		Map<String, List<String>> index = new LinkedHashMap<>();
 		String layerPrefix = "- ";

build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java

@@ -24,7 +24,6 @@
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -46,6 +45,8 @@
 import org.apache.maven.toolchain.ToolchainManager;
 import org.jspecify.annotations.Nullable;
 
+import static java.util.Collections.emptyMap;
+
 /**
  * Abstract base class for AOT processing MOJOs.
  *
@@ -134,7 +135,7 @@ protected void generateAotAssets(URL[] classPath, String processorClassName, Str
 			getLog().debug("Generating AOT assets using command: " + command);
 		}
 		JavaProcessExecutor processExecutor = new JavaProcessExecutor(this.session, this.toolchainManager);
-		processExecutor.run(this.project.getBasedir(), command, Collections.emptyMap());
+		processExecutor.run(this.project.getBasedir(), command, emptyMap());
 	}
 
 	protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory, File outputDirectory)

build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ClassPath.java

@@ -26,7 +26,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.UnaryOperator;
@@ -37,6 +36,8 @@
 
 import org.springframework.util.StringUtils;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Encapsulates a class path and allows argument parameters to be created. On Windows an
  * argument file is used whenever possible since the maximum command line length is
@@ -66,7 +67,7 @@ private ClassPath(boolean preferArgFile, String path) {
 	 * @return the command line arguments
 	 */
 	List<String> args(boolean allowArgFile) {
-		return (!this.path.isEmpty()) ? List.of("-cp", classPathArg(allowArgFile)) : Collections.emptyList();
+		return (!this.path.isEmpty()) ? List.of("-cp", classPathArg(allowArgFile)) : emptyList();
 	}
 
 	private String classPathArg(boolean allowArgFile) {

build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/DependencyFilter.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.maven;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -27,6 +26,8 @@
 import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
 import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Base class for {@link ArtifactsFilter} based on a {@link FilterableDependency} list.
  *
@@ -91,7 +92,7 @@ protected final List<? extends FilterableDependency> getFilters() {
 	 * @since 3.5.7
 	 */
 	public static DependencyFilter exclude(Predicate<Artifact> filter) {
-		return new DependencyFilter(Collections.emptyList()) {
+		return new DependencyFilter(emptyList()) {
 
 			@Override
 			protected boolean filter(Artifact artifact) {