Apply spring-javaformat style for consistency with other projects

Resolves #4118

Author: fmbenhassine

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

@@ -27,15 +27,15 @@
 public enum BatchStatus {
 
 	/**
-	 * The order of the status values is significant because it can be used to
-	 * aggregate a set of status values. The result should be the maximum
-	 * value. Since {@code COMPLETED} is first in the order, only if all elements of an
-	 * execution are {@code COMPLETED} can the aggregate status be COMPLETED. A running
-	 * execution is expected to move from {@code STARTING} to {@code STARTED} to {@code COMPLETED}
-	 * (through the order defined by {@link #upgradeTo(BatchStatus)}). Higher
-	 * values than {@code STARTED} signify more serious failures. {@code ABANDONED} is used for
-	 * steps that have finished processing but were not successful and where
-	 * they should be skipped on a restart (so {@code FAILED} is the wrong status).
+	 * The order of the status values is significant because it can be used to aggregate a
+	 * set of status values. The result should be the maximum value. Since
+	 * {@code COMPLETED} is first in the order, only if all elements of an execution are
+	 * {@code COMPLETED} can the aggregate status be COMPLETED. A running execution is
+	 * expected to move from {@code STARTING} to {@code STARTED} to {@code COMPLETED}
+	 * (through the order defined by {@link #upgradeTo(BatchStatus)}). Higher values than
+	 * {@code STARTED} signify more serious failures. {@code ABANDONED} is used for steps
+	 * that have finished processing but were not successful and where they should be
+	 * skipped on a restart (so {@code FAILED} is the wrong status).
 	 */
 
 	/**
@@ -72,8 +72,8 @@ public enum BatchStatus {
 	UNKNOWN;
 
 	/**
-	 * Convenience method to return the higher value status of the statuses passed to the method.
-	 *
+	 * Convenience method to return the higher value status of the statuses passed to the
+	 * method.
 	 * @param status1 The first status to check.
 	 * @param status2 The second status to check.
 	 * @return The higher value status of the two statuses.
@@ -84,31 +84,27 @@ public static BatchStatus max(BatchStatus status1, BatchStatus status2) {
 
 	/**
 	 * Convenience method to decide if a status indicates that work is in progress.
-	 *
 	 * @return true if the status is STARTING, STARTED
 	 */
 	public boolean isRunning() {
 		return this == STARTING || this == STARTED;
 	}
 
 	/**
-	 * Convenience method to decide if a status indicates execution was
-	 * unsuccessful.
-	 *
+	 * Convenience method to decide if a status indicates execution was unsuccessful.
 	 * @return {@code true} if the status is {@code FAILED} or greater.
 	 */
 	public boolean isUnsuccessful() {
 		return this == FAILED || this.isGreaterThan(FAILED);
 	}
 
 	/**
-	 * Method used to move status values through their logical progression, and
-	 * override less severe failures with more severe ones. This value is
-	 * compared with the parameter, and the one that has higher priority is
-	 * returned. If both are {@code STARTED} or less than the value returned is the
-	 * largest in the sequence {@code STARTING}, {@code STARTED}, {@code COMPLETED}. Otherwise, the value
-	 * returned is the maximum of the two.
-	 *
+	 * Method used to move status values through their logical progression, and override
+	 * less severe failures with more severe ones. This value is compared with the
+	 * parameter, and the one that has higher priority is returned. If both are
+	 * {@code STARTED} or less than the value returned is the largest in the sequence
+	 * {@code STARTING}, {@code STARTED}, {@code COMPLETED}. Otherwise, the value returned
+	 * is the maximum of the two.
 	 * @param other Another status to which to compare.
 	 * @return either this or the other status, depending on their priority.
 	 */
@@ -151,7 +147,6 @@ public boolean isLessThanOrEqualTo(BatchStatus other) {
 	 * Find a {@code BatchStatus} that matches the beginning of the given value. If no
 	 * match is found, return {@code COMPLETED} as the default because it has low
 	 * precedence.
-	 *
 	 * @param value A string representing a status.
 	 * @return a {BatchStatus} object.
 	 */
@@ -164,4 +159,5 @@ public static BatchStatus match(String value) {
 		// Default match should be the lowest priority
 		return COMPLETED;
 	}
+
 }

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

@@ -18,9 +18,8 @@
 import org.springframework.batch.core.scope.context.ChunkContext;
 
 /**
- * Listener interface for the lifecycle of a chunk. A chunk
- * can be thought of as a collection of items that are
- * committed together.
+ * Listener interface for the lifecycle of a chunk. A chunk can be thought of as a
+ * collection of items that are committed together.
  *
  * @author Lucas Ward
  * @author Michael Minella
@@ -36,32 +35,30 @@ public interface ChunkListener extends StepListener {
 
 	/**
 	 * Callback before the chunk is executed, but inside the transaction.
-	 *
 	 * @param context The current {@link ChunkContext}
 	 */
 	default void beforeChunk(ChunkContext context) {
 	}
 
 	/**
 	 * Callback after the chunk is executed, outside the transaction.
-	 *
 	 * @param context The current {@link ChunkContext}
 	 */
 	default void afterChunk(ChunkContext context) {
 	}
 
 	/**
-	 * Callback after a chunk has been marked for rollback.  It is invoked
-	 * after transaction rollback. While the rollback will have occurred,
-	 * transactional resources might still be active and accessible. Due to
-	 * this, data access code within this callback still "participates" in
-	 * the original transaction unless it declares that it runs in its own
-	 * transaction. <em>As a result, you should use {@code PROPAGATION_REQUIRES_NEW} for any
-	 * transactional operation that is called from here.</em>
-	 *
-	 * @param context the chunk context containing the exception that caused
-	 * the underlying rollback.
+	 * Callback after a chunk has been marked for rollback. It is invoked after
+	 * transaction rollback. While the rollback will have occurred, transactional
+	 * resources might still be active and accessible. Due to this, data access code
+	 * within this callback still "participates" in the original transaction unless it
+	 * declares that it runs in its own transaction. <em>As a result, you should use
+	 * {@code PROPAGATION_REQUIRES_NEW} for any transactional operation that is called
+	 * from here.</em>
+	 * @param context the chunk context containing the exception that caused the
+	 * underlying rollback.
 	 */
 	default void afterChunkError(ChunkContext context) {
 	}
+
 }

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

@@ -25,10 +25,10 @@
 import org.springframework.util.DigestUtils;
 
 /**
- * Default implementation of the {@link JobKeyGenerator} interface.
- * This implementation provides a single hash value based on the {@link JobParameters} object
- * passed in. Only identifying parameters (as per {@link JobParameter#isIdentifying()})
- * are used in the calculation of the key.
+ * Default implementation of the {@link JobKeyGenerator} interface. This implementation
+ * provides a single hash value based on the {@link JobParameters} object passed in. Only
+ * identifying parameters (as per {@link JobParameter#isIdentifying()}) are used in the
+ * calculation of the key.
  *
  * @author Michael Minella
  * @author Mahmoud Ben Hassine
@@ -50,16 +50,17 @@ public String generateKey(JobParameters source) {
 		Collections.sort(keys);
 		for (String key : keys) {
 			JobParameter jobParameter = props.get(key);
-			if(jobParameter.isIdentifying()) {
-				String value = jobParameter.getValue()==null ? "" : jobParameter.toString();
+			if (jobParameter.isIdentifying()) {
+				String value = jobParameter.getValue() == null ? "" : jobParameter.toString();
 				stringBuffer.append(key).append("=").append(value).append(";");
 			}
 		}
 		try {
 			return DigestUtils.md5DigestAsHex(stringBuffer.toString().getBytes("UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalStateException(
-					"UTF-8 encoding not available.  Fatal (should be in the JDK).");
+		}
+		catch (UnsupportedEncodingException e) {
+			throw new IllegalStateException("UTF-8 encoding not available.  Fatal (should be in the JDK).");
 		}
 	}
+
 }

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

@@ -21,10 +21,9 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Batch Domain Entity class. Any class that should be uniquely identifiable
- * from another should subclass from Entity. See Domain
- * Driven Design, by Eric Evans, for more information on this pattern
- * and the difference between Entities and Value Objects.
+ * Batch Domain Entity class. Any class that should be uniquely identifiable from another
+ * should subclass from Entity. See Domain Driven Design, by Eric Evans, for more
+ * information on this pattern and the difference between Entities and Value Objects.
  *
  * @author Lucas Ward
  * @author Dave Syer
@@ -48,15 +47,14 @@ public Entity() {
 
 	/**
 	 * The constructor for the {@link Entity} where the ID is established.
-	 *
 	 * @param id The ID for the entity.
 	 */
 	public Entity(Long id) {
 		super();
 
-		//Commented out because StepExecutions are still created in a disconnected
-		//manner.  The Repository should create them, then this can be uncommented.
-		//Assert.notNull(id, "Entity id must not be null.");
+		// Commented out because StepExecutions are still created in a disconnected
+		// manner. The Repository should create them, then this can be uncommented.
+		// Assert.notNull(id, "Entity id must not be null.");
 		this.id = id;
 	}
 
@@ -95,23 +93,24 @@ public void setVersion(Integer version) {
 	public void incrementVersion() {
 		if (version == null) {
 			version = 0;
-		} else {
+		}
+		else {
 			version = version + 1;
 		}
 	}
 
-  /**
-	* Creates a string representation of the {@code Entity},
-	* including the {@code id}, {@code version}, and class name.
-  */
+	/**
+	 * Creates a string representation of the {@code Entity}, including the {@code id},
+	 * {@code version}, and class name.
+	 */
 	@Override
 	public String toString() {
 		return String.format("%s: id=%d, version=%d", ClassUtils.getShortName(getClass()), id, version);
 	}
 
 	/**
-	 * Attempt to establish identity based on {@code id} if both exist. If either {@code id}
-	 * does not exist, use {@code Object.equals()}.
+	 * Attempt to establish identity based on {@code id} if both exist. If either
+	 * {@code id} does not exist, use {@code Object.equals()}.
 	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
@@ -135,14 +134,13 @@ public boolean equals(Object other) {
 
 	/**
 	 * Use {@code id}, if it exists, to establish a hash code. Otherwise fall back to
-	 * {@code Object.hashCode()}. It is based on the
-	 * same information as {@code equals}, so, if that
-	 * changes, this will. Note that this follows the contract of {@code Object.hashCode()}
-	 * but will cause problems for anyone adding an unsaved {@link Entity} to a
-	 * {@code Set} because {@code Set.contains()} almost certainly returns false for the
-	 * {@link Entity} after it is saved. Spring Batch does not store any of its
-	 * entities in sets as a matter of course, so this is internally consistent.
-	 * Clients should not be exposed to unsaved entities.
+	 * {@code Object.hashCode()}. It is based on the same information as {@code equals},
+	 * so, if that changes, this will. Note that this follows the contract of
+	 * {@code Object.hashCode()} but will cause problems for anyone adding an unsaved
+	 * {@link Entity} to a {@code Set} because {@code Set.contains()} almost certainly
+	 * returns false for the {@link Entity} after it is saved. Spring Batch does not store
+	 * any of its entities in sets as a matter of course, so this is internally
+	 * consistent. Clients should not be exposed to unsaved entities.
 	 *
 	 * @see java.lang.Object#hashCode()
 	 */