Merge pull request #21130 from richard1230

* pr/21130:
  Polish contribution
  Polish

Closes gh-21130

Author: snicoll

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

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

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.
@@ -232,7 +232,6 @@ private static void logTo(Log log, LogLevel level, Object message, Throwable thr
 			return;
 		case FATAL:
 			log.fatal(message, throwable);
-			return;
 		}
 	}
 

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

@@ -18,6 +18,7 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.catalina.Container;
@@ -106,9 +107,7 @@ private boolean active(Container context) {
 	private List<Connector> getConnectors() {
 		List<Connector> connectors = new ArrayList<>();
 		for (Service service : this.tomcat.getServer().findServices()) {
-			for (Connector connector : service.findConnectors()) {
-				connectors.add(connector);
-			}
+			Collections.addAll(connectors, service.findConnectors());
 		}
 		return connectors;
 	}

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

@@ -251,11 +251,11 @@ public int getPort() {
 
 	@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();
 	}
 
 	/**