From d03517e035801b883bc589acfad8188c88c3d060 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 19 Sep 2018 13:00:50 +0200 Subject: [PATCH] Polish "Add support for webflux in spring-cloud-function" Closes gh-733 --- .../SpringCloudFunctionRequestPostProcessor.java | 4 ++-- .../SpringCloudFunctionRequestPostProcessorTests.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessor.java index dc4779c3..f62ca75c 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessor.java @@ -42,7 +42,7 @@ class SpringCloudFunctionRequestPostProcessor static final Dependency WEB_ADAPTER = Dependency.withId("cloud-function-web", "org.springframework.cloud", "spring-cloud-function-web"); - static final Version BOOT_21 = Version.parse("2.1.0.x"); + static final Version VERSION_2_1_0_M1 = Version.parse("2.1.0.M1"); @Override public void postProcessAfterResolution(ProjectRequest request, @@ -58,7 +58,7 @@ class SpringCloudFunctionRequestPostProcessor swap.add(WEB_ADAPTER); } if (hasDependency(request, "webflux") - && Version.parse(request.getBootVersion()).compareTo(BOOT_21) >= 0) { + && isSpringBootVersionAtLeastAfter(request, VERSION_2_1_0_M1)) { swap.add(WEB_ADAPTER); } if (!swap.isEmpty()) { diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessorTests.java index 8fd51cc4..0fd00a39 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudFunctionRequestPostProcessorTests.java @@ -71,4 +71,12 @@ public class SpringCloudFunctionRequestPostProcessorTests .hasDependenciesCount(4); } + @Test + public void webfluxNotAvailableIn20() { + ProjectRequest request = createProjectRequest("webflux", "cloud-function"); + request.setBootVersion("2.0.5.RELEASE"); + generateMavenPom(request).hasDependency(getDependency("webflux")) + .hasDependency(getDependency("cloud-function")).hasDependenciesCount(4); + } + }