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

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-39091
This commit is contained in:
Andy Wilkinson
2024-01-11 09:56:35 +00:00
parent d3b93f5d70 45c32854a5
commit 7087897507
150 changed files with 358 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -101,7 +101,7 @@ final class BuildpackLayersMetadata extends MappedObject {
return new BuildpackLayersMetadata(node);
}
private static class Buildpacks {
private static final class Buildpacks {
private final Map<String, BuildpackVersions> buildpacks = new HashMap<>();
@@ -126,7 +126,7 @@ final class BuildpackLayersMetadata extends MappedObject {
}
private static class BuildpackVersions {
private static final class BuildpackVersions {
private final Map<String, BuildpackLayerDetails> versions = new HashMap<>();

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -331,7 +331,7 @@ class Lifecycle implements Closeable {
/**
* Common directories used by the various phases.
*/
private static class Directory {
private static final class Directory {
/**
* The directory used by buildpacks to write their layer contributions. A new

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -500,7 +500,7 @@ public class DockerApi {
/**
* {@link UpdateListener} used to capture the image digest.
*/
private static class DigestCaptureUpdateListener implements UpdateListener<ProgressUpdateEvent> {
private static final class DigestCaptureUpdateListener implements UpdateListener<ProgressUpdateEvent> {
private static final String PREFIX = "Digest:";
@@ -521,7 +521,7 @@ public class DockerApi {
/**
* {@link UpdateListener} used to ensure an image load response stream.
*/
private static class StreamCaptureUpdateListener implements UpdateListener<LoadImageUpdateEvent> {
private static final class StreamCaptureUpdateListener implements UpdateListener<LoadImageUpdateEvent> {
private String stream;
@@ -540,7 +540,7 @@ public class DockerApi {
* {@link UpdateListener} used to capture the details of an error in a response
* stream.
*/
private static class ErrorCaptureUpdateListener implements UpdateListener<PushImageUpdateEvent> {
private static final class ErrorCaptureUpdateListener implements UpdateListener<PushImageUpdateEvent> {
@Override
public void onUpdate(PushImageUpdateEvent event) {

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/LocalHttpClientTransport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -88,7 +88,7 @@ final class LocalHttpClientTransport extends HttpClientTransport {
/**
* {@link DnsResolver} that ensures only the loopback address is used.
*/
private static class LocalDnsResolver implements DnsResolver {
private static final class LocalDnsResolver implements DnsResolver {
private static final InetAddress LOOPBACK = InetAddress.getLoopbackAddress();
@@ -136,7 +136,7 @@ final class LocalHttpClientTransport extends HttpClientTransport {
/**
* {@link HttpRoutePlanner} for local Docker.
*/
private static class LocalRoutePlanner implements HttpRoutePlanner {
private static final class LocalRoutePlanner implements HttpRoutePlanner {
@Override
public HttpRoute determineRoute(HttpHost target, HttpContext context) {

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -157,7 +157,7 @@ public abstract class DomainSocket extends AbstractSocket {
/**
* {@link InputStream} returned from the {@link DomainSocket}.
*/
private class DomainSocketInputStream extends InputStream {
private final class DomainSocketInputStream extends InputStream {
@Override
public int read() throws IOException {
@@ -180,7 +180,7 @@ public abstract class DomainSocket extends AbstractSocket {
/**
* {@link OutputStream} returned from the {@link DomainSocket}.
*/
private class DomainSocketOutputStream extends OutputStream {
private final class DomainSocketOutputStream extends OutputStream {
@Override
public void write(int b) throws IOException {

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/NamedPipeSocket.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -159,7 +159,7 @@ public class NamedPipeSocket extends Socket {
return this.fileChannel.isOpen();
}
private static class CompletableFutureHandler extends CompletableFuture<Integer>
private static final class CompletableFutureHandler extends CompletableFuture<Integer>
implements CompletionHandler<Integer, Object> {
@Override
@@ -183,7 +183,7 @@ public class NamedPipeSocket extends Socket {
/**
* Waits for the name pipe file using a simple sleep.
*/
private static class SleepAwaiter implements Consumer<String> {
private static final class SleepAwaiter implements Consumer<String> {
@Override
public void accept(String path) {
@@ -200,7 +200,7 @@ public class NamedPipeSocket extends Socket {
/**
* Waits for the name pipe file using Windows specific logic.
*/
private static class WindowsAwaiter implements Consumer<String> {
private static final class WindowsAwaiter implements Consumer<String> {
@Override
public void accept(String path) {