spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-51577
This commit is contained in:
Andy Wilkinson
2026-09-04 10:07:51 +01:00
parent e2bcbdf0af c38c15b3b7
commit 682816229a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
+1 -1
View File
@@ -430,7 +430,7 @@ public final class PropertyMapper {
* @param consumer the consumer that should accept the value if it's not been * @param consumer the consumer that should accept the value if it's not been
* filtered * filtered
*/ */
public void to(Consumer<@Nullable ? super T> consumer) { public void to(Consumer<? super @Nullable T> consumer) {
Assert.notNull(consumer, "'consumer' must not be null"); Assert.notNull(consumer, "'consumer' must not be null");
T value = getValue(); T value = getValue();
if (value == null || test(value)) { if (value == null || test(value)) {
module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
+3 -3
View File
@@ -74,7 +74,7 @@ public class EntityManagerFactoryBuilder {
private @Nullable List<PersistenceUnitPostProcessor> persistenceUnitPostProcessors; private @Nullable List<PersistenceUnitPostProcessor> persistenceUnitPostProcessors;
private @Nullable Supplier<@Nullable ? extends RuntimeException> requireBootstrapExecutorExceptionSupplier; private @Nullable Supplier<? extends @Nullable RuntimeException> requireBootstrapExecutorExceptionSupplier;
/** /**
* Create a new instance passing in the common pieces that will be shared if multiple * Create a new instance passing in the common pieces that will be shared if multiple
@@ -186,7 +186,7 @@ public class EntityManagerFactoryBuilder {
* @param exceptionSupplier a supplier providing the exception to throw * @param exceptionSupplier a supplier providing the exception to throw
* @since 4.1.0 * @since 4.1.0
*/ */
public void requireBootstrapExecutor(Supplier<@Nullable ? extends RuntimeException> exceptionSupplier) { public void requireBootstrapExecutor(Supplier<? extends @Nullable RuntimeException> exceptionSupplier) {
Assert.notNull(exceptionSupplier, "'exceptionSupplier' must not be null"); Assert.notNull(exceptionSupplier, "'exceptionSupplier' must not be null");
this.requireBootstrapExecutorExceptionSupplier = exceptionSupplier; this.requireBootstrapExecutorExceptionSupplier = exceptionSupplier;
} }
@@ -368,7 +368,7 @@ public class EntityManagerFactoryBuilder {
return EntityManagerFactoryBuilder.this.bootstrapExecutor; return EntityManagerFactoryBuilder.this.bootstrapExecutor;
} }
if (EntityManagerFactoryBuilder.this.requireBootstrapExecutorExceptionSupplier != null) { if (EntityManagerFactoryBuilder.this.requireBootstrapExecutorExceptionSupplier != null) {
@Nullable AsyncTaskExecutor fallback = EntityManagerFactoryBuilder.this.fallbackBootstrapExecutor.get(); AsyncTaskExecutor fallback = EntityManagerFactoryBuilder.this.fallbackBootstrapExecutor.get();
if (fallback != null) { if (fallback != null) {
return fallback; return fallback;
} }
module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMapping.java
+1 -1
View File
@@ -416,7 +416,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
} }
private @Nullable Publisher<?> invoke(InvocationContext invocationContext) { private @Nullable Publisher<?> invoke(InvocationContext invocationContext) {
return (@Nullable Publisher<?>) this.invoker.invoke(invocationContext); return (Publisher<?>) this.invoker.invoke(invocationContext);
} }
private Map<String, Object> getArguments(ServerWebExchange exchange, @Nullable Map<String, String> body) { private Map<String, Object> getArguments(ServerWebExchange exchange, @Nullable Map<String, String> body) {