From 348cc012841a1d94de530dcb2297b42cc659138c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 6 Dec 2022 12:50:36 -0500 Subject: [PATCH] Rename MultipartWebClientIntegrationTests classes to avoid duplicate names --- ...sts.java => MultipartHttpHandlerIntegrationTests.java} | 2 +- ....java => MultipartRouterFunctionIntegrationTests.java} | 2 +- ...Tests.java => MultipartWebClientIntegrationTests.java} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename spring-web/src/test/java/org/springframework/http/server/reactive/{MultipartIntegrationTests.java => MultipartHttpHandlerIntegrationTests.java} (98%) rename spring-webflux/src/test/java/org/springframework/web/reactive/function/{MultipartIntegrationTests.java => MultipartRouterFunctionIntegrationTests.java} (99%) rename spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/{MultipartIntegrationTests.java => MultipartWebClientIntegrationTests.java} (97%) diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartHttpHandlerIntegrationTests.java similarity index 98% rename from spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java rename to spring-web/src/test/java/org/springframework/http/server/reactive/MultipartHttpHandlerIntegrationTests.java index 5da11eb5416..d95841cd749 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartHttpHandlerIntegrationTests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.type; /** * @author Sebastien Deleuze */ -class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { +class MultipartHttpHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests { @Override protected HttpHandler createHttpHandler() { diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java similarity index 99% rename from spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java index 9a4608fba9e..42687fbe5b8 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java @@ -59,7 +59,7 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r /** * @author Sebastien Deleuze */ -class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests { +class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionIntegrationTests { private final WebClient webClient = WebClient.create(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java similarity index 97% rename from spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java index 82022e0b888..f8f9328a731 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java @@ -65,7 +65,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Undert import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeFalse; -class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { +class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationTests { private WebClient webClient; @@ -270,7 +270,7 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { @PostMapping("/requestBodyMap") Mono requestBodyMap(@RequestBody Mono> partsMono) { - return partsMono.map(MultipartIntegrationTests::partMapDescription); + return partsMono.map(MultipartWebClientIntegrationTests::partMapDescription); } @PostMapping("/requestBodyFlux") @@ -345,11 +345,11 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { } private static Mono partFluxDescription(Flux partsFlux) { - return partsFlux.collectList().map(MultipartIntegrationTests::partListDescription); + return partsFlux.collectList().map(MultipartWebClientIntegrationTests::partListDescription); } private static String partListDescription(List parts) { - return parts.stream().map(MultipartIntegrationTests::partDescription) + return parts.stream().map(MultipartWebClientIntegrationTests::partDescription) .collect(Collectors.joining(",", "[", "]")); }