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

Merge branch '3.2.x'

Browse Source 
Closes gh-39093
This commit is contained in:
Andy Wilkinson
2024-01-11 11:25:26 +00:00
parent 5b6e3fab2c 7087897507
commit 17e9f0cb8e
151 changed files with 354 additions and 349 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) {

4
spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.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.
@@ -145,7 +145,7 @@ public class OptionHandler {
return this.optionHelp;
}
private static class OptionHelpFormatter implements HelpFormatter {
private static final class OptionHelpFormatter implements HelpFormatter {
private final List<OptionHelp> help = new ArrayList<>();

6
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConstructorParameterPropertyDescriptor.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 @@ class ConstructorParameterPropertyDescriptor extends PropertyDescriptor<Variable
return (coercedValue != null) ? coercedValue : value;
}
private static class DefaultValueCoercionTypeVisitor extends TypeKindVisitor8<Object, String> {
private static final class DefaultValueCoercionTypeVisitor extends TypeKindVisitor8<Object, String> {
private static final DefaultValueCoercionTypeVisitor INSTANCE = new DefaultValueCoercionTypeVisitor();
@@ -161,7 +161,7 @@ class ConstructorParameterPropertyDescriptor extends PropertyDescriptor<Variable
}
private static class DefaultPrimitiveTypeVisitor extends TypeKindVisitor8<Object, Void> {
private static final class DefaultPrimitiveTypeVisitor extends TypeKindVisitor8<Object, Void> {
private static final DefaultPrimitiveTypeVisitor INSTANCE = new DefaultPrimitiveTypeVisitor();

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 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.
@@ -57,7 +57,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
/**
* {@link TreeVisitor} to collect fields.
*/
private static class FieldCollector implements TreeVisitor {
private static final class FieldCollector implements TreeVisitor {
private static final Map<String, Class<?>> WRAPPER_TYPES;

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonConverter.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.
@@ -163,7 +163,7 @@ class JsonConverter {
return defaultValue;
}
private static class ItemMetadataComparator implements Comparator<ItemMetadata> {
private static final class ItemMetadataComparator implements Comparator<ItemMetadata> {
private static final Comparator<ItemMetadata> GROUP = Comparator.comparing(ItemMetadata::getName)
.thenComparing(ItemMetadata::getSourceType, Comparator.nullsFirst(Comparator.naturalOrder()));

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.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.
@@ -109,7 +109,7 @@ public abstract class AbstractFieldValuesProcessorTests {
@SupportedAnnotationTypes({ "org.springframework.boot.configurationsample.ConfigurationProperties" })
@SupportedSourceVersion(SourceVersion.RELEASE_6)
private class TestProcessor extends AbstractProcessor {
private final class TestProcessor extends AbstractProcessor {
private FieldValuesParser processor;

4
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ExtractCommandTests.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.
@@ -217,7 +217,7 @@ class ExtractCommandTests {
return FileCopyUtils.copyToString(reader);
}
private static class TestLayers implements Layers {
private static final class TestLayers implements Layers {
@Override
public Iterator<String> iterator() {

4
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.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.
@@ -129,7 +129,7 @@ public class RandomAccessDataFile implements RandomAccessData {
/**
* {@link InputStream} implementation for the {@link RandomAccessDataFile}.
*/
private class DataInputStream extends InputStream {
private final class DataInputStream extends InputStream {
private int position;

4
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/test/java/org/springframework/boot/loader/jarmode/LauncherJarModeTests.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.
@@ -64,7 +64,7 @@ class LauncherJarModeTests {
assertThat(out).contains("Unsupported jarmode 'idontexist'");
}
private static class TestLauncher extends Launcher {
private static final class TestLauncher extends Launcher {
@Override
protected String getMainClass() throws Exception {

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 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.
@@ -38,7 +38,7 @@ public abstract class LogbackInitializer {
}
}
private static class Initializer {
private static final class Initializer {
void setRootLogLevel() {
ILoggerFactory factory = LoggerFactory.getILoggerFactory();

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 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.
@@ -261,7 +261,7 @@ public abstract class MainClassFinder {
}
}
private static class ClassEntryComparator implements Comparator<JarEntry> {
private static final class ClassEntryComparator implements Comparator<JarEntry> {
@Override
public int compare(JarEntry o1, JarEntry o2) {

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.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.
@@ -566,7 +566,7 @@ public abstract class Packager {
* An {@link UnpackHandler} that determines that an entry needs to be unpacked if
* a library that requires unpacking has a matching entry name.
*/
private class PackagedLibrariesUnpackHandler implements UnpackHandler {
private final class PackagedLibrariesUnpackHandler implements UnpackHandler {
@Override
public boolean requiresUnpack(String name) {

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.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.
@@ -399,7 +399,7 @@ final class JarUrlConnection extends java.net.JarURLConnection {
* Empty {@link URLStreamHandler} used to prevent the wrong JAR Handler from being
* Instantiated and cached.
*/
private static class EmptyUrlStreamHandler extends URLStreamHandler {
private static final class EmptyUrlStreamHandler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL url) {

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles.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.
@@ -142,7 +142,7 @@ class UrlJarFiles {
/**
* Internal cache.
*/
private static class Cache {
private static final class Cache {
private final Map<String, JarFile> jarFileUrlToJarFile = new HashMap<>();

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/LauncherTests.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.
@@ -74,7 +74,7 @@ class LauncherTests {
}
private static class TestLauncher extends Launcher {
private static final class TestLauncher extends Launcher {
@Override
protected String getMainClass() throws Exception {

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStreamTests.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.
@@ -112,7 +112,7 @@ class LazyDelegatingInputStreamTests {
assertThat(this.inputStream.count).isOne();
}
private class TestLazyDelegatingInputStream extends LazyDelegatingInputStream {
private final class TestLazyDelegatingInputStream extends LazyDelegatingInputStream {
private int count;

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/AssertFileChannelDataBlocksClosedExtension.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.
@@ -55,7 +55,7 @@ class AssertFileChannelDataBlocksClosedExtension implements BeforeEachCallback,
FileChannelDataBlock.tracker = null;
}
private static class OpenFilesTracker implements Tracker {
private static final class OpenFilesTracker implements Tracker {
private final Set<Path> paths = new LinkedHashSet<>();

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/start-stop/src/main/java/org/test/SampleApplication.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 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.
@@ -59,7 +59,7 @@ public class SampleApplication {
}
static class SpringApplicationAdmin implements SpringApplicationAdminMXBean {
static final class SpringApplicationAdmin implements SpringApplicationAdminMXBean {
private boolean ready;

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CommandLineBuilder.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.
@@ -120,7 +120,7 @@ final class CommandLineBuilder {
/**
* Format System properties.
*/
private static class SystemPropertyFormatter {
private static final class SystemPropertyFormatter {
static String format(String key, String value) {
if (key == null) {