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

Polish

Browse Source 
Closes gh-26190
This commit is contained in:
Stephane Nicoll
2021-04-21 17:20:22 +02:00
parent 6c68f3652c b1170efd3b
commit 3ca6ed6246
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailabilityBean.java
View File

@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
public class ApplicationAvailabilityBean
implements ApplicationAvailability, ApplicationListener<AvailabilityChangeEvent<?>> {
private static final Log logger = LogFactory.getLog(ApplicationAvailability.class);
private static final Log logger = LogFactory.getLog(ApplicationAvailabilityBean.class);
private final Map<Class<? extends AvailabilityState>, AvailabilityChangeEvent<?>> events = new HashMap<>();
@@ -70,6 +70,13 @@ public class ApplicationAvailabilityBean
}
private void logStateChange(AvailabilityChangeEvent<?> event) {
if (logger.isInfoEnabled()) {
StringBuilder message = createStateChangeMessage(event);
logger.info(message);
}
}
private StringBuilder createStateChangeMessage(AvailabilityChangeEvent<?> event) {
Class<? extends AvailabilityState> stateType = getStateType(event.getState());
StringBuilder message = new StringBuilder(
"Application availability state " + stateType.getSimpleName() + " changed");
@@ -78,15 +85,16 @@ public class ApplicationAvailabilityBean
message.append(" from " + lastChangeEvent.getState());
}
message.append(" to " + event.getState());
if (event.getSource() != null) {
if (event.getSource() instanceof Throwable) {
message.append(": " + event.getSource());
Object source = event.getSource();
if (source != null) {
if (source instanceof Throwable) {
message.append(": " + source);
}
else if (!(event.getSource() instanceof ApplicationEventPublisher)) {
message.append(": " + event.getSource().getClass().getName());
else if (!(source instanceof ApplicationEventPublisher)) {
message.append(": " + source.getClass().getName());
}
}
logger.info(message);
return message;
}
@SuppressWarnings("unchecked")

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
View File

@@ -55,7 +55,7 @@ public class ApplicationConversionService extends FormattingConversionService {
private static volatile ApplicationConversionService sharedInstance;
private boolean unmodifiable;
private final boolean unmodifiable;
public ApplicationConversionService() {
this(null);

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ReactiveWebServerFactoryTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@JettyReactiveWebServerFactory} with Jetty 10.
* Tests for {@link JettyReactiveWebServerFactory} with Jetty 10.
*
* @author Andy Wilkinson
*/

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@JettyServletWebServerFactory} with Jetty 10.
* Tests for {@link JettyServletWebServerFactory} with Jetty 10.
*
* @author Andy Wilkinson
*/