Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17701 from sdeleuze

Browse Source 
* pr/17701:
  Polish "Add WebFlux Coroutines smoke test"
  Polish "Add dependency management for Kotlin Coroutines"
  Add WebFlux Coroutines smoke test
  Add dependency management for Kotlin Coroutines

Closes gh-17701
This commit is contained in:
Stephane Nicoll
2019-07-31 10:01:16 +02:00
parent b444c3c545 78d2578c78
commit d9826759b9
6 changed files with 149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@@ -139,6 +139,7 @@
<junit-jupiter.version>5.5.1</junit-jupiter.version>
<kafka.version>2.3.0</kafka.version>
<kotlin.version>1.3.41</kotlin.version>
<kotlin-coroutines.version>1.3.0-RC</kotlin-coroutines.version>
<lettuce.version>5.1.8.RELEASE</lettuce.version>
<liquibase.version>3.7.0</liquibase.version>
<log4j2.version>2.12.0</log4j2.version>
@@ -2595,6 +2596,13 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-bom</artifactId>
<version>${kotlin-coroutines.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>

1
spring-boot-tests/spring-boot-smoke-tests/pom.xml
View File

@@ -98,6 +98,7 @@
<module>spring-boot-smoke-test-web-static</module>
<module>spring-boot-smoke-test-web-ui</module>
<module>spring-boot-smoke-test-webflux</module>
<module>spring-boot-smoke-test-webflux-coroutines</module>
<module>spring-boot-smoke-test-websocket-jetty</module>
<module>spring-boot-smoke-test-websocket-tomcat</module>
<module>spring-boot-smoke-test-websocket-undertow</module>

78
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/pom.xml Normal file
View File

@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-smoke-tests</artifactId>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-smoke-test-webflux-coroutines</artifactId>
<name>Spring Boot WebFlux Coroutines Smoke Test</name>
<description>Spring Boot WebFlux Coroutines Smoke Test</description>
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
</properties>
<dependencies>
<!-- Compile -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-reactor</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins>
<plugin>spring</plugin>
</compilerPlugins>
</configuration>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-allopen</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

25
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/src/main/kotlin/smoketest/coroutines/CoroutinesController.kt Normal file
View File

@@ -0,0 +1,25 @@
package smoketest.coroutines
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.flow
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RestController
@RestController
class CoroutinesController {
@GetMapping("/suspending")
suspend fun suspendingFunction(): String {
delay(10)
return "Hello World"
}
@GetMapping("/flow")
fun flow() = flow {
delay(10)
emit("Hello ")
delay(10)
emit("World")
}
}

11
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/src/main/kotlin/smoketest/coroutines/SampleCoroutinesApplication.kt Normal file
View File

@@ -0,0 +1,11 @@
package smoketest.coroutines
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication
@SpringBootApplication
class SampleCoroutinesApplication
fun main(args: Array<String>) {
runApplication<SampleCoroutinesApplication>(*args)
}

26
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/src/test/kotlin/smoketest/coroutines/CoroutinesControllerTests.kt Normal file
View File

@@ -0,0 +1,26 @@
package smoketest.coroutines
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.context.SpringBootTest.*
import org.springframework.http.MediaType
import org.springframework.test.web.reactive.server.WebTestClient
import org.springframework.test.web.reactive.server.expectBody
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
class CoroutinesControllerTests(@Autowired private val webClient: WebTestClient) {
@Test
fun testSuspendingFunction() {
webClient.get().uri("/suspending").accept(MediaType.TEXT_PLAIN).exchange()
.expectBody<String>().isEqualTo("Hello World")
}
@Test
fun testFlow() {
webClient.get().uri("/flow").accept(MediaType.TEXT_PLAIN).exchange()
.expectBody<String>().isEqualTo("Hello World")
}
}