Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use annotation @Override consistently

Browse Source
This commit is contained in:
Henning Poettker
2023-12-09 15:37:03 +01:00
committed by Mahmoud Ben Hassine
parent 52beef2dac
commit 0d1d89c82f
138 changed files with 262 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,11 +187,6 @@ public class ExitStatus implements Serializable, Comparable<ExitStatus> {
return 7;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return String.format("exitCode=%s;exitDescription=%s", exitCode, exitDescription);

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

@@ -373,11 +373,6 @@ public class JobExecution extends Entity {
failureExceptions = new ArrayList<>();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.Entity#toString()
*/
@Override
public String toString() {
return super.toString() + String.format(

5
spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
View File

@@ -194,11 +194,6 @@ public class StepContribution implements Serializable {
return stepExecution;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "[StepContribution: read=" + readCount + ", written=" + writeCount + ", filtered=" + filterCount

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

@@ -484,12 +484,6 @@ public class StepExecution extends Entity {
this.failureExceptions.add(throwable);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.container.common.domain.Entity#equals(java.
* lang.Object)
*/
@Override
public boolean equals(Object obj) {
@@ -513,11 +507,6 @@ public class StepExecution extends Entity {
failureExceptions = new ArrayList<>();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.container.common.domain.Entity#hashCode()
*/
@Override
public int hashCode() {
Object jobExecutionId = getJobExecutionId();

12
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java
View File

@@ -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.
@@ -97,11 +97,6 @@ public class GroupAwareJob implements Job {
return delegate.getJobParametersValidator();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (obj instanceof GroupAwareJob) {
@@ -110,11 +105,6 @@ public class GroupAwareJob implements Job {
return false;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
return delegate.hashCode();

6
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java
View File

@@ -79,12 +79,6 @@ public class JobRegistryBeanPostProcessor
this.jobRegistry = jobRegistry;
}
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org
* .springframework.beans.factory.BeanFactory)
*/
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
if (beanFactory instanceof DefaultListableBeanFactory) {

5
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
View File

@@ -141,11 +141,6 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar
this.jobFactoryRef = jobFactoryRef;
}
/*
* (non-Javadoc)
*
* @see AbstractSingleBeanDefinitionParser#getBeanClass(Element)
*/
@Override
protected Class<?> getBeanClass(Element element) {
return SimpleFlowFactoryBean.class;

5
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java
View File

@@ -102,11 +102,6 @@ public class SimpleFlowFactoryBean implements FactoryBean<SimpleFlow>, Initializ
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.FactoryBean#getObject()
*/
@Override
public SimpleFlow getObject() throws Exception {
SimpleFlow flow = flowType.getConstructor(String.class).newInstance(name);

67
spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
View File

@@ -80,12 +80,6 @@ public class SimpleJobExplorer implements JobExplorer {
this.ecDao = ecDao;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#findJobExecutions(
* org.springframework.batch.core.JobInstance)
*/
@Override
public List<JobExecution> getJobExecutions(JobInstance jobInstance) {
List<JobExecution> executions = jobExecutionDao.findJobExecutions(jobInstance);
@@ -98,13 +92,8 @@ public class SimpleJobExplorer implements JobExplorer {
return executions;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getLastJobExecution(
* org.springframework.batch.core.JobInstance)
*/
@Nullable
@Override
public JobExecution getLastJobExecution(JobInstance jobInstance) {
JobExecution lastJobExecution = jobExecutionDao.getLastJobExecution(jobInstance);
if (lastJobExecution != null) {
@@ -116,12 +105,6 @@ public class SimpleJobExplorer implements JobExplorer {
return lastJobExecution;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#findRunningJobExecutions
* (java.lang.String)
*/
@Override
public Set<JobExecution> findRunningJobExecutions(@Nullable String jobName) {
Set<JobExecution> executions = jobExecutionDao.findRunningJobExecutions(jobName);
@@ -134,12 +117,6 @@ public class SimpleJobExplorer implements JobExplorer {
return executions;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getJobExecution(java
* .lang.Long)
*/
@Nullable
@Override
public JobExecution getJobExecution(@Nullable Long executionId) {
@@ -157,12 +134,6 @@ public class SimpleJobExplorer implements JobExplorer {
return jobExecution;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getStepExecution(java
* .lang.Long)
*/
@Nullable
@Override
public StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable Long executionId) {
@@ -176,70 +147,34 @@ public class SimpleJobExplorer implements JobExplorer {
return stepExecution;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getJobInstance(java
* .lang.Long)
*/
@Nullable
@Override
public JobInstance getJobInstance(@Nullable Long instanceId) {
return jobInstanceDao.getJobInstance(instanceId);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getJobInstance(java
* .lang.String, org.springframework.batch.core.JobParameters)
*/
@Nullable
@Override
public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
return jobInstanceDao.getJobInstance(jobName, jobParameters);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getLastJobInstance(java
* .lang.String)
*/
@Nullable
@Override
public JobInstance getLastJobInstance(String jobName) {
return jobInstanceDao.getLastJobInstance(jobName);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getLastJobInstances
* (java.lang.String, int)
*/
@Override
public List<JobInstance> getJobInstances(String jobName, int start, int count) {
return jobInstanceDao.getJobInstances(jobName, start, count);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.explore.JobExplorer#getJobNames()
*/
@Override
public List<String> getJobNames() {
return jobInstanceDao.getJobNames();
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.explore.JobExplorer#getJobInstanceCount(java.lang.
* String)
*/
@Override
public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
return jobInstanceDao.getJobInstanceCount(jobName);

10
spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
View File

@@ -158,11 +158,6 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, In
this.name = name;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#getName()
*/
@Override
public String getName() {
return name;
@@ -214,11 +209,6 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, In
this.jobParametersIncrementer = jobParametersIncrementer;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.Job#getJobParametersIncrementer()
*/
@Override
@Nullable
public JobParametersIncrementer getJobParametersIncrementer() {

5
spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
View File

@@ -94,11 +94,6 @@ public class SimpleJob extends AbstractJob {
this.steps.add(step);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.AbstractJob#getStep(java.lang.String)
*/
@Override
public Step getStep(String stepName) {
for (Step step : this.steps) {

7
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/DefaultStateTransitionComparator.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-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.
@@ -32,11 +32,6 @@ public class DefaultStateTransitionComparator implements Comparator<StateTransit
public static final String STATE_TRANSITION_COMPARATOR = "batch_state_transition_comparator";
/*
* (non-Javadoc)
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@Override
public int compare(StateTransition arg0, StateTransition arg1) {
String value = arg1.getPattern();

7
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2018 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.
@@ -159,11 +159,6 @@ public final class StateTransition {
return next == null;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return String.format("StateTransition: [state=%s, pattern=%s, next=%s]", state == null ? null : state.getName(),

7
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/AbstractState.java
View File

@@ -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.
@@ -39,11 +39,6 @@ public abstract class AbstractState implements State {
return name;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return getClass().getSimpleName() + ": name=[" + name + "]";

7
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/DecisionState.java
View File

@@ -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.
@@ -45,11 +45,6 @@ public class DecisionState extends AbstractState {
return decider.decide(executor.getJobExecution(), executor.getStepExecution());
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.flow.State#isEndState()
*/
@Override
public boolean isEndState() {
return false;

12
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java
View File

@@ -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.
@@ -137,21 +137,11 @@ public class EndState extends AbstractState {
executor.addExitStatus(code);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.flow.State#isEndState()
*/
@Override
public boolean isEndState() {
return !status.isStop();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return super.toString() + " status=[" + status + "]";

7
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/FlowState.java
View File

@@ -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.
@@ -56,11 +56,6 @@ public class FlowState extends AbstractState implements FlowHolder {
return flow.start(executor).getStatus();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.flow.State#isEndState()
*/
@Override
public boolean isEndState() {
return false;

5
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java
View File

@@ -148,11 +148,6 @@ public class SplitState extends AbstractState implements FlowHolder {
return aggregator.aggregate(results);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.flow.State#isEndState()
*/
@Override
public boolean isEndState() {
return false;

17
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 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.
@@ -73,21 +73,11 @@ public class StepState extends AbstractState implements StepLocator, StepHolder
return step;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.job.flow.State#isEndState()
*/
@Override
public boolean isEndState() {
return false;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.step.StepLocator#getStepNames()
*/
@Override
public Collection<String> getStepNames() {
List<String> names = new ArrayList<>();
@@ -101,11 +91,6 @@ public class StepState extends AbstractState implements StepLocator, StepHolder
return names;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.step.StepLocator#getStep(java.lang.String)
*/
@Override
public Step getStep(String stepName) throws NoSuchStepException {
Step result = null;

8
spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java
View File

@@ -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.
@@ -24,12 +24,6 @@ import org.aopalliance.intercept.MethodInvocation;
*/
public class RuntimeExceptionTranslator implements MethodInterceptor {
/*
* (non-Javadoc)
*
* @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.
* MethodInvocation)
*/
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
try {

73
spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java
View File

@@ -152,12 +152,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
this.jobLauncher = jobLauncher;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.launch.JobOperator#getExecutions(java.lang.Long)
*/
@Override
public List<Long> getExecutions(long instanceId) throws NoSuchJobInstanceException {
JobInstance jobInstance = jobExplorer.getJobInstance(instanceId);
@@ -171,21 +165,11 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return list;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getJobNames()
*/
@Override
public Set<String> getJobNames() {
return new TreeSet<>(jobRegistry.getJobNames());
}
/*
* (non-Javadoc)
*
* @see JobOperator#getLastInstances(String, int, int)
*/
@Override
public List<Long> getJobInstances(String jobName, int start, int count) throws NoSuchJobException {
List<Long> list = new ArrayList<>();
@@ -199,23 +183,12 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return list;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getJobInstance(String,
* JobParameters)
*/
@Override
@Nullable
public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
return this.jobExplorer.getJobInstance(jobName, jobParameters);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getParameters(java.
* lang.Long)
*/
@Override
public String getParameters(long executionId) throws NoSuchJobExecutionException {
JobExecution jobExecution = findExecutionById(executionId);
@@ -225,12 +198,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return PropertiesConverter.propertiesToString(properties);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getRunningExecutions
* (java.lang.String)
*/
@Override
public Set<Long> getRunningExecutions(String jobName) throws NoSuchJobException {
Set<Long> set = new LinkedHashSet<>();
@@ -243,12 +210,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return set;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getStepExecutionSummaries
* (java.lang.Long)
*/
@Override
public Map<Long, String> getStepExecutionSummaries(long executionId) throws NoSuchJobExecutionException {
JobExecution jobExecution = findExecutionById(executionId);
@@ -260,22 +221,12 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return map;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#getSummary(java.lang .Long)
*/
@Override
public String getSummary(long executionId) throws NoSuchJobExecutionException {
JobExecution jobExecution = findExecutionById(executionId);
return jobExecution.toString();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#resume(java.lang.Long)
*/
@Override
public Long restart(long executionId) throws JobInstanceAlreadyCompleteException, NoSuchJobExecutionException,
NoSuchJobException, JobRestartException, JobParametersInvalidException {
@@ -302,12 +253,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#start(java.lang.String,
* java.lang.String)
*/
@Override
@Deprecated(since = "5.0.1", forRemoval = true)
public Long start(String jobName, String parameters)
@@ -316,12 +261,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
return start(jobName, properties);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#start(java.lang.String,
* java.util.Properties)
*/
@Override
public Long start(String jobName, Properties parameters)
throws NoSuchJobException, JobInstanceAlreadyExistsException, JobParametersInvalidException {
@@ -360,11 +299,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
}
/*
* (non-Javadoc)
*
* @see JobOperator#startNextInstance(String )
*/
@Override
public Long startNextInstance(String jobName)
throws NoSuchJobException, UnexpectedJobExecutionException, JobParametersInvalidException {
@@ -395,11 +329,6 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.launch.JobOperator#stop(java.lang.Long)
*/
@Override
public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExecutionNotRunningException {

18
spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java
View File

@@ -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.
@@ -28,31 +28,15 @@ import org.springframework.batch.core.scope.context.ChunkContext;
@Deprecated
public class ChunkListenerSupport implements ChunkListener {
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.ChunkListener#afterChunk()
*/
@Override
public void afterChunk(ChunkContext context) {
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.ChunkListener#beforeChunk()
*/
@Override
public void beforeChunk(ChunkContext context) {
}
@Override
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.domain.ChunkListener#afterChunkError(ChunkContext)
*/
public void afterChunkError(ChunkContext context) {
}

14
spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java
View File

@@ -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.
@@ -26,22 +26,10 @@ import org.springframework.batch.core.JobExecutionListener;
@Deprecated
public class JobExecutionListenerSupport implements JobExecutionListener {
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.JobListener#afterJob()
*/
@Override
public void afterJob(JobExecution jobExecution) {
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.domain.JobListener#beforeJob(org.springframework.
* batch.core.domain.JobExecution)
*/
@Override
public void beforeJob(JobExecution jobExecution) {
}

19
spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java
View File

@@ -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.
@@ -28,31 +28,14 @@ import org.springframework.batch.core.SkipListener;
@Deprecated
public class SkipListenerSupport<T, S> implements SkipListener<T, S> {
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable)
*/
@Override
public void onSkipInRead(Throwable t) {
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object,
* java.lang.Throwable)
*/
@Override
public void onSkipInWrite(S item, Throwable t) {
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.SkipListener#onSkipInProcess(java.lang.Object,
* java.lang.Throwable)
*/
@Override
public void onSkipInProcess(T item, Throwable t) {
}

15
spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java
View File

@@ -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.
@@ -28,25 +28,12 @@ import org.springframework.lang.Nullable;
@Deprecated
public class StepExecutionListenerSupport implements StepExecutionListener {
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.StepListener#afterStep(StepExecution
* stepExecution)
*/
@Nullable
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
return null;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.domain.StepListener#open(org.springframework.batch.
* item.ExecutionContext)
*/
@Override
public void beforeStep(StepExecution stepExecution) {
}

2
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java
View File

@@ -140,6 +140,7 @@ public class Jackson2ExecutionContextStringSerializer implements ExecutionContex
this.objectMapper.registerModule(new JobParametersModule());
}
@Override
public Map<String, Object> deserialize(InputStream in) throws IOException {
TypeReference<HashMap<String, Object>> typeRef = new TypeReference<>() {
@@ -147,6 +148,7 @@ public class Jackson2ExecutionContextStringSerializer implements ExecutionContex
return objectMapper.readValue(in, typeRef);
}
@Override
public void serialize(Map<String, Object> context, OutputStream out) throws IOException {
Assert.notNull(context, "A context is required");

2
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
View File

@@ -254,6 +254,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
* Delete the execution context of the given {@link JobExecution}.
* @param jobExecution {@link JobExecution} that contains the context to delete.
*/
@Override
public void deleteExecutionContext(JobExecution jobExecution) {
getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION_CONTEXT), jobExecution.getId());
}
@@ -262,6 +263,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
* Delete the execution context of the given {@link StepExecution}.
* @param stepExecution {@link StepExecution} that contains the context to delete.
*/
@Override
public void deleteExecutionContext(StepExecution stepExecution) {
getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION_CONTEXT), stepExecution.getId());
}

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

@@ -352,12 +352,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobExecutionDao#
* getLastJobExecution(java.lang.String)
*/
@Override
@Nullable
public JobExecution getJobExecution(Long executionId) {
@@ -370,12 +364,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobExecutionDao#
* findRunningJobExecutions(java.lang.String)
*/
@Override
public Set<JobExecution> findRunningJobExecutions(String jobName) {
@@ -405,6 +393,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
* Delete the given job execution.
* @param jobExecution the job execution to delete
*/
@Override
public void deleteJobExecution(JobExecution jobExecution) {
getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION), jobExecution.getId());
}
@@ -413,6 +402,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
* Delete the parameters associated with the given job execution.
* @param jobExecution the job execution for which job parameters should be deleted
*/
@Override
public void deleteJobExecutionParameters(JobExecution jobExecution) {
getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION_PARAMETERS), jobExecution.getId());
}

37
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
View File

@@ -195,12 +195,6 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobInstanceDao#getJobInstance
* (java.lang.Long)
*/
@Override
@Nullable
public JobInstance getJobInstance(@Nullable Long instanceId) {
@@ -214,22 +208,11 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobInstanceDao#getJobNames ()
*/
@Override
public List<String> getJobNames() {
return getJdbcTemplate().query(getQuery(FIND_JOB_NAMES), (rs, rowNum) -> rs.getString(1));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobInstanceDao#
* getLastJobInstances(java.lang.String, int)
*/
@Override
public List<JobInstance> getJobInstances(String jobName, final int start, final int count) {
@@ -256,12 +239,6 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
return getJdbcTemplate().query(getQuery(FIND_LAST_JOBS_BY_NAME), extractor, jobName);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobInstanceDao#
* getLastJobInstance(java.lang.String)
*/
@Override
@Nullable
public JobInstance getLastJobInstance(String jobName) {
@@ -274,12 +251,6 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.repository.dao.JobInstanceDao#getJobInstance
* (org.springframework.batch.core.JobExecution)
*/
@Override
@Nullable
public JobInstance getJobInstance(JobExecution jobExecution) {
@@ -293,13 +264,6 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.repository.dao.JobInstanceDao#getJobInstanceCount(
* java.lang.String)
*/
@Override
public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
@@ -315,6 +279,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
* Delete the job instance.
* @param jobInstance the job instance to delete
*/
@Override
public void deleteJobInstance(JobInstance jobInstance) {
getJdbcTemplate().update(getQuery(DELETE_JOB_INSTANCE), jobInstance.getId());
}

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

@@ -372,6 +372,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
* Delete the given step execution.
* @param stepExecution the step execution to delete
*/
@Override
public void deleteStepExecution(StepExecution stepExecution) {
getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION), stepExecution.getId());
}

5
spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/ChunkContext.java
View File

@@ -63,11 +63,6 @@ public class ChunkContext extends AttributeAccessorSupport {
this.complete = true;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return String.format("ChunkContext: attributes=%s, complete=%b, stepContext=%s",

5
spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
View File

@@ -114,11 +114,6 @@ public class TaskletStep extends AbstractStep {
super(name);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.step.AbstractStep#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();

16
spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java
View File

@@ -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.
@@ -21,25 +21,11 @@ package org.springframework.batch.core;
*/
public class JobExecutionExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobExecutionException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobExecutionException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java
View File

@@ -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.
@@ -21,25 +21,11 @@ package org.springframework.batch.core;
*/
public class JobInterruptedExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobInterruptedException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new RuntimeException(msg, t);

48
spring-batch-core/src/test/java/org/springframework/batch/core/PooledEmbeddedDataSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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.
@@ -42,95 +42,51 @@ public class PooledEmbeddedDataSource implements EmbeddedDatabase {
this.dataSource = dataSource;
}
/*
* (non-Javadoc)
*
* @see javax.sql.DataSource#getConnection()
*/
@Override
public Connection getConnection() throws SQLException {
return this.dataSource.getConnection();
}
/*
* (non-Javadoc)
*
* @see javax.sql.DataSource#getConnection(java.lang.String, java.lang.String)
*/
@Override
public Connection getConnection(String username, String password) throws SQLException {
return this.dataSource.getConnection(username, password);
}
/*
* (non-Javadoc)
*
* @see javax.sql.CommonDataSource#getLogWriter()
*/
@Override
public PrintWriter getLogWriter() throws SQLException {
return this.dataSource.getLogWriter();
}
/*
* (non-Javadoc)
*
* @see javax.sql.CommonDataSource#setLogWriter(java.io.PrintWriter)
*/
@Override
public void setLogWriter(PrintWriter out) throws SQLException {
this.dataSource.setLogWriter(out);
}
/*
* (non-Javadoc)
*
* @see javax.sql.CommonDataSource#getLoginTimeout()
*/
@Override
public int getLoginTimeout() throws SQLException {
return this.dataSource.getLoginTimeout();
}
/*
* (non-Javadoc)
*
* @see javax.sql.CommonDataSource#setLoginTimeout(int)
*/
@Override
public void setLoginTimeout(int seconds) throws SQLException {
this.dataSource.setLoginTimeout(seconds);
}
/*
* (non-Javadoc)
*
* @see java.sql.Wrapper#unwrap(java.lang.Class)
*/
@Override
public <T> T unwrap(Class<T> iface) throws SQLException {
return this.dataSource.unwrap(iface);
}
/*
* (non-Javadoc)
*
* @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
*/
@Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return this.dataSource.isWrapperFor(iface);
}
@Override
public Logger getParentLogger() {
return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
}
/*
* (non-Javadoc)
*
* @see org.springframework.jdbc.datasource.embedded.EmbeddedDatabase#shutdown()
*/
@Override
public void shutdown() {
}

16
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class DuplicateJobExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new DuplicateJobException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new DuplicateJobException(msg, t);

1
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java
View File

@@ -230,6 +230,7 @@ public class StepScopeConfigurationTests {
this.value = value;
}
@Override
public String call() throws Exception {
return value;
}

1
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java
View File

@@ -155,6 +155,7 @@ class DefaultBatchConfigurationTests {
static class MyJobConfigurationWithCustomInfrastructureBean extends MyJobConfiguration {
@Bean
@Override
public JobRepository jobRepository() {
return new DummyJobRepository();
}

9
spring-batch-core/src/test/java/org/springframework/batch/core/converter/JobParametersConverterSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-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.
@@ -40,13 +40,6 @@ public class JobParametersConverterSupport implements JobParametersConverter {
return builder.toJobParameters();
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.
* springframework.batch.core.JobParameters)
*/
@Override
public Properties getProperties(@Nullable JobParameters params) {
Properties properties = new Properties();

44
spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
View File

@@ -23,14 +23,12 @@ import java.util.Map;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParametersIncrementer;
import org.springframework.batch.core.JobParametersValidator;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.UnexpectedJobExecutionException;
import org.springframework.batch.core.step.NoSuchStepException;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
/**
@@ -50,8 +48,6 @@ public class JobSupport implements BeanNameAware, Job, StepLocator {
private boolean restartable = false;
private int startLimit = Integer.MAX_VALUE;
private DefaultJobParametersValidator jobParametersValidator = new DefaultJobParametersValidator();
/**
@@ -96,11 +92,6 @@ public class JobSupport implements BeanNameAware, Job, StepLocator {
this.name = name;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#getName()
*/
@Override
public String getName() {
return name;
@@ -124,39 +115,15 @@ public class JobSupport implements BeanNameAware, Job, StepLocator {
this.steps.put(step.getName(), step);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#getStartLimit()
*/
public int getStartLimit() {
return startLimit;
}
public void setStartLimit(int startLimit) {
this.startLimit = startLimit;
}
public void setRestartable(boolean restartable) {
this.restartable = restartable;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#isRestartable()
*/
@Override
public boolean isRestartable() {
return restartable;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.Job#run(org.springframework.batch
* .core.domain.JobExecution)
*/
@Override
public void execute(JobExecution execution) throws UnexpectedJobExecutionException {
throw new UnsupportedOperationException(
@@ -168,17 +135,6 @@ public class JobSupport implements BeanNameAware, Job, StepLocator {
return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]";
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.Job#getJobParametersIncrementer()
*/
@Nullable
@Override
public JobParametersIncrementer getJobParametersIncrementer() {
return null;
}
@Override
public JobParametersValidator getJobParametersValidator() {
return jobParametersValidator;

6
spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
View File

@@ -559,12 +559,6 @@ class SimpleJobTests {
this.runnable = runnable;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.step.StepSupport#execute(org.
* springframework.batch.core.StepExecution)
*/
@Override
public void execute(StepExecution stepExecution)
throws JobInterruptedException, UnexpectedJobExecutionException {

16
spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobExecutionNotFailedExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobExecutionNotFailedExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobExecutionNotFailedException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobExecutionNotFailedException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobInstanceAlreadyExistsExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobInstanceAlreadyExistsException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobInstanceAlreadyExistsException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobParametersNotFoundExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobParametersNotFoundException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobParametersNotFoundException(msg, t);

17
spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExceptionTests.java
View File

@@ -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.
@@ -16,7 +16,6 @@
package org.springframework.batch.core.launch;
import org.springframework.batch.core.AbstractExceptionTests;
import org.springframework.batch.core.launch.NoSuchJobException;
/**
* @author Dave Syer
@@ -24,25 +23,11 @@ import org.springframework.batch.core.launch.NoSuchJobException;
*/
public class NoSuchJobExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new NoSuchJobException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new NoSuchJobException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExecutionExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class NoSuchJobExecutionExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new NoSuchJobExecutionException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new NoSuchJobExecutionException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobInstanceExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class NoSuchJobInstanceExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new NoSuchJobInstanceException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new NoSuchJobInstanceException(msg, t);

51
spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
View File

@@ -608,11 +608,6 @@ class MulticasterBatchListenerTests {
super.onReadError(ex);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#afterChunk ()
*/
@Override
public void afterChunk(ChunkContext context) {
count++;
@@ -622,12 +617,6 @@ class MulticasterBatchListenerTests {
super.afterChunk(context);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#afterRead
* (java.lang.Object)
*/
@Override
public void afterRead(Integer item) {
count++;
@@ -637,12 +626,6 @@ class MulticasterBatchListenerTests {
super.afterRead(item);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#afterStep
* (org.springframework.batch.core.StepExecution)
*/
@Nullable
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
@@ -653,11 +636,6 @@ class MulticasterBatchListenerTests {
return super.afterStep(stepExecution);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#beforeChunk ()
*/
@Override
public void beforeChunk(ChunkContext context) {
count++;
@@ -667,11 +645,6 @@ class MulticasterBatchListenerTests {
super.beforeChunk(context);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#beforeRead ()
*/
@Override
public void beforeRead() {
count++;
@@ -681,12 +654,6 @@ class MulticasterBatchListenerTests {
super.beforeRead();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#beforeStep
* (org.springframework.batch.core.StepExecution)
*/
@Override
public void beforeStep(StepExecution stepExecution) {
count++;
@@ -696,12 +663,6 @@ class MulticasterBatchListenerTests {
super.beforeStep(stepExecution);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#afterWrite
* (java.util.List)
*/
@Override
public void afterWrite(Chunk<? extends String> items) {
count++;
@@ -711,12 +672,6 @@ class MulticasterBatchListenerTests {
super.afterWrite(items);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#beforeWrite
* (java.util.List)
*/
@Override
public void beforeWrite(Chunk<? extends String> items) {
count++;
@@ -726,12 +681,6 @@ class MulticasterBatchListenerTests {
super.beforeWrite(items);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.listener.StepListenerSupport#onWriteError
* (java.lang.Exception, java.util.List)
*/
@Override
public void onWriteError(Exception exception, Chunk<? extends String> items) {
count++;

16
spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobExecutionAlreadyRunningExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobExecutionAlreadyRunningException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobExecutionAlreadyRunningException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobInstanceAlreadyCompleteExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobInstanceAlreadyCompleteException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobInstanceAlreadyCompleteException(msg, t);

16
spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobRestartExceptionTests.java
View File

@@ -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.
@@ -23,25 +23,11 @@ import org.springframework.batch.core.AbstractExceptionTests;
*/
public class JobRestartExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String)
*/
@Override
public Exception getException(String msg) throws Exception {
return new JobRestartException(msg);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.
* lang.String, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable t) throws Exception {
return new JobRestartException(msg, t);

41
spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
View File

@@ -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.
@@ -32,40 +32,16 @@ import org.springframework.lang.Nullable;
*/
public class JobRepositorySupport implements JobRepository {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.container.common.repository.JobRepository#findOrCreateJob
* (org.springframework.batch.container.common.domain.JobConfiguration)
*/
@Override
public JobExecution createJobExecution(String jobName, JobParameters jobParameters) {
JobInstance jobInstance = new JobInstance(0L, jobName);
return new JobExecution(jobInstance, 11L, jobParameters);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.container.common.repository.JobRepository#saveOrUpdate(
* org.springframework.batch.container.common.domain.JobExecution)
*/
@Override
public void update(JobExecution jobExecution) {
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.container.common.repository.JobRepository#update(org.
* springframework.batch.container.common.domain.Job)
*/
public void update(JobInstance job) {
}
@Nullable
@Override
public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
@@ -83,14 +59,6 @@ public class JobRepositorySupport implements JobRepository {
return 0;
}
public int getJobExecutionCount(JobInstance jobInstance) {
return 0;
}
public JobExecution getLastJobExecution(JobInstance jobInstance) {
return null;
}
@Override
public void add(StepExecution stepExecution) {
}
@@ -103,13 +71,6 @@ public class JobRepositorySupport implements JobRepository {
public void updateExecutionContext(StepExecution stepExecution) {
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.repository.JobRepository#isJobInstanceExists(java.
* lang.String, org.springframework.batch.core.JobParameters)
*/
@Override
public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
return false;

9
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ForceRollbackForWriteSkipExceptionTests.java
View File

@@ -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.
@@ -23,13 +23,6 @@ import org.springframework.batch.core.AbstractExceptionWithCauseTests;
*/
public class ForceRollbackForWriteSkipExceptionTests extends AbstractExceptionWithCauseTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.listener.AbstractDoubleExceptionTests#getException(
* java.lang.String, java.lang.RuntimeException, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable e) throws Exception {
return new ForceRollbackForWriteSkipException(msg, e);

9
spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/NonSkippableReadExceptionTests.java
View File

@@ -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.
@@ -23,13 +23,6 @@ import org.springframework.batch.core.AbstractExceptionWithCauseTests;
*/
public class NonSkippableReadExceptionTests extends AbstractExceptionWithCauseTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.listener.AbstractDoubleExceptionTests#getException(
* java.lang.String, java.lang.RuntimeException, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable e) throws Exception {
return new NonSkippableReadException(msg, e);

9
spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/NonSkippableWriteExceptionTests.java
View File

@@ -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.
@@ -23,13 +23,6 @@ import org.springframework.batch.core.AbstractExceptionWithCauseTests;
*/
public class NonSkippableWriteExceptionTests extends AbstractExceptionWithCauseTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.listener.AbstractDoubleExceptionTests#getException(
* java.lang.String, java.lang.RuntimeException, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, Throwable e) throws Exception {
return new NonSkippableWriteException(msg, e);

9
spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/SkipListenerFailedExceptionTests.java
View File

@@ -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.
@@ -23,13 +23,6 @@ import org.springframework.batch.core.listener.AbstractDoubleExceptionTests;
*/
public class SkipListenerFailedExceptionTests extends AbstractDoubleExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.listener.AbstractDoubleExceptionTests#getException(
* java.lang.String, java.lang.RuntimeException, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, RuntimeException cause, Throwable e) throws Exception {
return new SkipListenerFailedException(msg, cause, e);

9
spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/SkipPolicyFailedExceptionTests.java
View File

@@ -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.
@@ -23,13 +23,6 @@ import org.springframework.batch.core.listener.AbstractDoubleExceptionTests;
*/
public class SkipPolicyFailedExceptionTests extends AbstractDoubleExceptionTests {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.listener.AbstractDoubleExceptionTests#getException(
* java.lang.String, java.lang.RuntimeException, java.lang.Throwable)
*/
@Override
public Exception getException(String msg, RuntimeException cause, Throwable e) throws Exception {
return new SkipPolicyFailedException(msg, cause, e);

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/PlayerSummaryMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 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,11 +31,6 @@ import org.springframework.jdbc.core.RowMapper;
*/
public class PlayerSummaryMapper implements RowMapper<PlayerSummary> {
/*
* (non-Javadoc)
*
* @see org.springframework.jdbc.core.RowMapper#mapRow(java.sql.ResultSet, int)
*/
@Override
public PlayerSummary mapRow(ResultSet rs, int rowNum) throws SQLException {

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/PlayerSummaryRowMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 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,11 +31,6 @@ import org.springframework.jdbc.core.RowMapper;
*/
public class PlayerSummaryRowMapper implements RowMapper<PlayerSummary> {
/*
* (non-Javadoc)
*
* @see org.springframework.jdbc.core.RowMapper#mapRow(java.sql.ResultSet, int)
*/
@Override
public PlayerSummary mapRow(ResultSet rs, int rowNum) throws SQLException {

3
spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/MyMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2005-2019 the original author or authors.
* Copyright 2005-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 @@ import org.springframework.ldap.core.LdapAttributes;
*/
public class MyMapper implements RecordMapper<LdapAttributes> {
@Override
@Nullable
public LdapAttributes mapRecord(LdapAttributes attributes) {
return attributes;

45
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/JobSupport.java
View File

@@ -21,13 +21,11 @@ import java.util.List;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParametersIncrementer;
import org.springframework.batch.core.JobParametersValidator;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.UnexpectedJobExecutionException;
import org.springframework.batch.core.job.DefaultJobParametersValidator;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
/**
@@ -46,8 +44,6 @@ public class JobSupport implements BeanNameAware, Job {
private boolean restartable = false;
private int startLimit = Integer.MAX_VALUE;
private JobParametersValidator jobParametersValidator = new DefaultJobParametersValidator();
/**
@@ -93,11 +89,6 @@ public class JobSupport implements BeanNameAware, Job {
this.name = name;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#getName()
*/
@Override
public String getName() {
return name;
@@ -123,56 +114,20 @@ public class JobSupport implements BeanNameAware, Job {
return steps;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#getStartLimit()
*/
public int getStartLimit() {
return startLimit;
}
public void setStartLimit(int startLimit) {
this.startLimit = startLimit;
}
public void setRestartable(boolean restartable) {
this.restartable = restartable;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.domain.IJob#isRestartable()
*/
@Override
public boolean isRestartable() {
return restartable;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.Job#getJobParametersIncrementer()
*/
@Nullable
@Override
public JobParametersIncrementer getJobParametersIncrementer() {
return null;
}
@Override
public JobParametersValidator getJobParametersValidator() {
return jobParametersValidator;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.core.domain.Job#run(org.springframework.batch.core.domain
* .JobExecution)
*/
@Override
public void execute(JobExecution execution) throws UnexpectedJobExecutionException {
throw new UnsupportedOperationException(

5
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java
View File

@@ -201,11 +201,6 @@ public class Chunk<W> implements Iterable<W>, Serializable {
this.userData = userData;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return String.format("[items=%s, skips=%s]", items, skips);

15
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java
View File

@@ -385,11 +385,6 @@ public class ExecutionContext implements Serializable {
return this.map.containsValue(value);
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (!(obj instanceof ExecutionContext rhs)) {
@@ -401,21 +396,11 @@ public class ExecutionContext implements Serializable {
return this.entrySet().equals(rhs.entrySet());
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
return this.map.hashCode();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return this.map.toString();

12
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/KeyValueItemWriter.java
View File

@@ -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. You may obtain a copy of the License at
@@ -31,11 +31,6 @@ public abstract class KeyValueItemWriter<K, V> implements ItemWriter<V>, Initial
protected boolean delete;
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemWriter#write(java.util.List)
*/
@Override
public void write(Chunk<? extends V> items) throws Exception {
if (items == null) {
@@ -84,11 +79,6 @@ public abstract class KeyValueItemWriter<K, V> implements ItemWriter<V>, Initial
this.delete = delete;
}
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(itemKeyMapper != null, "itemKeyMapper requires a Converter type.");

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/SpELItemKeyMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 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. You may obtain a copy of the License at
@@ -33,11 +33,6 @@ public class SpELItemKeyMapper<K, V> implements Converter<V, K> {
parsedExpression = parser.parseExpression(keyExpression);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemKeyMapper#mapKey(java.lang.Object)
*/
@SuppressWarnings("unchecked")
@Override
public K convert(V item) {

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java
View File

@@ -345,6 +345,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi
/**
* Added due to JDK 7 compatibility.
*/
@Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
MethodInvoker invoker = new MethodInvoker();
invoker.setTargetObject(dataSource);

5
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java
View File

@@ -156,11 +156,6 @@ public class JdbcBatchItemWriter<T> implements ItemWriter<T>, InitializingBean {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemWriter#write(java.util.List)
*/
@SuppressWarnings("unchecked")
@Override
public void write(final Chunk<? extends T> chunk) throws Exception {

9
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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.
@@ -40,13 +40,6 @@ class SqliteMaxValueIncrementer extends AbstractColumnMaxValueIncrementer {
super(dataSource, incrementerName, columnName);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer#
* getNextKey()
*/
@Override
protected long getNextKey() {
Connection con = DataSourceUtils.getConnection(getDataSource());

16
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlitePagingQueryProvider.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-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,25 +29,11 @@ import org.springframework.util.StringUtils;
*/
public class SqlitePagingQueryProvider extends AbstractSqlPagingQueryProvider {
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider#
* generateFirstPageQuery(int)
*/
@Override
public String generateFirstPageQuery(int pageSize) {
return SqlPagingQueryUtils.generateLimitSqlQuery(this, false, buildLimitClause(pageSize));
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider#
* generateRemainingPagesQuery(int)
*/
@Override
public String generateRemainingPagesQuery(int pageSize) {
if (StringUtils.hasText(getGroupClause())) {

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
View File

@@ -109,12 +109,6 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
private boolean isCustomEditorsSet;
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org
* .springframework.beans.factory.BeanFactory)
*/
@Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java
View File

@@ -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.
@@ -26,12 +26,6 @@ import org.springframework.batch.item.file.transform.FieldSet;
*/
public class PassThroughFieldSetMapper implements FieldSetMapper<FieldSet> {
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.FieldSetMapper#mapLine(org.springframework
* .batch.io.file.FieldSet)
*/
@Override
public FieldSet mapFieldSet(FieldSet fs) {
return fs;

11
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java
View File

@@ -50,22 +50,11 @@ public class PatternMatchingCompositeLineMapper<T> implements LineMapper<T>, Ini
private PatternMatcher<FieldSetMapper<T>> patternMatcher;
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.LineMapper#mapLine(java.lang
* .String, int)
*/
@Override
public T mapLine(String line, int lineNumber) throws Exception {
return patternMatcher.match(line).mapFieldSet(this.tokenizer.tokenize(line));
}
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
this.tokenizer.afterPropertiesSet();

239
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
View File

@@ -116,11 +116,6 @@ public class DefaultFieldSet implements FieldSet {
setNumberFormat(NumberFormat.getInstance(Locale.US));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#getNames()
*/
@Override
public String[] getNames() {
if (names == null) {
@@ -129,95 +124,46 @@ public class DefaultFieldSet implements FieldSet {
return names.toArray(new String[0]);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.FieldSet#hasNames()
*/
@Override
public boolean hasNames() {
return names != null;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#getValues()
*/
@Override
public String[] getValues() {
return tokens.clone();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readString(int)
*/
@Override
public String readString(int index) {
return readAndTrim(index);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readString(java
* .lang.String)
*/
@Override
public String readString(String name) {
return readString(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readRawString(int)
*/
@Override
public String readRawString(int index) {
return tokens[index];
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readRawString(java
* .lang.String)
*/
@Override
public String readRawString(String name) {
return readRawString(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int)
*/
@Override
public boolean readBoolean(int index) {
return readBoolean(index, "true");
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java
* .lang.String)
*/
@Override
public boolean readBoolean(String name) {
return readBoolean(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int,
* java.lang.String)
*/
@Override
public boolean readBoolean(int index, String trueValue) {
Assert.notNull(trueValue, "'trueValue' cannot be null.");
@@ -227,22 +173,11 @@ public class DefaultFieldSet implements FieldSet {
return trueValue.equals(value);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java
* .lang.String, java.lang.String)
*/
@Override
public boolean readBoolean(String name, String trueValue) {
return readBoolean(indexOf(name), trueValue);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readChar(int)
*/
@Override
public char readChar(int index) {
String value = readAndTrim(index);
@@ -252,85 +187,41 @@ public class DefaultFieldSet implements FieldSet {
return value.charAt(0);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readChar(java.lang
* .String)
*/
@Override
public char readChar(String name) {
return readChar(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readByte(int)
*/
@Override
public byte readByte(int index) {
return Byte.parseByte(readAndTrim(index));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readByte(java.lang
* .String)
*/
@Override
public byte readByte(String name) {
return readByte(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readShort(int)
*/
@Override
public short readShort(int index) {
return Short.parseShort(readAndTrim(index));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readShort(java.
* lang.String)
*/
@Override
public short readShort(String name) {
return readShort(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int)
*/
@Override
public int readInt(int index) {
return parseNumber(readAndTrim(index)).intValue();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang
* .String)
*/
@Override
public int readInt(String name) {
return readInt(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int, int)
*/
@Override
public int readInt(int index, int defaultValue) {
String value = readAndTrim(index);
@@ -338,43 +229,21 @@ public class DefaultFieldSet implements FieldSet {
return StringUtils.hasLength(value) ? Integer.parseInt(value) : defaultValue;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang
* .String, int)
*/
@Override
public int readInt(String name, int defaultValue) {
return readInt(indexOf(name), defaultValue);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int)
*/
@Override
public long readLong(int index) {
return parseNumber(readAndTrim(index)).longValue();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang
* .String)
*/
@Override
public long readLong(String name) {
return readLong(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int, long)
*/
@Override
public long readLong(int index, long defaultValue) {
String value = readAndTrim(index);
@@ -382,86 +251,41 @@ public class DefaultFieldSet implements FieldSet {
return StringUtils.hasLength(value) ? Long.parseLong(value) : defaultValue;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang
* .String, long)
*/
@Override
public long readLong(String name, long defaultValue) {
return readLong(indexOf(name), defaultValue);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readFloat(int)
*/
@Override
public float readFloat(int index) {
return parseNumber(readAndTrim(index)).floatValue();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readFloat(java.
* lang.String)
*/
@Override
public float readFloat(String name) {
return readFloat(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDouble(int)
*/
@Override
public double readDouble(int index) {
return parseNumber(readAndTrim(index)).doubleValue();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDouble(java
* .lang.String)
*/
@Override
public double readDouble(String name) {
return readDouble(indexOf(name));
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int)
*/
@Override
public BigDecimal readBigDecimal(int index) {
return readBigDecimal(index, null);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(
* java.lang.String)
*/
@Override
public BigDecimal readBigDecimal(String name) {
return readBigDecimal(name, null);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int,
* java.math.BigDecimal)
*/
@Override
public BigDecimal readBigDecimal(int index, BigDecimal defaultValue) {
String candidate = readAndTrim(index);
@@ -483,12 +307,6 @@ public class DefaultFieldSet implements FieldSet {
return candidate.replace(grouping, "").replace(decimal, ".");
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(
* java.lang.String, java.math.BigDecimal)
*/
@Override
public BigDecimal readBigDecimal(String name, BigDecimal defaultValue) {
try {
@@ -502,34 +320,17 @@ public class DefaultFieldSet implements FieldSet {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int)
*/
@Override
public Date readDate(int index) {
return parseDate(readAndTrim(index), dateFormat);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.transform.FieldSet#readDate(int,
* java.util.Date)
*/
@Override
public Date readDate(int index, Date defaultValue) {
String candidate = readAndTrim(index);
return StringUtils.hasText(candidate) ? parseDate(candidate, dateFormat) : defaultValue;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang
* .String)
*/
@Override
public Date readDate(String name) {
try {
@@ -540,12 +341,6 @@ public class DefaultFieldSet implements FieldSet {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.transform.FieldSet#readDate(int,
* java.util.Date)
*/
@Override
public Date readDate(String name, Date defaultValue) {
try {
@@ -556,12 +351,6 @@ public class DefaultFieldSet implements FieldSet {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int,
* java.lang.String)
*/
@Override
public Date readDate(int index, String pattern) {
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
@@ -569,24 +358,12 @@ public class DefaultFieldSet implements FieldSet {
return parseDate(readAndTrim(index), sdf);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int,
* java.lang.String)
*/
@Override
public Date readDate(int index, String pattern, Date defaultValue) {
String candidate = readAndTrim(index);
return StringUtils.hasText(candidate) ? readDate(index, pattern) : defaultValue;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang
* .String, java.lang.String)
*/
@Override
public Date readDate(String name, String pattern) {
try {
@@ -597,12 +374,6 @@ public class DefaultFieldSet implements FieldSet {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int,
* java.lang.String)
*/
@Override
public Date readDate(String name, String pattern, Date defaultValue) {
try {
@@ -613,11 +384,6 @@ public class DefaultFieldSet implements FieldSet {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#getFieldCount()
*/
@Override
public int getFieldCount() {
return tokens.length;
@@ -701,11 +467,6 @@ public class DefaultFieldSet implements FieldSet {
return result;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.mapping.IFieldSet#getProperties()
*/
@Override
public Properties getProperties() {
if (names == null) {

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/IncorrectTokenCountException.java
View File

@@ -70,6 +70,7 @@ public class IncorrectTokenCountException extends FlatFileFormatException {
* @return the line that caused the exception
* @since 2.2.6
*/
@Override
public String getInput() {
return input;
}

13
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java
View File

@@ -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.
@@ -38,22 +38,11 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini
private PatternMatcher<LineTokenizer> tokenizers = null;
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.file.transform.LineTokenizer#tokenize(
* java.lang.String)
*/
@Override
public FieldSet tokenize(@Nullable String line) {
return tokenizers.match(line).tokenize(line);
}
/*
* (non-Javadoc)
*
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(this.tokenizers != null, "The 'tokenizers' property must be non-empty");

9
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java
View File

@@ -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.
@@ -41,13 +41,6 @@ public class RecursiveCollectionLineAggregator<T> implements LineAggregator<Coll
this.delegate = delegate;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.
* Object)
*/
@Override
public String aggregate(Collection<T> items) {
StringBuilder builder = new StringBuilder();

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifReader.java
View File

@@ -174,11 +174,13 @@ public class LdifReader extends AbstractItemCountingItemStreamItemReader<LdapAtt
* Establishes the resource that will be used as the input for the LdifReader.
* @param resource the resource that will be read.
*/
@Override
public void setResource(Resource resource) {
this.resource = resource;
this.ldifParser = new LdifParser(resource);
}
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(resource != null, "A resource is required to parse.");
Assert.state(ldifParser != null, "A parser is required");

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/MappingLdifReader.java
View File

@@ -171,11 +171,13 @@ public class MappingLdifReader<T> extends AbstractItemCountingItemStreamItemRead
}
}
@Override
public void setResource(Resource resource) {
this.resource = resource;
this.ldifParser = new LdifParser(resource);
}
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(resource != null, "A resource is required to parse.");
Assert.state(ldifParser != null, "A parser is required");

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemReader.java
View File

@@ -46,6 +46,7 @@ public class SynchronizedItemReader<T> implements ItemReader<T> {
* This method delegates to the {@code read} method of the delegate and is
* synchronized with a lock.
*/
@Override
@Nullable
public T read() throws Exception {
this.lock.lock();

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java
View File

@@ -55,6 +55,7 @@ public class SynchronizedItemStreamReader<T> implements ItemStreamReader<T>, Ini
/**
* This delegates to the read method of the <code>delegate</code>
*/
@Override
@Nullable
public T read() throws Exception {
this.lock.lock();
@@ -66,14 +67,17 @@ public class SynchronizedItemStreamReader<T> implements ItemStreamReader<T>, Ini
}
}
@Override
public void close() {
this.delegate.close();
}
@Override
public void open(ExecutionContext executionContext) {
this.delegate.open(executionContext);
}
@Override
public void update(ExecutionContext executionContext) {
this.delegate.update(executionContext);
}

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java
View File

@@ -40,13 +40,6 @@ public class UnclosedElementCollectingEventWriter extends AbstractEventWriterWra
super(wrappedEventWriter);
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.item.xml.stax.AbstractEventWriterWrapper#add(javax.xml.
* stream.events.XMLEvent)
*/
@Override
public void add(XMLEvent event) throws XMLStreamException {
if (event.isStartElement()) {

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java
View File

@@ -50,13 +50,6 @@ public class UnopenedElementClosingEventWriter extends AbstractEventWriterWrappe
this.ioWriter = ioWriter;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.item.xml.stax.AbstractEventWriterWrapper#add(javax.xml.
* stream.events.XMLEvent)
*/
@Override
public void add(XMLEvent event) throws XMLStreamException {
if (isUnopenedElementCloseEvent(event)) {

41
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java
View File

@@ -48,52 +48,27 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
this.parent = parent;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#isCompleteOnly()
*/
@Override
public boolean isCompleteOnly() {
return completeOnly;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#setCompleteOnly()
*/
@Override
public void setCompleteOnly() {
completeOnly = true;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#isTerminateOnly()
*/
@Override
public boolean isTerminateOnly() {
return terminateOnly;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#setTerminateOnly()
*/
@Override
public void setTerminateOnly() {
terminateOnly = true;
setCompleteOnly();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#getParent()
*/
@Override
public RepeatContext getParent() {
return parent;
@@ -106,22 +81,11 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
count++;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#getStartedCount()
*/
@Override
public synchronized int getStartedCount() {
return count;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#registerDestructionCallback
* (java.lang.String, java.lang.Runnable)
*/
@Override
public void registerDestructionCallback(String name, Runnable callback) {
synchronized (callbacks) {
@@ -130,11 +94,6 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.RepeatContext#close()
*/
@Override
public void close() {

41
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java
View File

@@ -40,11 +40,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
};
/*
* (non-Javadoc)
*
* @see org.springframework.core.AttributeAccessor#attributeNames()
*/
@Override
public String[] attributeNames() {
synchronized (support) {
@@ -52,11 +47,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
}
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object other) {
if (this == other) {
@@ -77,11 +67,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.core.AttributeAccessor#getAttribute(java.lang.String)
*/
@Override
public Object getAttribute(String name) {
synchronized (support) {
@@ -89,11 +74,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.core.AttributeAccessor#hasAttribute(java.lang.String)
*/
@Override
public boolean hasAttribute(String name) {
synchronized (support) {
@@ -101,21 +81,11 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
}
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
return support.hashCode();
}
/*
* (non-Javadoc)
*
* @see org.springframework.core.AttributeAccessor#removeAttribute(java.lang.String)
*/
@Override
public Object removeAttribute(String name) {
synchronized (support) {
@@ -123,12 +93,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
}
}
/*
* (non-Javadoc)
*
* @see org.springframework.core.AttributeAccessor#setAttribute(java.lang.String,
* java.lang.Object)
*/
@Override
public void setAttribute(String name, Object value) {
synchronized (support) {
@@ -154,11 +118,6 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
return null;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
StringBuilder buffer = new StringBuilder("SynchronizedAttributeAccessor: [");

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java
View File

@@ -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.
@@ -127,11 +127,6 @@ public class RethrowOnThresholdExceptionHandler implements ExceptionHandler {
return value;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return ObjectUtils.getIdentityHexString(this) + "." + value;

37
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java
View File

@@ -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.
@@ -87,13 +87,6 @@ public class CompositeRepeatListener implements RepeatListener {
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatListener#after(org.springframework.batch.
* repeat.RepeatContext, org.springframework.batch.repeat.ExitStatus)
*/
@Override
public void after(RepeatContext context, RepeatStatus result) {
for (RepeatListener listener : listeners) {
@@ -101,13 +94,6 @@ public class CompositeRepeatListener implements RepeatListener {
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatListener#before(org.springframework.batch.
* repeat.RepeatContext)
*/
@Override
public void before(RepeatContext context) {
for (RepeatListener listener : listeners) {
@@ -115,13 +101,6 @@ public class CompositeRepeatListener implements RepeatListener {
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatListener#close(org.springframework.batch.
* repeat.RepeatContext)
*/
@Override
public void close(RepeatContext context) {
for (RepeatListener listener : listeners) {
@@ -129,13 +108,6 @@ public class CompositeRepeatListener implements RepeatListener {
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatListener#onError(org.springframework.batch.
* repeat.RepeatContext, java.lang.Throwable)
*/
@Override
public void onError(RepeatContext context, Throwable e) {
for (RepeatListener listener : listeners) {
@@ -143,13 +115,6 @@ public class CompositeRepeatListener implements RepeatListener {
}
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatListener#open(org.springframework.batch.
* repeat.RepeatContext)
*/
@Override
public void open(RepeatContext context) {
for (RepeatListener listener : listeners) {

21
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java
View File

@@ -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.
@@ -81,36 +81,17 @@ public abstract class CountingCompletionPolicy extends DefaultResultCompletionPo
return 0;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.policy.CompletionPolicySupport#isComplete(org.
* springframework.batch.repeat.BatchContext)
*/
@Override
final public boolean isComplete(RepeatContext context) {
int count = ((CountingBatchContext) context).getCounter().getCount();
return count >= maxCount;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.policy.CompletionPolicySupport#start(org.
* springframework.batch.repeat.BatchContext)
*/
@Override
public RepeatContext start(RepeatContext parent) {
return new CountingBatchContext(parent);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.policy.CompletionPolicySupport#update(org.
* springframework.batch.repeat.BatchContext)
*/
@Override
final public void update(RepeatContext context) {
super.update(context);

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java
View File

@@ -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.
@@ -114,11 +114,6 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy {
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return ClassUtils.getShortName(SimpleCompletionPolicy.class) + ": chunkSize=" + chunkSize;

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java
View File

@@ -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.
@@ -25,11 +25,6 @@ public class RepeatInternalStateSupport implements RepeatInternalState {
// Accumulation of failed results.
private final Set<Throwable> throwables = new HashSet<>();
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.support.BatchInternalState#getThrowables()
*/
@Override
public Collection<Throwable> getThrowables() {
return throwables;

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java
View File

@@ -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.
@@ -59,11 +59,6 @@ public class ResultHolderResultQueue implements ResultQueue<ResultHolder> {
return results.isEmpty();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.support.ResultQueue#isExpecting()
*/
@Override
public boolean isExpecting() {
// Base the decision about whether we expect more results on a

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java
View File

@@ -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.
@@ -56,11 +56,6 @@ public class ThrottleLimitResultQueue<T> implements ResultQueue<T> {
return results.isEmpty();
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.repeat.support.ResultQueue#isExpecting()
*/
@Override
public boolean isExpecting() {
// Base the decision about whether we expect more results on a

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java
View File

@@ -76,12 +76,6 @@ public class SimpleMethodInvoker implements MethodInvoker {
this.object = object;
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.configuration.util.MethodInvoker#invokeMethod
* (java.lang.Object[])
*/
@Nullable
@Override
public Object invokeMethod(Object... args) {

20
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
View File

@@ -172,11 +172,6 @@ public class TransactionAwareBufferedWriter extends Writer {
return TransactionSynchronizationManager.isActualTransactionActive();
}
/*
* (non-Javadoc)
*
* @see java.io.Writer#close()
*/
@Override
public void close() throws IOException {
if (transactionActive()) {
@@ -188,11 +183,6 @@ public class TransactionAwareBufferedWriter extends Writer {
closeCallback.run();
}
/*
* (non-Javadoc)
*
* @see java.io.Writer#flush()
*/
@Override
public void flush() throws IOException {
if (!transactionActive() && forceSync) {
@@ -200,11 +190,6 @@ public class TransactionAwareBufferedWriter extends Writer {
}
}
/*
* (non-Javadoc)
*
* @see java.io.Writer#write(char[], int, int)
*/
@Override
public void write(char[] cbuf, int off, int len) throws IOException {
@@ -224,11 +209,6 @@ public class TransactionAwareBufferedWriter extends Writer {
buffer.append(cbuf, off, len);
}
/*
* (non-Javadoc)
*
* @see java.io.Writer#write(String, int, int)
*/
@Override
public void write(String str, int off, int len) throws IOException {

5
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java
View File

@@ -34,11 +34,6 @@ public class CompositeKeyFooDao extends JdbcDaoSupport implements FooDao {
this.setDataSource(dataSource);
}
/*
* (non-Javadoc)
*
* @see org.springframework.batch.io.sql.scratch.FooDao#getFoo(java.lang.Object)
*/
@Override
public Foo getFoo(Object key) {

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java
View File

@@ -327,6 +327,7 @@ class ExtendedConnectionDataSourceProxyTests {
/**
* Added due to JDK 7.
*/
@Override
@SuppressWarnings("unused")
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException();

7
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java
View File

@@ -38,13 +38,6 @@ public class ItemReaderRepeatCallback<T> implements RepeatCallback {
this.reader = reader;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.batch.repeat.RepeatCallback#doInIteration(org.springframework.
* batch.repeat.RepeatContext)
*/
@Override
public RepeatStatus doInIteration(RepeatContext context) throws Exception {
T item = reader.read();

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/ReflectionUtilsTests.java
View File

@@ -82,6 +82,7 @@ class ReflectionUtilsTests {
public void methodOne() {
}
@Override
@Transactional
public String toString() {
return "AnnotatedClass";
@@ -91,6 +92,7 @@ class ReflectionUtilsTests {
public static class AnnotatedSubClass extends AnnotatedClass {
@Override
@Transactional
public void methodOne() {
}

2
spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java
View File

@@ -59,6 +59,7 @@ public class AsyncItemProcessor<I, O> implements ItemProcessor<I, Future<O>>, In
*
* @see InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(delegate != null, "The delegate must be set.");
}
@@ -87,6 +88,7 @@ public class AsyncItemProcessor<I, O> implements ItemProcessor<I, Future<O>>, In
*
* @see ItemProcessor#process(Object)
*/
@Override
@Nullable
public Future<O> process(final I item) throws Exception {
final StepExecution stepExecution = getStepExecution();

2
spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java
View File

@@ -38,6 +38,7 @@ public class AsyncItemWriter<T> implements ItemStreamWriter<Future<T>>, Initiali
private ItemWriter<T> delegate;
@Override
public void afterPropertiesSet() throws Exception {
Assert.state(delegate != null, "A delegate ItemWriter must be provided.");
}
@@ -60,6 +61,7 @@ public class AsyncItemWriter<T> implements ItemStreamWriter<Future<T>>, Initiali
* delegate
* @throws Exception The exception returned by the Future if one was thrown
*/
@Override
public void write(Chunk<? extends Future<T>> items) throws Exception {
List<T> list = new ArrayList<>();
for (Future<T> future : items) {

7
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
View File

@@ -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.
@@ -93,6 +93,7 @@ public class ChunkMessageChannelItemWriter<T>
this.replyChannel = replyChannel;
}
@Override
public void write(Chunk<? extends T> items) throws Exception {
// Block until expecting <= throttle limit
@@ -155,10 +156,12 @@ public class ChunkMessageChannelItemWriter<T>
return ExitStatus.COMPLETED.addExitDescription("Waited for " + expecting + " results.");
}
@Override
public void close() throws ItemStreamException {
localState.reset();
}
@Override
public void open(ExecutionContext executionContext) throws ItemStreamException {
if (executionContext.containsKey(EXPECTED)) {
localState.open(executionContext.getInt(EXPECTED), executionContext.getInt(ACTUAL));
@@ -168,11 +171,13 @@ public class ChunkMessageChannelItemWriter<T>
}
}
@Override
public void update(ExecutionContext executionContext) throws ItemStreamException {
executionContext.putInt(EXPECTED, localState.expected.intValue());
executionContext.putInt(ACTUAL, localState.actual.intValue());
}
@Override
public Collection<StepContribution> getStepContributions() {
List<StepContribution> contributions = new ArrayList<>();
for (ChunkResponse response : localState.pollChunkResponses()) {

Some files were not shown because too many files have changed in this diff Show More