Make inner classes static

fmbenhassine · fmbenhassine · commit 5c8cb7663ff0 · 2023-07-04T21:03:55.000+02:00
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
@@ -353,7 +353,7 @@ public void afterPropertiesSet() throws Exception {
 	 * @author Dave Syer
 	 *
 	 */
-	private final class JobInstanceRowMapper implements RowMapper<JobInstance> {
+	private static final class JobInstanceRowMapper implements RowMapper<JobInstance> {
 
 		public JobInstanceRowMapper() {
 		}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
@@ -694,7 +694,7 @@ private void addNonRetryableExceptionIfMissing(Class<? extends Throwable>... cls
 	 * must be handled in the implementation or the step will terminate
 	 *
 	 */
-	private class TerminateOnExceptionChunkListenerDelegate implements ChunkListener {
+	private static class TerminateOnExceptionChunkListenerDelegate implements ChunkListener {
 
 		private ChunkListener chunkListener;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 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.
@@ -52,11 +52,12 @@
  * other items in the same batch fail fatally first.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class BatchRetryTemplate implements RetryOperations {
 
-	private class BatchRetryState extends DefaultRetryState {
+	private static class BatchRetryState extends DefaultRetryState {
 
 		private final Collection<RetryState> keys;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -37,6 +37,7 @@
 
 /**
  * @author Lucas Ward
+ * @author Mahmoud Ben Hassine
  *
  */
 class JobListenerFactoryBeanTests {
@@ -233,7 +234,7 @@ public void aMethod(Integer item) {
 		assertThrows(IllegalArgumentException.class, factoryBean::getObject);
 	}
 
-	private class JobListenerWithInterface implements JobExecutionListener {
+	private static class JobListenerWithInterface implements JobExecutionListener {
 
 		boolean beforeJobCalled = false;
 
@@ -251,7 +252,7 @@ public void beforeJob(JobExecution jobExecution) {
 
 	}
 
-	private class AnnotatedTestClass {
+	private static class AnnotatedTestClass {
 
 		boolean beforeJobCalled = false;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
@@ -548,7 +548,7 @@ void testAfterChunkFails_withAnnotatedListener() {
 		assertEquals("listener error", message, "Wrong message: " + message);
 	}
 
-	private final class AnnotationBasedStepListener {
+	private static final class AnnotationBasedStepListener {
 
 		private IllegalStateException exception = new IllegalStateException("listener error");
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java
@@ -363,7 +363,7 @@ public void aMethod(Integer item) {
 		assertThrows(IllegalArgumentException.class, factoryBean::getObject);
 	}
 
-	private class MultipleAfterStep implements StepExecutionListener {
+	private static class MultipleAfterStep implements StepExecutionListener {
 
 		int callcount = 0;
 
@@ -384,7 +384,7 @@ public void beforeStep(StepExecution stepExecution) {
 	}
 
 	@SuppressWarnings("unused")
-	private class ThreeStepExecutionListener implements StepExecutionListener {
+	private static class ThreeStepExecutionListener implements StepExecutionListener {
 
 		int callcount = 0;
 
@@ -413,7 +413,7 @@ public void after() {
 	}
 
 	@SuppressWarnings("unused")
-	private class TestListener implements SkipListener<String, Integer> {
+	private static class TestListener implements SkipListener<String, Integer> {
 
 		boolean beforeStepCalled = false;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java
@@ -589,7 +589,7 @@ private Map<Class<? extends Throwable>, Boolean> getExceptionMap(Class<? extends
 		return map;
 	}
 
-	class ExceptionThrowingChunkListener implements ChunkListener {
+	static class ExceptionThrowingChunkListener implements ChunkListener {
 
 		private int phase = -1;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
@@ -929,7 +929,7 @@ public void update(StepExecution stepExecution) {
 
 	}
 
-	private class MockRestartableItemReader extends AbstractItemStreamItemReader<String>
+	private static class MockRestartableItemReader extends AbstractItemStreamItemReader<String>
 			implements StepExecutionListener {
 
 		private boolean getExecutionAttributesCalled = false;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-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.
@@ -199,7 +199,7 @@ public void handleRecord(LdapAttributes attributes) {
 
 	}
 
-	public class TestMapper implements RecordMapper<LdapAttributes> {
+	public static class TestMapper implements RecordMapper<LdapAttributes> {
 
 		@Nullable
 		@Override
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java
@@ -260,7 +260,7 @@ private StepExecution execute(Step step) throws Exception {
 		return stepExecution;
 	}
 
-	private class SkipIllegalArgumentExceptionSkipPolicy implements SkipPolicy {
+	private static class SkipIllegalArgumentExceptionSkipPolicy implements SkipPolicy {
 
 		@Override
 		public boolean shouldSkip(Throwable throwable, long skipCount) throws SkipLimitExceededException {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.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.
@@ -31,6 +31,7 @@
  * implementation.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.1
  */
 public class SimpleBinaryBufferedReaderFactory implements BufferedReaderFactory {
@@ -61,7 +62,7 @@ public BufferedReader create(Resource resource, String encoding) throws Unsuppor
 	 * @author Dave Syer
 	 *
 	 */
-	private final class BinaryBufferedReader extends BufferedReader {
+	private static final class BinaryBufferedReader extends BufferedReader {
 
 		private final String ending;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java
@@ -54,7 +54,7 @@ public class JdbcBatchItemWriterNamedParameterTests {
 	private final String sql = "update foo set bar = :bar where id = :id";
 
 	@SuppressWarnings("unused")
-	private class Foo {
+	private static class Foo {
 
 		private Long id;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SimpleMethodInvokerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SimpleMethodInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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 Lucas Ward
+ * @author Mahmoud Ben Hassine
  *
  */
 class SimpleMethodInvokerTests {
@@ -106,7 +107,7 @@ void testEquals() throws Exception {
 	}
 
 	@SuppressWarnings("unused")
-	private class TestClass {
+	private static class TestClass {
 
 		boolean beforeCalled = false;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemWriterTests.java
@@ -193,7 +193,7 @@ void testNonStreamDelegate() throws Exception {
 		assertFalse(itemWriter.isClosed);
 	}
 
-	private class ListItemWriter implements ItemWriter<String> {
+	private static class ListItemWriter implements ItemWriter<String> {
 
 		protected List<String> items;
 
@@ -214,7 +214,7 @@ public void write(Chunk<? extends String> chunk) throws Exception {
 
 	}
 
-	private class ListItemStreamWriter implements ItemStreamWriter<String> {
+	private static class ListItemStreamWriter implements ItemStreamWriter<String> {
 
 		public boolean isOpened = false;
 
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.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.
@@ -61,6 +61,7 @@
  *
  * @author Dave Syer
  * @author Jimmy Praet
+ * @author Mahmoud Ben Hassine
  */
 public class JobScopeTestExecutionListener implements TestExecutionListener {
 
@@ -139,7 +140,7 @@ protected JobExecution getJobExecution(TestContext testContext) {
 	 * Look for a method returning the type provided, preferring one with the name
 	 * provided.
 	 */
-	private final class ExtractorMethodCallback implements MethodCallback {
+	private static final class ExtractorMethodCallback implements MethodCallback {
 
 		private String preferredName;
 
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.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.
@@ -62,6 +62,7 @@
  *
  * @author Dave Syer
  * @author Chris Schaefer
+ * @author Mahmoud Ben Hassine
  */
 public class StepScopeTestExecutionListener implements TestExecutionListener {
 
@@ -142,7 +143,7 @@ protected StepExecution getStepExecution(TestContext testContext) {
 	 * Look for a method returning the type provided, preferring one with the name
 	 * provided.
 	 */
-	private final class ExtractorMethodCallback implements MethodCallback {
+	private static final class ExtractorMethodCallback implements MethodCallback {
 
 		private String preferredName;
 

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ public void afterPropertiesSet() throws Exception {`
`353`	`353`	`* @author Dave Syer`
`354`	`354`	`*`
`355`	`355`	`*/`
`356`		`- private final class JobInstanceRowMapper implements RowMapper<JobInstance> {`
	`356`	`+ private static final class JobInstanceRowMapper implements RowMapper<JobInstance> {`
`357`	`357`
`358`	`358`	`public JobInstanceRowMapper() {`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ private void addNonRetryableExceptionIfMissing(Class<? extends Throwable>... cls`
`694`	`694`	`* must be handled in the implementation or the step will terminate`
`695`	`695`	`*`
`696`	`696`	`*/`
`697`		`- private class TerminateOnExceptionChunkListenerDelegate implements ChunkListener {`
	`697`	`+ private static class TerminateOnExceptionChunkListenerDelegate implements ChunkListener {`
`698`	`698`
`699`	`699`	`private ChunkListener chunkListener;`
`700`	`700`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2013 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.`
`@@ -52,11 +52,12 @@`
`52`	`52`	`* other items in the same batch fail fatally first.`
`53`	`53`	`*`
`54`	`54`	`* @author Dave Syer`
	`55`	`+ * @author Mahmoud Ben Hassine`
`55`	`56`	`*`
`56`	`57`	`*/`
`57`	`58`	`public class BatchRetryTemplate implements RetryOperations {`
`58`	`59`
`59`		`- private class BatchRetryState extends DefaultRetryState {`
	`60`	`+ private static class BatchRetryState extends DefaultRetryState {`
`60`	`61`
`61`	`62`	`private final Collection<RetryState> keys;`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-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.`
`@@ -37,6 +37,7 @@`
`37`	`37`
`38`	`38`	`/**`
`39`	`39`	`* @author Lucas Ward`
	`40`	`+ * @author Mahmoud Ben Hassine`
`40`	`41`	`*`
`41`	`42`	`*/`
`42`	`43`	`class JobListenerFactoryBeanTests {`
`@@ -233,7 +234,7 @@ public void aMethod(Integer item) {`
`233`	`234`	`assertThrows(IllegalArgumentException.class, factoryBean::getObject);`
`234`	`235`	`}`
`235`	`236`
`236`		`- private class JobListenerWithInterface implements JobExecutionListener {`
	`237`	`+ private static class JobListenerWithInterface implements JobExecutionListener {`
`237`	`238`
`238`	`239`	`boolean beforeJobCalled = false;`
`239`	`240`
`@@ -251,7 +252,7 @@ public void beforeJob(JobExecution jobExecution) {`
`251`	`252`
`252`	`253`	`}`
`253`	`254`
`254`		`- private class AnnotatedTestClass {`
	`255`	`+ private static class AnnotatedTestClass {`
`255`	`256`
`256`	`257`	`boolean beforeJobCalled = false;`
`257`	`258`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ void testAfterChunkFails_withAnnotatedListener() {`
`548`	`548`	`assertEquals("listener error", message, "Wrong message: " + message);`
`549`	`549`	`}`
`550`	`550`
`551`		`- private final class AnnotationBasedStepListener {`
	`551`	`+ private static final class AnnotationBasedStepListener {`
`552`	`552`
`553`	`553`	`private IllegalStateException exception = new IllegalStateException("listener error");`
`554`	`554`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public void aMethod(Integer item) {`
`363`	`363`	`assertThrows(IllegalArgumentException.class, factoryBean::getObject);`
`364`	`364`	`}`
`365`	`365`
`366`		`- private class MultipleAfterStep implements StepExecutionListener {`
	`366`	`+ private static class MultipleAfterStep implements StepExecutionListener {`
`367`	`367`
`368`	`368`	`int callcount = 0;`
`369`	`369`
`@@ -384,7 +384,7 @@ public void beforeStep(StepExecution stepExecution) {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`@SuppressWarnings("unused")`
`387`		`- private class ThreeStepExecutionListener implements StepExecutionListener {`
	`387`	`+ private static class ThreeStepExecutionListener implements StepExecutionListener {`
`388`	`388`
`389`	`389`	`int callcount = 0;`
`390`	`390`
`@@ -413,7 +413,7 @@ public void after() {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`@SuppressWarnings("unused")`
`416`		`- private class TestListener implements SkipListener<String, Integer> {`
	`416`	`+ private static class TestListener implements SkipListener<String, Integer> {`
`417`	`417`
`418`	`418`	`boolean beforeStepCalled = false;`
`419`	`419`
Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ private Map<Class<? extends Throwable>, Boolean> getExceptionMap(Class<? extends`
`589`	`589`	`return map;`
`590`	`590`	`}`
`591`	`591`
`592`		`- class ExceptionThrowingChunkListener implements ChunkListener {`
	`592`	`+ static class ExceptionThrowingChunkListener implements ChunkListener {`
`593`	`593`
`594`	`594`	`private int phase = -1;`
`595`	`595`
Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ public void update(StepExecution stepExecution) {`
`929`	`929`
`930`	`930`	`}`
`931`	`931`
`932`		`- private class MockRestartableItemReader extends AbstractItemStreamItemReader<String>`
	`932`	`+ private static class MockRestartableItemReader extends AbstractItemStreamItemReader<String>`
`933`	`933`	`implements StepExecutionListener {`
`934`	`934`
`935`	`935`	`private boolean getExecutionAttributesCalled = false;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2017-2022 the original author or authors.`
	`2`	`+ * Copyright 2017-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.`
`@@ -199,7 +199,7 @@ public void handleRecord(LdapAttributes attributes) {`
`199`	`199`
`200`	`200`	`}`
`201`	`201`
`202`		`- public class TestMapper implements RecordMapper<LdapAttributes> {`
	`202`	`+ public static class TestMapper implements RecordMapper<LdapAttributes> {`
`203`	`203`
`204`	`204`	`@Nullable`
`205`	`205`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private StepExecution execute(Step step) throws Exception {`
`260`	`260`	`return stepExecution;`
`261`	`261`	`}`
`262`	`262`
`263`		`- private class SkipIllegalArgumentExceptionSkipPolicy implements SkipPolicy {`
	`263`	`+ private static class SkipIllegalArgumentExceptionSkipPolicy implements SkipPolicy {`
`264`	`264`
`265`	`265`	`@Override`
`266`	`266`	`public boolean shouldSkip(Throwable throwable, long skipCount) throws SkipLimitExceededException {`