Polish

Author: philwebb

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java

@@ -182,33 +182,20 @@ public boolean equals(Object obj) {
 			if (this == obj) {
 				return true;
 			}
-			if (obj == null) {
-				return false;
-			}
-			if (getClass() != obj.getClass()) {
+			if (obj == null || getClass() != obj.getClass()) {
 				return false;
 			}
 			CacheKey other = (CacheKey) obj;
-			if (this.apiVersion != other.apiVersion) {
-				return false;
-			}
-			if (this.principal == null) {
-				if (other.principal != null) {
-					return false;
-				}
-			}
-			else if (!this.principal.equals(other.principal)) {
-				return false;
-			}
-			return true;
+			return this.apiVersion.equals(other.apiVersion)
+					&& ObjectUtils.nullSafeEquals(this.principal, other.principal);
 		}
 
 		@Override
 		public int hashCode() {
 			final int prime = 31;
 			int result = 1;
 			result = prime * result + this.apiVersion.hashCode();
-			result = prime * result + ((this.principal == null) ? 0 : this.principal.hashCode());
+			result = prime * result + ObjectUtils.nullSafeHashCode(this.principal);
 			return result;
 		}
 

spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc

@@ -181,13 +181,17 @@ See the {spring-boot-module-api}/cloud/CloudFoundryVcapEnvironmentPostProcessor.
 
 TIP: The https://github.com/pivotal-cf/java-cfenv/[Java CFEnv] project is a better fit for tasks such as configuring a DataSource.
 
+
+
 [[cloud-deployment-kubernetes]]
 === Kubernetes
 Spring Boot auto-detects Kubernetes deployment environments by checking the environment for `"*_SERVICE_HOST"` and `"*_SERVICE_PORT"` variables.
 You can override this detection with the configprop:management.health.probes.enabled[] configuration property.
 
 Spring Boot helps you to <<spring-boot-features.adoc#boot-features-application-availability-state,manage the state of your application>> and export it with <<production-ready-features.adoc#production-ready-kubernetes-probes, HTTP Kubernetes Probes using Actuator>>.
 
+
+
 [[cloud-deployment-kubernetes-container-lifecycle]]
 ==== Kubernetes Container Lifecycle
 When Kubernetes deletes an application instance, the shutdown process involves several subsystems concurrently: shutdown hooks, unregistering the service, removing the instance from the load-balancer...
@@ -207,6 +211,7 @@ lifecycle:
 Once the pre-stop hook has completed, SIGTERM will be sent to the container and <<spring-boot-features#boot-features-graceful-shutdown,graceful shutdown>> will begin, allowing any remaining in-flight requests to complete.
 
 
+
 [[cloud-deployment-heroku]]
 === Heroku
 Heroku is another popular PaaS platform.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc

@@ -870,6 +870,7 @@ It's also possible to override the `show-details` and `roles` properties if requ
 TIP: You can use `@Qualifier("groupname")` if you need to register custom `StatusAggregator` or `HttpCodeStatusMapper` beans for use with the group.
 
 
+
 [[production-ready-kubernetes-probes]]
 === Kubernetes Probes
 Applications deployed on Kubernetes can provide information about their internal state with https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes[Container Probes].
@@ -905,6 +906,8 @@ The `"startupProbe"` is not necessarily needed here as the `"readinessProbe"` fa
 WARNING: If your Actuator endpoints are deployed on a separate management context, be aware that endpoints are then not using the same web infrastructure (port, connection pools, framework components) as the main application.
 In this case, a Probe check could be successful even if the main application does not work properly (for example, it cannot accept new connections).
 
+
+
 [[production-ready-kubernetes-probes-external-state]]
 ==== Checking external state with Kubernetes Probes
 Actuator configures the "liveness" and "readiness" Probes as Health Groups; this means that all the <<production-ready-health-groups, Health Groups features>> are available for them.
@@ -927,6 +930,7 @@ Some external systems might not be shared by application instances or not essent
 Also, Kubernetes will react differently to applications being taken out of the load-balancer, depending on its https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[autoscaling configuration].
 
 
+
 [[production-ready-kubernetes-probes-lifecycle]]
 ==== Application lifecycle and Probes states
 An important aspect of the Kubernetes Probes support is its consistency with the application lifecycle.
@@ -952,7 +956,6 @@ When a Spring Boot application starts:
 |live
 |ready
 |Startup tasks are finished. The application is receiving traffic.
-
 |===
 
 When a Spring Boot application shuts down:
@@ -975,12 +978,12 @@ When a Spring Boot application shuts down:
 |broken
 |unready
 |The application context is closed and the application cannot serve traffic.
-
 |===
 
 TIP: Check out the <<deployment.adoc#cloud-deployment-kubernetes-container-lifecycle,Kubernetes container lifecycle section>> for more information about Kubernetes deployment.
 
 
+
 [[production-ready-application-info]]
 === Application Information
 Application information exposes various information collected from all {spring-boot-actuator-module-code}/info/InfoContributor.java[`InfoContributor`] beans defined in your `ApplicationContext`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -191,12 +191,15 @@ NOTE: There are some restrictions when creating an `ApplicationContext` hierarch
 For example, Web components *must* be contained within the child context, and the same `Environment` is used for both parent and child contexts.
 See the {spring-boot-module-api}/builder/SpringApplicationBuilder.html[`SpringApplicationBuilder` Javadoc] for full details.
 
+
+
 [[boot-features-application-availability-state]]
 === Application Availability State
 When deployed on plaftorms, applications can provide information about their availability to the platform using infrastructure like https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/[Kubernetes Probes].
 Spring Boot manages this application state with the `ApplicationAvailabilityProvider` and makes it available to application components and the platform itself.
 
 
+
 [[boot-features-application-availability-liveness]]
 ==== Liveness State
 The "Liveness" state of an application tells whether its internal state allows it to work correctly, or recover by itself if it's currently failing.
@@ -209,6 +212,8 @@ The internal state of Spring Boot applications is mostly represented by the Spri
 If the application context has started successfully, Spring Boot assumes that the application is in a valid state.
 An application is considered live as soon as the context has been refreshed, see <<boot-features-application-events-and-listeners, Spring Boot application lifecycle and related Application Events>>.
 
+
+
 [[boot-features-application-availability-readiness]]
 ==== Readiness State
 The "Readiness" state of an application tells whether the application is ready to handle traffic.

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/HttpClientHttp.java

@@ -150,8 +150,6 @@ private Response execute(HttpUriRequest request) {
 
 	/**
 	 * {@link HttpEntity} to send {@link Content} content.
-	 *
-	 * @author Phillip Webb
 	 */
 	private static class WritableHttpEntity extends AbstractHttpEntity {
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging.adoc

@@ -306,6 +306,8 @@ include::../gradle/packaging/boot-jar-layered-exclude-tools.gradle[tags=layered]
 include::../gradle/packaging/boot-jar-layered-exclude-tools.gradle.kts[tags=layered]
 ----
 
+
+
 [[packaging-layers-configuration]]
 ===== Custom Layers configuration
 Depending on your application, you may want to tune how layers are created and add new ones.

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java

@@ -24,6 +24,7 @@
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.tasks.Jar;
 
@@ -91,15 +92,11 @@ public void buildInfo() {
 	 * @param configurer the task configurer
 	 */
 	public void buildInfo(Action<BuildInfo> configurer) {
-		TaskProvider<BuildInfo> bootBuildInfo = this.project.getTasks().register("bootBuildInfo", BuildInfo.class,
-				(task) -> {
-					task.setGroup(BasePlugin.BUILD_GROUP);
-					task.setDescription("Generates a META-INF/build-info.properties file.");
-					task.getConventionMapping().map("destinationDir",
-							() -> new File(determineMainSourceSetResourcesOutputDir(), "META-INF"));
-				});
+		TaskContainer tasks = this.project.getTasks();
+		TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class,
+				this::configureBuildInfoTask);
 		this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> {
-			this.project.getTasks().getByName(JavaPlugin.CLASSES_TASK_NAME).dependsOn(bootBuildInfo.get());
+			tasks.getByName(JavaPlugin.CLASSES_TASK_NAME).dependsOn(bootBuildInfo.get());
 			this.project.afterEvaluate((evaluated) -> {
 				BuildInfoProperties properties = bootBuildInfo.get().getProperties();
 				if (properties.getArtifact() == null) {
@@ -112,6 +109,13 @@ public void buildInfo(Action<BuildInfo> configurer) {
 		}
 	}
 
+	private void configureBuildInfoTask(BuildInfo task) {
+		task.setGroup(BasePlugin.BUILD_GROUP);
+		task.setDescription("Generates a META-INF/build-info.properties file.");
+		task.getConventionMapping().map("destinationDir",
+				() -> new File(determineMainSourceSetResourcesOutputDir(), "META-INF"));
+	}
+
 	private File determineMainSourceSetResourcesOutputDir() {
 		return this.project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
 				.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput().getResourcesDir();

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java

@@ -245,7 +245,7 @@ private Layer layerForFileDetails(FileCopyDetails details) {
 			String coordinates = this.coordinatesByFileName.get(details.getName());
 			LibraryCoordinates libraryCoordinates = (coordinates != null) ? new LibraryCoordinates(coordinates)
 					: new LibraryCoordinates("?:?:?");
-			return this.layers.getLayer(new Library(null, details.getFile(), null, false, libraryCoordinates));
+			return this.layers.getLayer(new Library(null, details.getFile(), null, libraryCoordinates, false));
 		}
 		if (path.startsWith("BOOT-INF/classes/")) {
 			return this.layers.getLayer(details.getSourcePath());

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerConfiguration.java

@@ -153,12 +153,6 @@ public void exclude(String... excludes) {
 
 	private static final class StrategySpec {
 
-		private enum TYPE {
-
-			LIBRARIES, RESOURCES;
-
-		}
-
 		private final TYPE type;
 
 		private List<LibraryFilter> libraryFilters;
@@ -232,6 +226,12 @@ private static StrategySpec forResources() {
 			return new StrategySpec(TYPE.RESOURCES);
 		}
 
+		private enum TYPE {
+
+			LIBRARIES, RESOURCES;
+
+		}
+
 	}
 
 }

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

@@ -37,10 +37,10 @@ public class Library {
 
 	private final LibraryScope scope;
 
-	private final boolean unpackRequired;
-
 	private final LibraryCoordinates coordinates;
 
+	private final boolean unpackRequired;
+
 	/**
 	 * Create a new {@link Library}.
 	 * @param file the source file
@@ -69,15 +69,24 @@ public Library(File file, LibraryScope scope, boolean unpackRequired) {
 	 * @param unpackRequired if the library needs to be unpacked before it can be used
 	 */
 	public Library(String name, File file, LibraryScope scope, boolean unpackRequired) {
-		this(name, file, scope, unpackRequired, null);
+		this(name, file, scope, null, unpackRequired);
 	}
 
-	public Library(String name, File file, LibraryScope scope, boolean unpackRequired, LibraryCoordinates coordinates) {
+	/**
+	 * Create a new {@link Library}.
+	 * @param name the name of the library as it should be written or {@code null} to use
+	 * the file name
+	 * @param file the source file
+	 * @param scope the scope of the library
+	 * @param coordinates the library coordinates or {@code null}
+	 * @param unpackRequired if the library needs to be unpacked before it can be used
+	 */
+	public Library(String name, File file, LibraryScope scope, LibraryCoordinates coordinates, boolean unpackRequired) {
 		this.name = (name != null) ? name : file.getName();
 		this.file = file;
 		this.scope = scope;
-		this.unpackRequired = unpackRequired;
 		this.coordinates = coordinates;
+		this.unpackRequired = unpackRequired;
 	}
 
 	/**
@@ -113,6 +122,14 @@ public LibraryScope getScope() {
 		return this.scope;
 	}
 
+	/**
+	 * Return the {@linkplain LibraryCoordinates coordinates} of the library.
+	 * @return the coordinates
+	 */
+	public LibraryCoordinates getCoordinates() {
+		return this.coordinates;
+	}
+
 	/**
 	 * Return if the file cannot be used directly as a nested jar and needs to be
 	 * unpacked.
@@ -122,14 +139,6 @@ public boolean isUnpackRequired() {
 		return this.unpackRequired;
 	}
 
-	/**
-	 * Return the {@linkplain LibraryCoordinates coordinates} of the library.
-	 * @return the coordinates
-	 */
-	public LibraryCoordinates getCoordinates() {
-		return this.coordinates;
-	}
-
 	long getLastModified() {
 		return this.file.lastModified();
 	}