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

Replace identical catch sections with multi-catch blocks

Browse Source
This commit is contained in:
Mahmoud Ben Hassine
2023-06-05 13:29:47 +02:00
parent 8070751da8
commit 0dc5b63469
5 changed files with 14 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-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.
@@ -140,10 +140,7 @@ public class RepositoryItemWriter<T> implements ItemWriter<T>, InitializingBean
try {
invoker.prepare();
}
catch (ClassNotFoundException e) {
throw new DynamicMethodInvocationException(e);
}
catch (NoSuchMethodException e) {
catch (ClassNotFoundException | NoSuchMethodException e) {
throw new DynamicMethodInvocationException(e);
}

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

@@ -505,15 +505,12 @@ public class StaxEventItemWriter<T> extends AbstractItemStreamItemWriter<T>
}
}
}
catch (XMLStreamException xse) {
throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", xse);
}
catch (UnsupportedEncodingException e) {
throw new ItemStreamException(
"Unable to write to file resource: [" + resource + "] with encoding=[" + encoding + "]", e);
}
catch (IOException e) {
throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);
catch (XMLStreamException | IOException xse) {
throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", xse);
}
}

17
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.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.
@@ -106,19 +106,8 @@ public class ChunkProcessorChunkHandler<S> implements ChunkHandler<S>, Initializ
try {
chunkProcessor.process(stepContribution, chunk);
}
catch (SkipLimitExceededException e) {
failure = e;
}
catch (NonSkippableReadException e) {
failure = e;
}
catch (SkipListenerFailedException e) {
failure = e;
}
catch (RetryException e) {
failure = e;
}
catch (JobInterruptedException e) {
catch (SkipLimitExceededException | NonSkippableReadException | SkipListenerFailedException | RetryException
| JobInterruptedException e) {
failure = e;
}
catch (Exception e) {

24
spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2022 the original author or authors.
* Copyright 2008-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.
@@ -321,25 +321,9 @@ class SkipSampleFunctionalTests {
try {
return this.jobOperator.startNextInstance("skipJob");
}
catch (NoSuchJobException e) {
throw new RuntimeException(e);
}
catch (JobExecutionAlreadyRunningException e) {
throw new RuntimeException(e);
}
catch (JobParametersNotFoundException e) {
throw new RuntimeException(e);
}
catch (JobRestartException e) {
throw new RuntimeException(e);
}
catch (JobInstanceAlreadyCompleteException e) {
throw new RuntimeException(e);
}
catch (UnexpectedJobExecutionException e) {
throw new RuntimeException(e);
}
catch (JobParametersInvalidException e) {
catch (NoSuchJobException | JobExecutionAlreadyRunningException | JobParametersNotFoundException
| JobRestartException | JobInstanceAlreadyCompleteException | UnexpectedJobExecutionException
| JobParametersInvalidException e) {
throw new RuntimeException(e);
}
}

14
spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.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.
@@ -166,16 +166,8 @@ public class StepRunner {
try {
return this.launcher.run(job, jobParameters);
}
catch (JobExecutionAlreadyRunningException e) {
throw new UnexpectedJobExecutionException("Step runner encountered exception.", e);
}
catch (JobRestartException e) {
throw new UnexpectedJobExecutionException("Step runner encountered exception.", e);
}
catch (JobInstanceAlreadyCompleteException e) {
throw new UnexpectedJobExecutionException("Step runner encountered exception.", e);
}
catch (JobParametersInvalidException e) {
catch (JobExecutionAlreadyRunningException | JobRestartException | JobInstanceAlreadyCompleteException
| JobParametersInvalidException e) {
throw new UnexpectedJobExecutionException("Step runner encountered exception.", e);
}
}