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

Polish

Browse Source 
See gh-21130
This commit is contained in:
richard1230
2020-04-26 15:27:20 +08:00
committed by Stephane Nicoll
parent f85a0884ab
commit a989879dbc
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
View File

@@ -149,7 +149,7 @@ public enum CloudPlatform {
*/
public boolean isEnforced(Environment environment) {
String platform = environment.getProperty("spring.main.cloud-platform");
return (platform != null) ? name().equalsIgnoreCase(platform) : false;
return name().equalsIgnoreCase(platform);
}
/**

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
View File

@@ -117,10 +117,7 @@ class ValueObjectBinder implements DataObjectBinder {
}
private boolean isEmptyDefaultValueAllowed(Class<?> type) {
if (type.isPrimitive() || type.isEnum() || isAggregate(type) || type.getName().startsWith("java.lang")) {
return false;
}
return true;
return !type.isPrimitive() && !type.isEnum() && !isAggregate(type) && !type.getName().startsWith("java.lang");
}
private boolean isAggregate(Class<?> type) {

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
View File

@@ -232,7 +232,6 @@ public class DeferredLog implements Log {
return;
case FATAL:
log.fatal(message, throwable);
return;
}
}

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.web.embedded.tomcat;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.catalina.Container;
@@ -106,9 +107,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
private List<Connector> getConnectors() {
List<Connector> connectors = new ArrayList<>();
for (Service service : this.tomcat.getServer().findServices()) {
for (Connector connector : service.findConnectors()) {
connectors.add(connector);
}
connectors.addAll(Arrays.asList(service.findConnectors()));
}
return connectors;
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java
View File

@@ -251,11 +251,11 @@ public class UndertowWebServer implements WebServer {
@Override
public boolean shutDownGracefully() {
return (this.gracefulShutdown != null) ? this.gracefulShutdown.shutDownGracefully() : false;
return (this.gracefulShutdown != null) && this.gracefulShutdown.shutDownGracefully();
}
boolean inGracefulShutdown() {
return (this.gracefulShutdown != null) ? this.gracefulShutdown.isShuttingDown() : false;
return (this.gracefulShutdown != null) && this.gracefulShutdown.isShuttingDown();
}
/**