From 10da3d390e9c617653538bcd4c3b5b077faa2e79 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 27 Mar 2015 11:30:58 -0700 Subject: [PATCH] Polish --- .../boot/actuate/health/MailHealthIndicatorTests.java | 5 +++-- .../AutoConfigurationReportLoggingInitializer.java | 3 +++ .../logging/ClasspathLoggingApplicationListener.java | 3 +++ .../boot/logging/LoggingApplicationListener.java | 11 ++++++----- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java index 4f680525c3f..7505f6b322b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.health; import java.util.Properties; + import javax.mail.Address; import javax.mail.Message; import javax.mail.MessagingException; @@ -28,7 +29,6 @@ import javax.mail.URLName; import org.junit.Before; import org.junit.Test; - import org.springframework.mail.javamail.JavaMailSenderImpl; import static org.junit.Assert.assertEquals; @@ -72,7 +72,8 @@ public class MailHealthIndicatorTests { @Test public void smtpIsDown() throws MessagingException { - doThrow(new MessagingException("A test exception")).when(this.mailSender).testConnection(); + doThrow(new MessagingException("A test exception")).when(this.mailSender) + .testConnection(); Health health = this.indicator.health(); assertEquals(Status.DOWN, health.getStatus()); assertEquals("smtp.acme.org:25", health.getDetails().get("location")); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java index ce5ce2fb3dd..64fb9404f54 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java @@ -189,6 +189,9 @@ public class AutoConfigurationReportLoggingInitializer implements @Override public boolean supportsEventType(ResolvableType resolvableType) { Class type = resolvableType.getRawClass(); + if (type == null) { + return false; + } return ContextRefreshedEvent.class.isAssignableFrom(type) || ApplicationFailedEvent.class.isAssignableFrom(type); } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java index 65971f96f94..2e8b272993d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java @@ -68,6 +68,9 @@ public final class ClasspathLoggingApplicationListener implements @Override public boolean supportsEventType(ResolvableType resolvableType) { Class type = resolvableType.getRawClass(); + if (type == null) { + return false; + } return ApplicationStartedEvent.class.isAssignableFrom(type) || ApplicationFailedEvent.class.isAssignableFrom(type); } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java index aef6b5e702f..95d0f2e1028 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java @@ -117,8 +117,7 @@ public class LoggingApplicationListener implements GenericApplicationListener { @Override public boolean supportsEventType(ResolvableType resolvableType) { - Class eventType = resolvableType.getRawClass(); - return isAssignableFrom(eventType, EVENT_TYPES); + return isAssignableFrom(resolvableType.getRawClass(), EVENT_TYPES); } @Override @@ -127,9 +126,11 @@ public class LoggingApplicationListener implements GenericApplicationListener { } private boolean isAssignableFrom(Class type, Class... supportedTypes) { - for (Class supportedType : supportedTypes) { - if (supportedType.isAssignableFrom(type)) { - return true; + if (type != null) { + for (Class supportedType : supportedTypes) { + if (supportedType.isAssignableFrom(type)) { + return true; + } } } return false;