Replace for loops with enhanced for loop where appropriate

fmbenhassine · fmbenhassine · commit 7babb341f5da · 2023-06-12T16:05:44.000+02:00
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -231,8 +231,8 @@ public JobParametersIncrementer getJobParametersIncrementer() {
 	 * @param listeners the listeners to set.
 	 */
 	public void setJobExecutionListeners(JobExecutionListener[] listeners) {
-		for (int i = 0; i < listeners.length; i++) {
-			this.listener.register(listeners[i]);
+		for (JobExecutionListener jobExecutionListener : listeners) {
+			this.listener.register(jobExecutionListener);
 		}
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -379,8 +379,8 @@ public void registerStepExecutionListener(StepExecutionListener listener) {
 	 * @param listeners an array of listener objects of known types.
 	 */
 	public void setStepExecutionListeners(StepExecutionListener[] listeners) {
-		for (int i = 0; i < listeners.length; i++) {
-			registerStepExecutionListener(listeners[i]);
+		for (StepExecutionListener listener : listeners) {
+			registerStepExecutionListener(listener);
 		}
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -167,8 +167,8 @@ public void registerChunkListener(ChunkListener listener) {
 	 * @param listeners an array of listener objects of known types.
 	 */
 	public void setChunkListeners(ChunkListener[] listeners) {
-		for (int i = 0; i < listeners.length; i++) {
-			registerChunkListener(listeners[i]);
+		for (ChunkListener listener : listeners) {
+			registerChunkListener(listener);
 		}
 	}
 
@@ -182,8 +182,8 @@ public void setChunkListeners(ChunkListener[] listeners) {
 	 * @param streams an array of {@link ItemStream} objects.
 	 */
 	public void setStreams(ItemStream[] streams) {
-		for (int i = 0; i < streams.length; i++) {
-			registerStream(streams[i]);
+		for (ItemStream itemStream : streams) {
+			registerStream(itemStream);
 		}
 	}
 
diff --git a/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -83,8 +83,7 @@ public void afterPropertiesSet() throws Exception {
 	private void initialize() {
 		if (!initialized) {
 			if (initScripts != null) {
-				for (int i = 0; i < initScripts.length; i++) {
-					Resource script = initScripts[i];
+				for (Resource script : initScripts) {
 					doExecuteScript(script);
 				}
 			}
@@ -112,8 +111,8 @@ public Void doInTransaction(TransactionStatus status) {
 				catch (IOException e) {
 					throw new BeanInitializationException("Cannot load script from [" + scriptResource + "]", e);
 				}
-				for (int i = 0; i < scripts.length; i++) {
-					String script = scripts[i].trim();
+				for (String s : scripts) {
+					String script = s.trim();
 					if (StringUtils.hasText(script)) {
 						try {
 							jdbcTemplate.execute(script);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -35,6 +35,7 @@
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 1.0
  * @see #forProperty(String, Class)
  */
@@ -128,9 +129,9 @@ else if (i == this.possibleMatches.length - 2) {
 	 */
 	private String[] calculateMatches(PropertyDescriptor[] propertyDescriptors, int maxDistance) {
 		List<String> candidates = new ArrayList<>();
-		for (int i = 0; i < propertyDescriptors.length; i++) {
-			if (propertyDescriptors[i].getWriteMethod() != null) {
-				String possibleAlternative = propertyDescriptors[i].getName();
+		for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+			if (propertyDescriptor.getWriteMethod() != null) {
+				String possibleAlternative = propertyDescriptor.getName();
 				int distance = calculateStringDistance(this.propertyName, possibleAlternative);
 				if (distance <= maxDistance) {
 					candidates.add(possibleAlternative);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2014 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -29,6 +29,7 @@
  * @author Dave Syer
  * @author Lucas Ward
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  */
 public class FixedLengthTokenizer extends AbstractLineTokenizer {
 
@@ -67,13 +68,13 @@ private void calculateMaxRange(Range[] ranges) {
 		open = false;
 		maxRange = ranges[0].getMin();
 
-		for (int i = 0; i < ranges.length; i++) {
+		for (Range range : ranges) {
 			int upperBound;
-			if (ranges[i].hasMaxValue()) {
-				upperBound = ranges[i].getMax();
+			if (range.hasMaxValue()) {
+				upperBound = range.getMax();
 			}
 			else {
-				upperBound = ranges[i].getMin();
+				upperBound = range.getMin();
 				if (upperBound > maxRange) {
 					open = true;
 				}
@@ -110,10 +111,10 @@ protected List<String> doTokenize(String line) {
 					line);
 		}
 
-		for (int i = 0; i < ranges.length; i++) {
+		for (Range range : ranges) {
 
-			int startPos = ranges[i].getMin() - 1;
-			int endPos = ranges[i].getMax();
+			int startPos = range.getMin() - 1;
+			int endPos = range.getMax();
 
 			if (lineLength >= endPos) {
 				token = line.substring(startPos, endPos);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -24,6 +24,7 @@
  * Composite {@link ExceptionHandler} that loops though a list of delegates.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class CompositeExceptionHandler implements ExceptionHandler {
@@ -42,8 +43,7 @@ public void setHandlers(ExceptionHandler[] handlers) {
 	 */
 	@Override
 	public void handleException(RepeatContext context, Throwable throwable) throws Throwable {
-		for (int i = 0; i < handlers.length; i++) {
-			ExceptionHandler handler = handlers[i];
+		for (ExceptionHandler handler : handlers) {
 			handler.handleException(context, throwable);
 		}
 	}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -30,6 +30,7 @@
  * consensus.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class CompositeCompletionPolicy implements CompletionPolicy {
@@ -88,8 +89,8 @@ public boolean isComplete(RepeatContext context) {
 	@Override
 	public RepeatContext start(RepeatContext context) {
 		List<RepeatContext> list = new ArrayList<>();
-		for (int i = 0; i < policies.length; i++) {
-			list.add(policies[i].start(context));
+		for (CompletionPolicy policy : policies) {
+			list.add(policy.start(context));
 		}
 		return new CompositeBatchContext(context, list);
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -60,6 +60,7 @@
  * interceptor.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class RepeatTemplate implements RepeatOperations {
@@ -190,8 +191,7 @@ private RepeatStatus executeInternal(final RepeatCallback callback) {
 				 * all happen in the same thread - it's easier for tracking batch status,
 				 * amongst other things.
 				 */
-				for (int i = 0; i < listeners.length; i++) {
-					RepeatListener interceptor = listeners[i];
+				for (RepeatListener interceptor : listeners) {
 					interceptor.before(context);
 					// Allow before interceptors to veto the batch by setting
 					// flag.
diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 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.
@@ -86,8 +86,7 @@ public void destroy() {
 	public void doDestroy() {
 		if (destroyScripts == null)
 			return;
-		for (int i = 0; i < destroyScripts.length; i++) {
-			Resource destroyScript = destroyScripts[i];
+		for (Resource destroyScript : destroyScripts) {
 			try {
 				doExecuteScript(destroyScript);
 			}
@@ -112,8 +111,7 @@ private void initialize() {
 		if (!initialized) {
 			doDestroy();
 			if (initScripts != null) {
-				for (int i = 0; i < initScripts.length; i++) {
-					Resource initScript = initScripts[i];
+				for (Resource initScript : initScripts) {
 					doExecuteScript(initScript);
 				}
 			}
@@ -140,8 +138,8 @@ public Void doInTransaction(TransactionStatus status) {
 				catch (IOException e) {
 					throw new BeanInitializationException("Cannot load script from [" + scriptResource + "]", e);
 				}
-				for (int i = 0; i < scripts.length; i++) {
-					String script = scripts[i].trim();
+				for (String s : scripts) {
+					String script = s.trim();
 					if (StringUtils.hasText(script)) {
 						try {
 							jdbcTemplate.execute(script);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2022 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -231,8 +231,8 @@ public JobParametersIncrementer getJobParametersIncrementer() {`
`231`	`231`	`* @param listeners the listeners to set.`
`232`	`232`	`*/`
`233`	`233`	`public void setJobExecutionListeners(JobExecutionListener[] listeners) {`
`234`		`- for (int i = 0; i < listeners.length; i++) {`
`235`		`- this.listener.register(listeners[i]);`
	`234`	`+ for (JobExecutionListener jobExecutionListener : listeners) {`
	`235`	`+ this.listener.register(jobExecutionListener);`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2021 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -167,8 +167,8 @@ public void registerChunkListener(ChunkListener listener) {`
`167`	`167`	`* @param listeners an array of listener objects of known types.`
`168`	`168`	`*/`
`169`	`169`	`public void setChunkListeners(ChunkListener[] listeners) {`
`170`		`- for (int i = 0; i < listeners.length; i++) {`
`171`		`- registerChunkListener(listeners[i]);`
	`170`	`+ for (ChunkListener listener : listeners) {`
	`171`	`+ registerChunkListener(listener);`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`@@ -182,8 +182,8 @@ public void setChunkListeners(ChunkListener[] listeners) {`
`182`	`182`	`* @param streams an array of {@link ItemStream} objects.`
`183`	`183`	`*/`
`184`	`184`	`public void setStreams(ItemStream[] streams) {`
`185`		`- for (int i = 0; i < streams.length; i++) {`
`186`		`- registerStream(streams[i]);`
	`185`	`+ for (ItemStream itemStream : streams) {`
	`186`	`+ registerStream(itemStream);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2007 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -24,6 +24,7 @@`
`24`	`24`	`* Composite {@link ExceptionHandler} that loops though a list of delegates.`
`25`	`25`	`*`
`26`	`26`	`* @author Dave Syer`
	`27`	`+ * @author Mahmoud Ben Hassine`
`27`	`28`	`*`
`28`	`29`	`*/`
`29`	`30`	`public class CompositeExceptionHandler implements ExceptionHandler {`
`@@ -42,8 +43,7 @@ public void setHandlers(ExceptionHandler[] handlers) {`
`42`	`43`	`*/`
`43`	`44`	`@Override`
`44`	`45`	`public void handleException(RepeatContext context, Throwable throwable) throws Throwable {`
`45`		`- for (int i = 0; i < handlers.length; i++) {`
`46`		`- ExceptionHandler handler = handlers[i];`
	`46`	`+ for (ExceptionHandler handler : handlers) {`
`47`	`47`	`handler.handleException(context, throwable);`
`48`	`48`	`}`
`49`	`49`	`}`