Skip to content

Commit 3bbf3c7

Browse files
committed
Merge branch '3.5.x' into 4.0.x
Closes gh-49026
2 parents bc3dce6 + f09dfd9 commit 3bbf3c7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected AutoConfigurations(Collection<Class<?>> classes) {
5858
private static UnaryOperator<Collection<Class<?>>> sorter(UnaryOperator<String> replacementMapper) {
5959
AutoConfigurationSorter sorter = new AutoConfigurationSorter(metadataReaderFactory, null, replacementMapper);
6060
return (classes) -> {
61-
List<String> names = classes.stream().map(Class::getName).map(replacementMapper::apply).toList();
61+
List<String> names = classes.stream().map(Class::getName).map(replacementMapper).toList();
6262
List<String> sorted = sorter.getInPriorityOrder(names);
6363
return sorted.stream()
6464
.map((className) -> ClassUtils.resolveClassName(className, null))

core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootPropertySource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SpringBootPropertySource implements PropertySource {
4040

4141
@Override
4242
public void forEach(BiConsumer<String, String> action) {
43-
this.properties.forEach(action::accept);
43+
this.properties.forEach(action);
4444
}
4545

4646
@Override

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/PrometheusPushGatewayManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static class PushGatewayTaskScheduler extends ThreadPoolTaskScheduler {
160160

161161
@Override
162162
public ScheduledExecutorService getScheduledExecutor() throws IllegalStateException {
163-
return Executors.newSingleThreadScheduledExecutor(this::newThread);
163+
return Executors.newSingleThreadScheduledExecutor(this);
164164
}
165165

166166
}

0 commit comments

Comments
 (0)