Fix webflux

nk2IsHere · Aug 22, 2023 · d0d0be0 · d0d0be0
1 parent 5e8af73
commit d0d0be0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/kofu-templating-thymeleaf/build.gradle.kts b/kofu-templating-thymeleaf/build.gradle.kts
@@ -9,14 +9,12 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     implementation(project(":kofu"))
-    implementation(project(":kofu-webflux"))
-    implementation(project(":kofu-webmvc"))
-    implementation(project(":autoconfigure-adapter-web-reactive"))
-    implementation(project(":autoconfigure-adapter-web-servlet"))
     implementation(project(":autoconfigure-adapter-thymeleaf"))
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
+    implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
+
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.springframework:spring-test")
     testImplementation("io.projectreactor:reactor-test")

diff --git a/...mplating-thymeleaf/src/main/kotlin/org/springframework/fu/kofu/templating/ThymeleafDsl.kt b/...mplating-thymeleaf/src/main/kotlin/org/springframework/fu/kofu/templating/ThymeleafDsl.kt
@@ -22,8 +22,6 @@ import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafReactiveWebInit
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafServletWebInitializer
 import org.springframework.context.support.GenericApplicationContext
 import org.springframework.fu.kofu.AbstractDsl
-import org.springframework.fu.kofu.webflux.WebFluxServerDsl
-import org.springframework.fu.kofu.webmvc.WebMvcServerDsl
 
 /**
  * Kofu DSL for Thymeleaf template engine.

diff --git a/kofu-webflux/build.gradle.kts b/kofu-webflux/build.gradle.kts
@@ -34,4 +34,6 @@ dependencies {
 
     testImplementation(project(":kofu-templating-mustache"))
     testImplementation(project(":kofu-templating-thymeleaf"))
+
+    testImplementation("org.springframework.boot:spring-boot-starter-jetty")
 }
diff --git a/kofu-webflux/src/test/kotlin/org/springframework/fu/kofu/webflux/ThymeleafDslTests.kt b/kofu-webflux/src/test/kotlin/org/springframework/fu/kofu/webflux/ThymeleafDslTests.kt
@@ -29,7 +29,7 @@ import org.springframework.test.web.reactive.server.expectBody
 class ThymeleafDslTests {
 
     @Test
-    fun `Create and request a Mustache view`() {
+    fun `Create and request a Thymeleaf view`() {
         val app = reactiveWebApplication {
             webFlux {
                 port = 0

diff --git a/kofu-webflux/src/test/kotlin/org/springframework/fu/kofu/webflux/WebFluxServerDslTests.kt b/kofu-webflux/src/test/kotlin/org/springframework/fu/kofu/webflux/WebFluxServerDslTests.kt
@@ -90,7 +90,7 @@ class WebFluxServerDslTests {
 			webFlux {
 				port = 0
 				router {
-					engine = tomcat()
+					engine = jetty()
 					GET("/foo") { noContent().build() }
 				}
 			}