Merge branch 'main' into GH-4826

Signed-off-by: Harry <43809168+minkukjo@users.noreply.github.com>

Author: minkukjo

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 Thank you for taking time to contribute this pull request!
 You might have already read the [contributor guide][1], but as a reminder, please make sure to:
 
-* Sign the [contributor license agreement](https://cla.pivotal.io/sign/spring)
 * Rebase your changes on the latest `main` branch and squash your commits
 * Add/Update unit tests as needed
 * Run a build and make sure all tests pass prior to submission
+* Sign-off commits according to the [Developer Certificate of Origin](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring)
 
 For more details, please check the [contributor guide][1].
 Thank you upfront!

.mvn/jvm.config

@@ -0,0 +1,10 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

pom.xml

@@ -155,6 +155,7 @@
 		<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
 		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
+		<error-prone.version>2.38.0</error-prone.version>
 	</properties>
 
 	<build>
@@ -181,7 +182,59 @@
 					<release>${java.version}</release>
 					<compilerArgs>
 						<compilerArg>-parameters</compilerArg>
+						<!-- https://errorprone.info/docs/installation#maven -->
+						<compilerArg>-XDcompilePolicy=simple</compilerArg>
+						<compilerArg>--should-stop=ifError=FLOW</compilerArg>
+						<compilerArg>
+							-Xplugin:ErrorProne
+							-Xep:AlmostJavadoc:OFF
+							-Xep:ByteBufferBackingArray:OFF
+							-Xep:ClassCanBeStatic:OFF
+							-Xep:CollectionUndefinedEquality:OFF
+							-Xep:DefaultCharset:OFF
+							-Xep:DirectInvocationOnMock:OFF
+							-Xep:DoNotCallSuggester:OFF
+							-Xep:EmptyCatch:OFF
+							-Xep:EqualsGetClass:OFF
+							-Xep:Finally:OFF
+							-Xep:FutureReturnValueIgnored:OFF
+							-Xep:HidingField:OFF
+							-Xep:ImmutableEnumChecker:OFF
+							-Xep:InlineMeSuggester:OFF
+							-Xep:InputStreamSlowMultibyteRead:OFF
+							-Xep:JavaTimeDefaultTimeZone:OFF
+							-Xep:JavaUtilDate:OFF
+							-Xep:JdkObsolete:OFF
+							-Xep:MissingSummary:OFF
+							-Xep:MixedMutabilityReturnType:OFF
+							-Xep:MutablePublicArray:OFF
+							-Xep:NonAtomicVolatileUpdate:OFF
+							-Xep:RedundantControlFlow:OFF
+							-Xep:ReferenceEquality:OFF
+							-Xep:StaticAssignmentInConstructor:OFF
+							-Xep:StaticAssignmentOfThrowable:OFF
+							-Xep:StaticMockMember:OFF
+							-Xep:StreamResourceLeak:OFF
+							-Xep:StringCaseLocaleUsage:OFF
+							-Xep:StringSplitter:OFF
+							-Xep:SynchronizeOnNonFinalField:OFF
+							-Xep:ThreadLocalUsage:OFF
+							-Xep:ThreadPriorityCheck:OFF
+							-Xep:TypeParameterUnusedInFormals:OFF
+							-Xep:UndefinedEquals:OFF
+							-Xep:UnnecessaryStringBuilder:OFF
+							-Xep:UnusedMethod:OFF
+							-Xep:UnusedVariable:OFF
+							-Xep:WaitNotInLoop:OFF
+						</compilerArg>
 					</compilerArgs>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>com.google.errorprone</groupId>
+							<artifactId>error_prone_core</artifactId>
+							<version>${error-prone.version}</version>
+						</path>
+					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 			<plugin>

spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java

@@ -146,7 +146,7 @@ public boolean equals(Object other) {
 	@Override
 	public int hashCode() {
 		if (id == null) {
-			return super.hashCode();
+			return System.identityHashCode(this);
 		}
 		return 39 + 87 * id.hashCode();
 	}

spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.batch.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.StringUtils;
 
 import java.io.PrintWriter;
@@ -28,6 +29,7 @@
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author JiWon Seo
  *
  */
 public class ExitStatus implements Serializable, Comparable<ExitStatus> {
@@ -198,7 +200,7 @@ public String toString() {
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		if (obj == null) {
 			return false;
 		}
@@ -230,7 +232,7 @@ public ExitStatus replaceExitCode(String code) {
 	 * @return {@code true} if the exit code is {@code EXECUTING} or {@code UNKNOWN}.
 	 */
 	public boolean isRunning() {
-		return "EXECUTING".equals(this.exitCode) || "UNKNOWN".equals(this.exitCode);
+		return EXECUTING.exitCode.equals(this.exitCode) || UNKNOWN.exitCode.equals(this.exitCode);
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java

@@ -203,7 +203,7 @@ public void upgradeStatus(BatchStatus status) {
 	/**
 	 * Convenience getter for the {@code id} of the enclosing job. Useful for DAO
 	 * implementations.
-	 * @return the @{code id} of the enclosing job.
+	 * @return the {@code id} of the enclosing job.
 	 */
 	public Long getJobId() {
 		if (jobInstance != null) {

spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java

@@ -373,7 +373,7 @@ public String toString() {
 		for (Map.Entry<String, JobParameter<?>> entry : this.parameters.entrySet()) {
 			parameters.add(String.format("'%s':'%s'", entry.getKey(), entry.getValue()));
 		}
-		return new StringBuilder("{").append(String.join(",", parameters)).append("}").toString();
+		return "{" + String.join(",", parameters) + "}";
 	}
 
 }

spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java

@@ -492,7 +492,7 @@ public boolean equals(Object obj) {
 			return super.equals(obj);
 		}
 
-		return stepName.equals(other.getStepName()) && (jobExecutionId.equals(other.getJobExecutionId()))
+		return stepName.equals(other.getStepName()) && jobExecutionId.equals(other.getJobExecutionId())
 				&& getId().equals(other.getId());
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/AfterChunk.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * 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 org.springframework.batch.core.annotation;
 
-import org.springframework.batch.core.ChunkListener;
+import org.springframework.batch.core.listener.ChunkListener;
 import org.springframework.batch.core.scope.context.ChunkContext;
 
 import java.lang.annotation.ElementType;

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/AfterChunkError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * 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 org.springframework.batch.core.annotation;
 
-import org.springframework.batch.core.ChunkListener;
+import org.springframework.batch.core.listener.ChunkListener;
 import org.springframework.batch.core.scope.context.ChunkContext;
 
 import java.lang.annotation.ElementType;