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

Remove unreachable throw code

Browse Source 
Improve `SpringApplication` by removing the unreachable throw statement
in favor of returning an exception from `handleRunFailure`. This commit
also removes the if statements in favor of dedicated catch blocks.

See gh-39107
This commit is contained in:
BenchmarkingBuffalo
2024-01-11 18:14:11 +01:00
committed by Phillip Webb
parent dee709e5ba
commit a4ae6600ef
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@@ -95,7 +95,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.util.function.ThrowingConsumer;
import org.springframework.util.function.ThrowingSupplier;
@@ -172,6 +171,7 @@ import org.springframework.util.function.ThrowingSupplier;
* @author Ethan Rubinson
* @author Chris Bono
* @author Tadaya Tsuyukubo
* @author Lasse Wulff
* @since 1.0.0
* @see #run(Class, String[])
* @see #run(Class[], String[])
@@ -330,12 +330,11 @@ public class SpringApplication {
listeners.started(context, timeTakenToStartup);
callRunners(context, applicationArguments);
}
catch (AbandonedRunException ex) {
throw ex;
}
catch (Throwable ex) {
if (ex instanceof AbandonedRunException) {
throw ex;
}
handleRunFailure(context, ex, listeners);
throw new IllegalStateException(ex);
throw handleRunFailure(context, ex, listeners);
}
try {
if (context.isRunning()) {
@@ -343,12 +342,11 @@ public class SpringApplication {
listeners.ready(context, timeTakenToReady);
}
}
catch (AbandonedRunException ex) {
throw ex;
}
catch (Throwable ex) {
if (ex instanceof AbandonedRunException) {
throw ex;
}
handleRunFailure(context, ex, null);
throw new IllegalStateException(ex);
throw handleRunFailure(context, ex, null);
}
return context;
}
@@ -790,7 +788,7 @@ public class SpringApplication {
.accept((R) runner);
}
private void handleRunFailure(ConfigurableApplicationContext context, Throwable exception,
private RuntimeException handleRunFailure(ConfigurableApplicationContext context, Throwable exception,
SpringApplicationRunListeners listeners) {
try {
try {
@@ -810,7 +808,10 @@ public class SpringApplication {
catch (Exception ex) {
logger.warn("Unable to close ApplicationContext", ex);
}
ReflectionUtils.rethrowRuntimeException(exception);
if (exception instanceof RuntimeException runtimeException) {
return runtimeException;
}
return new IllegalStateException(exception);
}
private Collection<SpringBootExceptionReporter> getExceptionReporters(ConfigurableApplicationContext context) {