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

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<>();