root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x 

Closes gh-42417
This commit is contained in:
Phillip Webb 2024-09-22 17:49:02 -07:00
parent c81913b76d 0781e71e5e
commit 593862b082
8 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/boot/build/bom/CheckLinks.java
View File

@ -64,8 +64,8 @@ public abstract class CheckLinks extends DefaultTask {
try {
uri = new URI(link);
ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.HEAD, null, String.class);
System.out.println("[%3d] %s - %s (%s)".formatted(response.getStatusCode().value(),
library.getName(), name, uri));
System.out.printf("[%3d] %s - %s (%s)%n", response.getStatusCode().value(), library.getName(), name,
uri);
}
catch (URISyntaxException ex) {
throw new RuntimeException(ex);

3
buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java
View File

@ -98,7 +98,7 @@ public class DockerTestPlugin implements Plugin<Project> {
private Provider<Test> createTestTask(Project project, SourceSet dockerTestSourceSet,
Provider<DockerTestBuildService> buildService) {
Provider<Test> dockerTest = project.getTasks().register(DOCKER_TEST_TASK_NAME, Test.class, (task) -> {
return project.getTasks().register(DOCKER_TEST_TASK_NAME, Test.class, (task) -> {
task.usesService(buildService);
task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
task.setDescription("Runs Docker-based tests.");
@ -106,7 +106,6 @@ public class DockerTestPlugin implements Plugin<Project> {
task.setClasspath(dockerTestSourceSet.getRuntimeClasspath());
task.shouldRunAfter(JavaPlugin.TEST_TASK_NAME);
});
return dockerTest;
}
}

3
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntriesStream.java
View File

@ -54,9 +54,6 @@ class JarEntriesStream implements Closeable {
JarEntry getNextEntry() throws IOException {
this.entry = this.in.getNextJarEntry();
if (this.entry != null) {
this.entry.getSize();
}
this.inflater.reset();
return this.entry;
}

12
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.java
View File

@ -211,9 +211,9 @@ final class JarUrlConnection extends java.net.JarURLConnection {
}
@Override
public void setAllowUserInteraction(boolean allowuserinteraction) {
public void setAllowUserInteraction(boolean allowUserInteraction) {
if (this.jarFileConnection != null) {
this.jarFileConnection.setAllowUserInteraction(allowuserinteraction);
this.jarFileConnection.setAllowUserInteraction(allowUserInteraction);
}
}
@ -223,9 +223,9 @@ final class JarUrlConnection extends java.net.JarURLConnection {
}
@Override
public void setUseCaches(boolean usecaches) {
public void setUseCaches(boolean useCaches) {
if (this.jarFileConnection != null) {
this.jarFileConnection.setUseCaches(usecaches);
this.jarFileConnection.setUseCaches(useCaches);
}
}
@ -235,9 +235,9 @@ final class JarUrlConnection extends java.net.JarURLConnection {
}
@Override
public void setDefaultUseCaches(boolean defaultusecaches) {
public void setDefaultUseCaches(boolean defaultUseCaches) {
if (this.jarFileConnection != null) {
this.jarFileConnection.setDefaultUseCaches(defaultusecaches);
this.jarFileConnection.setDefaultUseCaches(defaultUseCaches);
}
}

6
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStream.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,9 +64,9 @@ abstract class LazyDelegatingInputStream extends InputStream {
}
@Override
public synchronized void mark(int readlimit) {
public synchronized void mark(int readLimit) {
try {
in().mark(readlimit);
in().mark(readLimit);
}
catch (IOException ex) {
// Ignore

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java
View File

@ -98,13 +98,11 @@ class NestedFileSystem extends FileSystem {
private boolean isCreatingNewFileSystem() {
StackTraceElement[] stack = Thread.currentThread().getStackTrace();
if (stack != null) {
for (StackTraceElement element : stack) {
if (FILE_SYSTEMS_CLASS_NAME.equals(element.getClassName())) {
return "newFileSystem".equals(element.getMethodName());
}
}
}
return false;
}

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystemProvider.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.
@ -50,7 +50,7 @@ import org.springframework.boot.loader.net.protocol.nested.NestedLocation;
*/
public class NestedFileSystemProvider extends FileSystemProvider {
private Map<Path, NestedFileSystem> fileSystems = new HashMap<>();
private final Map<Path, NestedFileSystem> fileSystems = new HashMap<>();
@Override
public String getScheme() {

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/UriPathEncoder.java
View File

@ -28,7 +28,7 @@ final class UriPathEncoder {
// Based on org.springframework.web.util.UriUtils
private static char[] ALLOWED = "/:@-._~!$&\'()*+,;=".toCharArray();
private static final char[] ALLOWED = "/:@-._~!$&\'()*+,;=".toCharArray();
private UriPathEncoder() {
}