From 6531423519086b19f6234742a9cdac17079ee762 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 23 May 2017 16:40:13 -0700 Subject: [PATCH] Fix following upstream API change Update implementations of `WebFluxConfigurer` to no longer return an `Optional` validator. --- .../web/reactive/WebFluxAutoConfigurationTests.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 9adfc943839..36326a1fdc8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.web.reactive; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import javax.validation.ValidatorFactory; @@ -359,8 +358,8 @@ public class WebFluxAutoConfigurationTests { private final Validator validator = mock(Validator.class); @Override - public Optional getValidator() { - return Optional.of(this.validator); + public Validator getValidator() { + return this.validator; } } @@ -371,8 +370,8 @@ public class WebFluxAutoConfigurationTests { private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); @Override - public Optional getValidator() { - return Optional.of(this.validator); + public Validator getValidator() { + return this.validator; } }