Pull spring-projects#34809: RemoveUnusedPrivateFields

Author: Vincent Potucek

gradle.properties

@@ -1,7 +1,7 @@
 version=7.0.0-SNAPSHOT
 
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx8g
 org.gradle.parallel=true
 
 kotlinVersion=2.1.20

import-into-eclipse.md

@@ -48,7 +48,7 @@ _When instructed to execute `./gradlew` from the command line, be sure to execut
 1. While JUnit tests pass from the command line with Gradle, some may fail when run from
    the IDE.
    - Resolving this is a work in progress.
-   - If attempting to run all JUnit tests from within the IDE, you may need to set the following VM options to avoid out of memory errors: `-XX:MaxPermSize=2048m -Xmx2048m -XX:MaxHeapSize=2048m`
+   - If attempting to run all JUnit tests from within the IDE, you may need to set the following VM options to avoid out of memory errors: `-XX:MaxPermSize=2g -Xmx2g -XX:MaxHeapSize=2g`
 
 ## Tips
 

import-into-idea.md

@@ -19,7 +19,7 @@ IntelliJ IDEA. See https://youtrack.jetbrains.com/issue/IDEA-64446 for details.
 3. While JUnit tests pass from the command line with Gradle, some may fail when run from
 IntelliJ IDEA. Resolving this is a work in progress. If attempting to run all JUnit tests from within
 IntelliJ IDEA, you will likely need to set the following VM options to avoid out of memory errors:
-    -XX:MaxPermSize=2048m -Xmx2048m -XX:MaxHeapSize=2048m
+    -XX:MaxPermSize=2g -Xmx2g -XX:MaxHeapSize=2g
 4. If you invoke "Rebuild Project" in the IDE, you'll have to generate some test
 resources of the `spring-oxm` module again (`./gradlew :spring-oxm:compileTestJava`)    
 

init.gradle

@@ -0,0 +1,30 @@
+initscript {
+    repositories {
+        maven { url "https://plugins.gradle.org/m2" }
+    }
+    dependencies { classpath("org.openrewrite:plugin:7.2.1") }
+}
+rootProject {
+    plugins.apply(org.openrewrite.gradle.RewritePlugin)
+    dependencies {
+        rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.4.0")
+    }
+    rewrite {
+//        activeRecipe("org.openrewrite.java.migrate.UpgradeToJava17")
+//        activeRecipe("org.openrewrite.java.migrate.UpgradeToJava21")
+//        activeRecipe("org.openrewrite.java.migrate.lang.var.UseVarForObject")
+//        activeRecipe("org.openrewrite.java.migrate.lang.var.UseVarForPrimitive")
+//        activeRecipe("org.openrewrite.staticanalysis.FinalizeLocalVariables")
+//        activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedLocalVariables")
+        activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateFields")
+//        activeRecipe("org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods")
+        setExportDatatables(true)
+    }
+    afterEvaluate {
+        if (repositories.isEmpty()) {
+            repositories {
+                mavenCentral()
+            }
+        }
+    }
+}

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

@@ -802,8 +802,6 @@ public static class GenericBroadcasterImpl implements Broadcaster {
 	public abstract static class GenericEventBroadcasterImpl<T extends Event>
 			extends GenericBroadcasterImpl implements EventBroadcaster {
 
-		private Class<T>[] subscribingEvents;
-
 		private Channel<T> channel;
 
 		/**

spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java

@@ -37,7 +37,6 @@ public class Inventor {
 	public String publicName;
 	private PlaceOfBirth placeOfBirth;
 	private Date birthdate;
-	private int sinNumber;
 	private String nationality;
 	private String[] inventions;
 	public String randomField;

spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java

@@ -377,15 +377,11 @@ public jakarta.xml.bind.Unmarshaller createUnmarshaller() {
 	@XmlRootElement
 	@SuppressWarnings("unused")
 	public static class DummyRootElement {
-
-		private DummyType t = new DummyType();
 	}
 
 	@XmlType
 	@SuppressWarnings("unused")
 	public static class DummyType {
-
-		private String s = "Hello";
 	}
 
 	@SuppressWarnings("unused")

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

@@ -53,7 +53,6 @@
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 import org.springframework.web.HttpRequestHandler;
-import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.support.ServletContextResource;
 import org.springframework.web.cors.CorsConfiguration;
@@ -123,8 +122,6 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
 
 	private @Nullable ResourceRegionHttpMessageConverter resourceRegionHttpMessageConverter;
 
-	private @Nullable ContentNegotiationManager contentNegotiationManager;
-
 	private final Map<String, MediaType> mediaTypes = new HashMap<>(4);
 
 	private @Nullable CorsConfiguration corsConfiguration;