Merge pull request eugenp#5727 from rozagerardo/geroza/BAEL-9523_migrate-modules-to-parent-boot-2

lor6 · web-flow · commit c7015ee68bc6 · 2018-11-19T22:55:52.000+02:00
[BAEL-9524] spring-boot | migrating to parent-boot-2 - further fixes
diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories
@@ -0,0 +1 @@
+org.springframework.boot.diagnostics.FailureAnalyzer=com.baeldung.failureanalyzer.MyBeanNotOfRequiredTypeFailureAnalyzer
diff --git a/spring-boot/src/test/java/com/baeldung/failureanalyzer/FailureAnalyzerAppIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/failureanalyzer/FailureAnalyzerAppIntegrationTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.failureanalyzer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.boot.SpringApplication;
+
+import com.baeldung.failureanalyzer.utils.ListAppender;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+public class FailureAnalyzerAppIntegrationTest {
+
+    private static final String EXPECTED_ANALYSIS_DESCRIPTION_TITLE = "Description:";
+    private static final String EXPECTED_ANALYSIS_DESCRIPTION_CONTENT = "The bean myDAO could not be injected as com.baeldung.failureanalyzer.MyDAO because it is of type com.baeldung.failureanalyzer.MySecondDAO";
+    private static final String EXPECTED_ANALYSIS_ACTION_TITLE = "Action:";
+    private static final String EXPECTED_ANALYSIS_ACTION_CONTENT = "Consider creating a bean with name myDAO of type com.baeldung.failureanalyzer.MyDAO";
+
+    @BeforeEach
+    public void clearLogList() {
+        ListAppender.clearEventList();
+    }
+
+    @Test
+    public void givenBeanCreationErrorInContext_whenContextLoaded_thenFailureAnalyzerLogsReport() {
+        try {
+            SpringApplication.run(FailureAnalyzerApplication.class);
+        } catch (BeanCreationException e) {
+            Collection<String> allLoggedEntries = ListAppender.getEvents()
+                .stream()
+                .map(ILoggingEvent::getFormattedMessage)
+                .collect(Collectors.toList());
+            assertThat(allLoggedEntries).anyMatch(entry -> entry.contains(EXPECTED_ANALYSIS_DESCRIPTION_TITLE))
+                .anyMatch(entry -> entry.contains(EXPECTED_ANALYSIS_DESCRIPTION_CONTENT))
+                .anyMatch(entry -> entry.contains(EXPECTED_ANALYSIS_ACTION_TITLE))
+                .anyMatch(entry -> entry.contains(EXPECTED_ANALYSIS_ACTION_CONTENT));
+            return;
+        }
+        throw new IllegalStateException("Context load should be failing due to a BeanCreationException!");
+    }
+
+}
diff --git a/spring-boot/src/test/java/com/baeldung/failureanalyzer/utils/ListAppender.java b/spring-boot/src/test/java/com/baeldung/failureanalyzer/utils/ListAppender.java
@@ -0,0 +1,25 @@
+package com.baeldung.failureanalyzer.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+
+public class ListAppender extends AppenderBase<ILoggingEvent> {
+    
+    static private List<ILoggingEvent> events = new ArrayList<>();
+
+    @Override
+    protected void append(ILoggingEvent eventObject) {
+        events.add(eventObject);
+    }
+    
+    public static List<ILoggingEvent> getEvents() {
+        return events;
+    }
+    
+    public static void clearEventList() {
+        events.clear();
+    }
+}
diff --git a/spring-boot/src/test/resources/logback-test.xml b/spring-boot/src/test/resources/logback-test.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include
+        resource="org/springframework/boot/logging/logback/base.xml" />
+    <appender name="LISTAPPENDER"
+        class="com.baeldung.failureanalyzer.utils.ListAppender">
+    </appender>
+    <logger
+        name="org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter">
+        <appender-ref ref="LISTAPPENDER" />
+    </logger>
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration> 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.springframework.boot.diagnostics.FailureAnalyzer=com.baeldung.failureanalyzer.MyBeanNotOfRequiredTypeFailureAnalyzer`