spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-01 14:59:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-51885
This commit is contained in:
Stéphane Nicoll
2026-09-28 11:07:19 +02:00
parent 9bf8d3ca90 dda41fef36
commit 593344ccc1
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class DockerApi {
* Create a new {@link DockerApi} instance.
*/
public DockerApi() {
this(HttpTransport.create((DockerConnectionConfiguration) null), DockerLog.toSystemOut());
this(HttpTransport.create(null), DockerLog.toSystemOut());
}
/**
core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java
+1 -2
View File
@@ -178,8 +178,7 @@ public class Binder {
@Nullable Consumer<PropertyEditorRegistry> propertyEditorInitializer,
@Nullable BindHandler defaultBindHandler, @Nullable BindConstructorProvider constructorProvider) {
this(sources, placeholdersResolver,
(conversionService != null) ? Collections.singletonList(conversionService)
: (List<ConversionService>) null,
(conversionService != null) ? Collections.singletonList(conversionService) : null,
propertyEditorInitializer, defaultBindHandler, constructorProvider);
}
core/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
+1 -1
View File
@@ -349,7 +349,7 @@ public class ApplicationConversionService extends FormattingConversionService {
static void addBean(FormatterRegistry registry, Object bean, @Nullable ResolvableType beanType) {
if (bean instanceof GenericConverter converterBean) {
addBean(registry, converterBean, beanType, GenericConverter.class, registry::addConverter, (Runnable) null);
addBean(registry, converterBean, beanType, GenericConverter.class, registry::addConverter, null);
}
else if (bean instanceof Converter<?, ?> converterBean) {
Assert.state(beanType != null, "beanType is missing");
module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/MaximumAllowableTagsMeterFilter.java
+1 -1
View File
@@ -63,7 +63,7 @@ public final class MaximumAllowableTagsMeterFilter implements MeterFilter {
* @param maximumTagValues the total number of tag values that are allowable
*/
public MaximumAllowableTagsMeterFilter(String meterNamePrefix, String tagKey, int maximumTagValues) {
this(meterNamePrefix, tagKey, maximumTagValues, (String) null);
this(meterNamePrefix, tagKey, maximumTagValues, null);
}
/**