From a989879dbcdc66f9f61f651da1f6c25ec17682b1 Mon Sep 17 00:00:00 2001 From: richard1230 Date: Sun, 26 Apr 2020 15:27:20 +0800 Subject: [PATCH 1/2] Polish See gh-21130 --- .../java/org/springframework/boot/cloud/CloudPlatform.java | 2 +- .../boot/context/properties/bind/ValueObjectBinder.java | 5 +---- .../java/org/springframework/boot/logging/DeferredLog.java | 1 - .../boot/web/embedded/tomcat/TomcatGracefulShutdown.java | 5 ++--- .../boot/web/embedded/undertow/UndertowWebServer.java | 4 ++-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java index d55f1f13c0..f74b4135f0 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java @@ -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); } /** diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java index 0b320a6262..db31f878e1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java @@ -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) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java index b7c192f632..4c3b6f21bb 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java @@ -232,7 +232,6 @@ public class DeferredLog implements Log { return; case FATAL: log.fatal(message, throwable); - return; } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java index b0f79a93f2..b883275dc9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java @@ -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 getConnectors() { List 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; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java index 7b07da0247..b023c3af92 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java @@ -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(); } /** From 4165863859a69d148a851e29224df3beb0b75a2e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 27 Apr 2020 10:41:02 +0200 Subject: [PATCH 2/2] Polish contribution See gh-21130 --- .../boot/context/properties/bind/ValueObjectBinder.java | 5 ++++- .../java/org/springframework/boot/logging/DeferredLog.java | 2 +- .../boot/web/embedded/tomcat/TomcatGracefulShutdown.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java index db31f878e1..0b320a6262 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java @@ -117,7 +117,10 @@ class ValueObjectBinder implements DataObjectBinder { } private boolean isEmptyDefaultValueAllowed(Class type) { - return !type.isPrimitive() && !type.isEnum() && !isAggregate(type) && !type.getName().startsWith("java.lang"); + if (type.isPrimitive() || type.isEnum() || isAggregate(type) || type.getName().startsWith("java.lang")) { + return false; + } + return true; } private boolean isAggregate(Class type) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java index 4c3b6f21bb..668fe82727 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java index b883275dc9..8878dc178f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java @@ -18,7 +18,7 @@ package org.springframework.boot.web.embedded.tomcat; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.apache.catalina.Container; @@ -107,7 +107,7 @@ class TomcatGracefulShutdown implements GracefulShutdown { private List getConnectors() { List connectors = new ArrayList<>(); for (Service service : this.tomcat.getServer().findServices()) { - connectors.addAll(Arrays.asList(service.findConnectors())); + Collections.addAll(connectors, service.findConnectors()); } return connectors; }