Skip to content

Commit 972951a

Browse files
committed
Remove unused imports and apply imports code style
1 parent babb913 commit 972951a

File tree

139 files changed

+194
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+194
-414
lines changed

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

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.batch.core;
1717

18-
import java.util.List;
19-
2018
import org.springframework.batch.core.scope.context.ChunkContext;
2119
import org.springframework.batch.item.Chunk;
2220
import org.springframework.batch.item.ItemWriter;

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;
2222
import java.lang.annotation.Target;
23-
import java.util.List;
2423

2524
import org.springframework.batch.core.ItemWriteListener;
2625
import org.springframework.batch.item.ItemWriter;

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;
2222
import java.lang.annotation.Target;
23-
import java.util.List;
2423

2524
import org.springframework.batch.core.ItemWriteListener;
2625
import org.springframework.batch.item.ItemWriter;

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;
2222
import java.lang.annotation.Target;
23-
import java.util.List;
2423

2524
import org.springframework.batch.core.ItemWriteListener;
2625
import org.springframework.batch.item.ItemWriter;

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

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.configuration.annotation;
1717

18-
import java.util.Iterator;
19-
2018
import org.springframework.batch.core.configuration.JobRegistry;
2119
import org.springframework.batch.core.configuration.support.ApplicationContextFactory;
2220
import org.springframework.batch.core.configuration.support.AutomaticJobRegistrar;

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

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.springframework.batch.core.repository.JobRepository;
1919
import org.springframework.batch.core.step.builder.StepBuilder;
20-
import org.springframework.transaction.PlatformTransactionManager;
2120
import org.springframework.util.Assert;
2221

2322
/**

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.commons.logging.Log;
2828
import org.apache.commons.logging.LogFactory;
2929

30-
import org.springframework.batch.core.Job;
3130
import org.springframework.batch.core.JobExecutionListener;
3231
import org.springframework.batch.core.JobParametersIncrementer;
3332
import org.springframework.batch.core.JobParametersValidator;

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java

-11
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,18 @@
1515
*/
1616
package org.springframework.batch.core.launch.support;
1717

18-
import java.time.Duration;
19-
20-
import org.apache.commons.logging.Log;
21-
import org.apache.commons.logging.LogFactory;
22-
import org.springframework.batch.core.BatchStatus;
23-
import org.springframework.batch.core.ExitStatus;
2418
import org.springframework.batch.core.Job;
2519
import org.springframework.batch.core.JobExecution;
2620
import org.springframework.batch.core.JobInstance;
2721
import org.springframework.batch.core.JobParameters;
2822
import org.springframework.batch.core.JobParametersInvalidException;
29-
import org.springframework.batch.core.StepExecution;
3023
import org.springframework.batch.core.launch.JobLauncher;
31-
import org.springframework.batch.core.observability.BatchMetrics;
3224
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
3325
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
3426
import org.springframework.batch.core.repository.JobRepository;
3527
import org.springframework.batch.core.repository.JobRestartException;
36-
import org.springframework.beans.factory.InitializingBean;
3728
import org.springframework.core.task.SyncTaskExecutor;
3829
import org.springframework.core.task.TaskExecutor;
39-
import org.springframework.core.task.TaskRejectedException;
40-
import org.springframework.util.Assert;
4130

4231
/**
4332
* Implementation of the {@link JobLauncher} interface based on a {@link TaskExecutor}.

spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.lang.annotation.Annotation;
1919
import java.util.HashMap;
20-
import java.util.List;
2120
import java.util.Map;
2221

2322
import org.springframework.batch.core.ChunkListener;

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.HashMap;
2525
import java.util.HashSet;
2626
import java.util.List;
27-
import java.util.Date;
2827
import java.util.Map;
2928
import java.util.Set;
3029

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.sql.SQLException;
2222
import java.sql.Timestamp;
2323
import java.sql.Types;
24-
import java.time.LocalDateTime;
2524
import java.util.ArrayList;
2625
import java.util.Arrays;
2726
import java.util.Collection;

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.springframework.batch.core.JobExecution;
2323
import org.springframework.batch.core.JobInstance;
24-
import org.springframework.batch.core.StepExecution;
2524
import org.springframework.lang.Nullable;
2625

2726
/**

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
5555
import org.springframework.batch.repeat.support.RepeatTemplate;
5656
import org.springframework.batch.support.ReflectionUtils;
57-
import org.springframework.transaction.PlatformTransactionManager;
5857
import org.springframework.util.Assert;
5958

6059
/**

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.commons.logging.Log;
2828
import org.apache.commons.logging.LogFactory;
2929

30-
import org.springframework.batch.core.Step;
3130
import org.springframework.batch.core.StepExecutionListener;
3231
import org.springframework.batch.core.annotation.AfterStep;
3332
import org.springframework.batch.core.annotation.BeforeStep;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
*/
1616
package org.springframework.batch.core.step.item;
1717

18-
import java.util.List;
19-
2018
import org.apache.commons.logging.Log;
2119
import org.apache.commons.logging.LogFactory;
20+
2221
import org.springframework.batch.core.listener.ItemListenerSupport;
2322
import org.springframework.batch.item.Chunk;
2423

spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*/
1616
package org.springframework.batch.core;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertFalse;
20-
import static org.junit.jupiter.api.Assertions.assertNotNull;
21-
import static org.junit.jupiter.api.Assertions.assertNull;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
23-
2418
import java.time.LocalDateTime;
25-
import java.time.temporal.ChronoUnit;
2619
import java.util.Arrays;
2720
import java.util.List;
2821

2922
import org.junit.jupiter.api.Test;
23+
3024
import org.springframework.util.SerializationUtils;
3125

26+
import static org.junit.jupiter.api.Assertions.assertEquals;
27+
import static org.junit.jupiter.api.Assertions.assertFalse;
28+
import static org.junit.jupiter.api.Assertions.assertNotNull;
29+
import static org.junit.jupiter.api.Assertions.assertNull;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
31+
3232
/**
3333
* @author Dave Syer
3434
* @author Dimitrios Liapis

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,21 @@
1616

1717
package org.springframework.batch.core.configuration.annotation;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
2119
import javax.sql.DataSource;
2220

2321
import org.junit.jupiter.api.Test;
22+
2423
import org.springframework.batch.core.BatchStatus;
25-
import org.springframework.batch.core.ExitStatus;
2624
import org.springframework.batch.core.Job;
2725
import org.springframework.batch.core.JobExecution;
2826
import org.springframework.batch.core.JobParametersBuilder;
2927
import org.springframework.batch.core.Step;
3028
import org.springframework.batch.core.StepContribution;
31-
import org.springframework.batch.core.StepExecution;
3229
import org.springframework.batch.core.job.builder.JobBuilder;
3330
import org.springframework.batch.core.job.builder.SimpleJobBuilder;
3431
import org.springframework.batch.core.launch.JobLauncher;
3532
import org.springframework.batch.core.repository.JobRepository;
3633
import org.springframework.batch.core.scope.context.ChunkContext;
37-
import org.springframework.batch.core.step.AbstractStep;
3834
import org.springframework.batch.core.step.builder.StepBuilder;
3935
import org.springframework.batch.core.step.tasklet.Tasklet;
4036
import org.springframework.batch.repeat.RepeatStatus;
@@ -47,6 +43,8 @@
4743
import org.springframework.jdbc.support.JdbcTransactionManager;
4844
import org.springframework.lang.Nullable;
4945

46+
import static org.junit.jupiter.api.Assertions.assertEquals;
47+
5048
/**
5149
* @author Dave Syer
5250
* @author Mahmoud Ben Hassine

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
package org.springframework.batch.core.configuration.annotation;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertThrows;
21-
import static org.junit.jupiter.api.Assertions.assertTrue;
22-
2319
import java.util.concurrent.Callable;
2420

2521
import org.junit.jupiter.api.AfterEach;
@@ -40,13 +36,16 @@
4036
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
4137
import org.springframework.context.annotation.Bean;
4238
import org.springframework.context.annotation.Configuration;
43-
import org.springframework.context.annotation.Import;
4439
import org.springframework.context.annotation.ImportResource;
4540
import org.springframework.context.annotation.Scope;
4641
import org.springframework.context.annotation.ScopedProxyMode;
4742
import org.springframework.context.support.ClassPathXmlApplicationContext;
4843
import org.springframework.lang.Nullable;
4944

45+
import static org.junit.jupiter.api.Assertions.assertEquals;
46+
import static org.junit.jupiter.api.Assertions.assertThrows;
47+
import static org.junit.jupiter.api.Assertions.assertTrue;
48+
5049
/**
5150
* @author Dave Syer
5251
* @author Michael Minella

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemWriter.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.configuration.xml;
1717

18-
import java.util.List;
19-
2018
import org.springframework.batch.item.Chunk;
2119
import org.springframework.batch.item.ItemWriter;
2220

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.configuration.xml;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertSame;
20-
import static org.junit.jupiter.api.Assertions.assertThrows;
21-
import static org.junit.jupiter.api.Assertions.assertTrue;
22-
2318
import java.util.ArrayList;
2419
import java.util.Arrays;
2520
import java.util.Collection;
@@ -31,6 +26,7 @@
3126

3227
import org.junit.jupiter.api.BeforeAll;
3328
import org.junit.jupiter.api.Test;
29+
3430
import org.springframework.aop.framework.Advised;
3531
import org.springframework.batch.core.Step;
3632
import org.springframework.batch.core.StepExecutionListener;
@@ -63,6 +59,10 @@
6359
import org.springframework.transaction.TransactionDefinition;
6460
import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
6561

62+
import static org.junit.jupiter.api.Assertions.assertEquals;
63+
import static org.junit.jupiter.api.Assertions.assertThrows;
64+
import static org.junit.jupiter.api.Assertions.assertTrue;
65+
6666
/**
6767
* @author Thomas Risberg
6868
* @author Dan Garrette

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestPojoListener.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.configuration.xml;
1717

18-
import java.util.List;
19-
2018
import org.springframework.batch.core.annotation.AfterWrite;
2119
import org.springframework.batch.item.Chunk;
2220

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestWriter.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.configuration.xml;
1717

18-
import java.util.List;
19-
2018
import org.springframework.batch.item.Chunk;
2119
import org.springframework.batch.item.ItemWriter;
2220

spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
*/
1616
package org.springframework.batch.core.explore.support;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertNotNull;
20-
import static org.junit.jupiter.api.Assertions.assertThrows;
21-
import static org.junit.jupiter.api.Assertions.assertTrue;
22-
import static org.mockito.Mockito.mock;
23-
2418
import javax.sql.DataSource;
2519

2620
import org.junit.jupiter.api.Assertions;
@@ -31,14 +25,19 @@
3125
import org.springframework.aop.Advisor;
3226
import org.springframework.aop.framework.Advised;
3327
import org.springframework.batch.core.explore.JobExplorer;
34-
import org.springframework.batch.core.repository.JobRepository;
3528
import org.springframework.jdbc.core.JdbcOperations;
3629
import org.springframework.jdbc.core.JdbcTemplate;
3730
import org.springframework.test.util.ReflectionTestUtils;
3831
import org.springframework.transaction.PlatformTransactionManager;
3932
import org.springframework.transaction.interceptor.TransactionAttributeSource;
4033
import org.springframework.transaction.interceptor.TransactionInterceptor;
4134

35+
import static org.junit.jupiter.api.Assertions.assertEquals;
36+
import static org.junit.jupiter.api.Assertions.assertNotNull;
37+
import static org.junit.jupiter.api.Assertions.assertThrows;
38+
import static org.junit.jupiter.api.Assertions.assertTrue;
39+
import static org.mockito.Mockito.mock;
40+
4241
/**
4342
* @author Dave Syer
4443
* @author Will Schipp

spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,13 @@
1616

1717
package org.springframework.batch.core.launch;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertSame;
21-
import static org.junit.jupiter.api.Assertions.assertThrows;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
23-
import static org.junit.jupiter.api.Assertions.fail;
24-
import static org.mockito.Mockito.mock;
25-
import static org.mockito.Mockito.when;
26-
2719
import java.util.ArrayList;
2820
import java.util.Arrays;
2921
import java.util.List;
3022

3123
import org.junit.jupiter.api.BeforeEach;
3224
import org.junit.jupiter.api.Test;
25+
3326
import org.springframework.batch.core.BatchStatus;
3427
import org.springframework.batch.core.ExitStatus;
3528
import org.springframework.batch.core.Job;
@@ -49,6 +42,12 @@
4942
import org.springframework.core.task.TaskExecutor;
5043
import org.springframework.core.task.TaskRejectedException;
5144

45+
import static org.junit.jupiter.api.Assertions.assertEquals;
46+
import static org.junit.jupiter.api.Assertions.assertThrows;
47+
import static org.junit.jupiter.api.Assertions.assertTrue;
48+
import static org.mockito.Mockito.mock;
49+
import static org.mockito.Mockito.when;
50+
5251
/**
5352
* @author Lucas Ward
5453
* @author Will Schipp

spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
*/
1616
package org.springframework.batch.core.listener;
1717

18-
import static org.mockito.Mockito.mock;
19-
2018
import java.util.ArrayList;
21-
import java.util.Collections;
22-
import java.util.List;
2319

2420
import org.junit.jupiter.api.BeforeEach;
2521
import org.junit.jupiter.api.Test;
22+
2623
import org.springframework.batch.core.ItemWriteListener;
2724
import org.springframework.batch.item.Chunk;
2825

26+
import static org.mockito.Mockito.mock;
27+
2928
/**
3029
* @author Lucas Ward
3130
* @author Will Schipp

0 commit comments

Comments
 (0)