Skip to content

Commit 08a8bb0

Browse files
committed
Revert "Add failure analyzer for BeanCreationException"
Closes gh-9220
1 parent 07ec13d commit 08a8bb0

File tree

5 files changed

+29
-145
lines changed

5 files changed

+29
-145
lines changed

spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCreationFailureAnalyzer.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.beans.factory.UnsatisfiedDependencyException;
2626
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
2727
import org.springframework.boot.diagnostics.FailureAnalysis;
28-
import org.springframework.core.annotation.Order;
2928
import org.springframework.util.StringUtils;
3029

3130
/**
@@ -34,7 +33,6 @@
3433
*
3534
* @author Andy Wilkinson
3635
*/
37-
@Order(0)
3836
class BeanCurrentlyInCreationFailureAnalyzer
3937
extends AbstractFailureAnalyzer<BeanCurrentlyInCreationException> {
4038

spring-boot/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ org.springframework.boot.env.SpringApplicationJsonEnvironmentPostProcessor
3333

3434
# Failure Analyzers
3535
org.springframework.boot.diagnostics.FailureAnalyzer=\
36-
org.springframework.boot.diagnostics.analyzer.BeanCreationFailureAnalyzer,\
3736
org.springframework.boot.diagnostics.analyzer.BeanCurrentlyInCreationFailureAnalyzer,\
3837
org.springframework.boot.diagnostics.analyzer.BeanNotOfRequiredTypeFailureAnalyzer,\
3938
org.springframework.boot.diagnostics.analyzer.BindFailureAnalyzer,\

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,25 @@ public void onApplicationEvent(
805805
TestPropertySourceUtils.INLINED_PROPERTIES_PROPERTY_SOURCE_NAME);
806806
}
807807

808+
@Test
809+
public void failureResultsInSingleStackTrace() throws Exception {
810+
ThreadGroup group = new ThreadGroup("main");
811+
Thread thread = new Thread(group, "main") {
812+
@Override
813+
public void run() {
814+
SpringApplication application = new SpringApplication(
815+
FailingConfig.class);
816+
application.setWebEnvironment(false);
817+
application.run();
818+
};
819+
};
820+
thread.start();
821+
thread.join(6000);
822+
int occurrences = StringUtils.countOccurrencesOf(this.output.toString(),
823+
"Caused by: java.lang.RuntimeException: ExpectedError");
824+
assertThat(occurrences).as("Expected single stacktrace").isEqualTo(1);
825+
}
826+
808827
private Condition<ConfigurableEnvironment> matchingPropertySource(
809828
final Class<?> propertySourceClass, final String name) {
810829
return new Condition<ConfigurableEnvironment>("has property source") {
@@ -947,6 +966,16 @@ public TomcatEmbeddedServletContainerFactory container() {
947966

948967
}
949968

969+
@Configuration
970+
static class FailingConfig {
971+
972+
@Bean
973+
public Object fail() {
974+
throw new RuntimeException("ExpectedError");
975+
}
976+
977+
}
978+
950979
@Configuration
951980
static class CommandLineRunConfig {
952981

spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCreationFailureAnalyzerTest.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)