Merge pull request #20192 from zhangt2333

* pr/20192:
  Update copyright date
  Polish

Closes gh-20192

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.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.
@@ -70,7 +70,7 @@ public enum ApiVersion {
 	private static ApiVersion forType(String type) {
 		if (type.startsWith(MEDIA_TYPE_PREFIX)) {
 			type = type.substring(MEDIA_TYPE_PREFIX.length());
-			int suffixIndex = type.indexOf("+");
+			int suffixIndex = type.indexOf('+');
 			type = (suffixIndex != -1) ? type.substring(0, suffixIndex) : type;
 			try {
 				return valueOf(type.toUpperCase());

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.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.
@@ -74,10 +74,7 @@ class ProjectGenerator {
 			return true;
 		}
 		// explicit name hasn't been provided for an archive and there is no extension
-		if (isZipArchive(response) && request.getOutput() != null && !request.getOutput().contains(".")) {
+		return isZipArchive(response) && request.getOutput() != null && !request.getOutput().contains(".");
-			return true;
-		}
-		return false;
 	}
 
 	private boolean isZipArchive(ProjectGenerationResponse entity) {

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java

@@ -140,10 +140,7 @@ public class DependencyCustomizer {
 			protected boolean canAdd() {
 				for (String path : paths) {
 					try {
-						if (DependencyCustomizer.this.loader.getResource(path) == null) {
+						return DependencyCustomizer.this.loader.getResource(path) != null;
-							return false;
-						}
-						return true;
 					}
 					catch (Exception ex) {
 						// swallow exception and continue
@@ -166,10 +163,7 @@ public class DependencyCustomizer {
 			protected boolean canAdd() {
 				for (String path : paths) {
 					try {
-						if (DependencyCustomizer.this.loader.getResource(path) != null) {
+						return DependencyCustomizer.this.loader.getResource(path) != null;
-							return true;
-						}
-						return false;
 					}
 					catch (Exception ex) {
 						// swallow exception and continue

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.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.
@@ -381,10 +381,7 @@ public abstract class MainClassFinder {
 				return false;
 			}
 			MainClass other = (MainClass) obj;
-			if (!this.name.equals(other.name)) {
+			return this.name.equals(other.name);
-				return false;
-			}
-			return true;
 		}
 
 		@Override

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ClassPathIndexFile.java

@@ -54,7 +54,7 @@ final class ClassPathIndexFile {
 	}
 
 	private String getFolder(String name) {
-		int lastSlash = name.lastIndexOf("/");
+		int lastSlash = name.lastIndexOf('/');
 		return (lastSlash != -1) ? name.substring(0, lastSlash) : null;
 	}