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

Merge branch '3.4.x'

This commit is contained in:
Phillip Webb 2025-03-14 15:15:33 -07:00
parent f21304e5cf 6eb7d3411b
commit a55a6be4ed
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckFactoriesFile.java
View File

@ -96,31 +96,17 @@ public abstract class CheckFactoriesFile extends DefaultTask {
}
private void check(File factoriesFile) {
Properties factories = load(factoriesFile);
Properties properties = load(factoriesFile);
Map<String, List<String>> problems = new LinkedHashMap<>();
for (String key : factories.stringPropertyNames()) {
List<String> values = Arrays
.asList(StringUtils.commaDelimitedListToStringArray(factories.getProperty(key)));
for (String value : values) {
boolean found = find(value);
if (!found) {
List<String> problemsForKey = problems.computeIfAbsent(key, (k) -> new ArrayList<>());
String binaryName = binaryNameOf(value);
found = find(binaryName);
if (found) {
problemsForKey
.add("'%s' should be listed using its binary name '%s'".formatted(value, binaryName));
}
else {
problemsForKey.add("'%s' was not found".formatted(value));
}
}
}
List<String> sortedValues = new ArrayList<>(values);
for (String name : properties.stringPropertyNames()) {
String value = properties.getProperty(name);
List<String> classNames = Arrays.asList(StringUtils.commaDelimitedListToStringArray(value));
collectProblems(problems, name, classNames);
List<String> sortedValues = new ArrayList<>(classNames);
Collections.sort(sortedValues);
if (!sortedValues.equals(values)) {
List<String> problemsForKey = problems.computeIfAbsent(key, (k) -> new ArrayList<>());
problemsForKey.add("Entries should be sorted alphabetically");
if (!sortedValues.equals(classNames)) {
List<String> problemsForClassName = problems.computeIfAbsent(name, (k) -> new ArrayList<>());
problemsForClassName.add("Entries should be sorted alphabetically");
}
}
File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
@ -130,6 +116,21 @@ public abstract class CheckFactoriesFile extends DefaultTask {
}
}
private void collectProblems(Map<String, List<String>> problems, String key, List<String> classNames) {
for (String className : classNames) {
if (!find(className)) {
addNoFoundProblem(className, problems.computeIfAbsent(key, (k) -> new ArrayList<>()));
}
}
}
private void addNoFoundProblem(String className, List<String> problemsForClassName) {
String binaryName = binaryNameOf(className);
boolean foundBinaryForm = find(binaryName);
problemsForClassName.add(!foundBinaryForm ? "'%s' was not found".formatted(className)
: "'%s' should be listed using its binary name '%s'".formatted(className, binaryName));
}
private boolean find(String className) {
for (File root : this.classpath.getFiles()) {
String classFilePath = className.replace(".", "/") + ".class";

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

@ -179,10 +179,7 @@ abstract class HttpClientTransport implements HttpTransport {
return null;
}
try (InputStream stream = entity.getContent()) {
if (stream == null) {
return null;
}
return stream.readAllBytes();
return (stream != null) ? stream.readAllBytes() : null;
}
}