Merge pull request #1981 from eugenp/spring-boot-kotlin
BAEL-755 - moving kotlin code to spring-5-mvc
This commit is contained in:
commit
494a9c1af1
|
@ -15,7 +15,8 @@
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>2.0.0.M1</version>
|
<version>2.0.0.M1</version>
|
||||||
<relativePath /> <!-- lookup parent from repository -->
|
<relativePath/>
|
||||||
|
<!-- lookup parent from repository -->
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -51,6 +52,23 @@
|
||||||
<artifactId>jcl-over-slf4j</artifactId>
|
<artifactId>jcl-over-slf4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!--kotlin deps-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-stdlib-jre8</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-reflect</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
|
<artifactId>jackson-module-kotlin</artifactId>
|
||||||
|
<version>2.8.7</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- runtime and test scoped -->
|
<!-- runtime and test scoped -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -90,7 +108,47 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
|
||||||
|
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>kotlin-maven-plugin</artifactId>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<compilerPlugins>
|
||||||
|
<plugin>spring</plugin>
|
||||||
|
</compilerPlugins>
|
||||||
|
<jvmTarget>1.8</jvmTarget>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>compile</id>
|
||||||
|
<phase>compile</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>compile</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>test-compile</id>
|
||||||
|
<phase>test-compile</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>test-compile</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-maven-allopen</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
@ -149,6 +207,7 @@
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
|
<kotlin.version>1.1.2</kotlin.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
package com.baeldung.springbootkotlin
|
||||||
|
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
import org.springframework.web.bind.annotation.RestController
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
class HelloController(val helloService: HelloService) {
|
||||||
|
|
||||||
|
@GetMapping("/hello")
|
||||||
|
fun helloKotlin(): String {
|
||||||
|
return "hello world"
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/hello-service")
|
||||||
|
fun helloKotlinService(): String {
|
||||||
|
return helloService.getHello()
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/hello-dto")
|
||||||
|
fun helloDto(): HelloDto {
|
||||||
|
return HelloDto("Hello from the dto")
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
package com.baeldung.springbootkotlin
|
||||||
|
|
||||||
|
data class HelloDto(val greeting: String)
|
|
@ -0,0 +1,11 @@
|
||||||
|
package com.baeldung.springbootkotlin
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class HelloService {
|
||||||
|
|
||||||
|
fun getHello(): String {
|
||||||
|
return "hello service"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
package com.baeldung.springbootkotlin
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
class KotlinDemoApplication
|
||||||
|
|
||||||
|
fun main(args: Array<String>) {
|
||||||
|
SpringApplication.run(KotlinDemoApplication::class.java, *args)
|
||||||
|
}
|
|
@ -0,0 +1,53 @@
|
||||||
|
package springbootkotlin
|
||||||
|
|
||||||
|
import com.baeldung.springbootkotlin.HelloDto
|
||||||
|
import com.baeldung.springbootkotlin.KotlinDemoApplication
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNotNull
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest
|
||||||
|
import org.springframework.boot.test.web.client.TestRestTemplate
|
||||||
|
import org.springframework.http.HttpStatus
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner
|
||||||
|
|
||||||
|
@RunWith(SpringRunner::class)
|
||||||
|
@SpringBootTest(classes = arrayOf(KotlinDemoApplication::class), webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||||
|
class KotlinDemoApplicationIntegrationTest {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
val testRestTemplate: TestRestTemplate? = null
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun contextLoads() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testHelloController() {
|
||||||
|
val result = testRestTemplate?.getForEntity("/hello", String::class.java)
|
||||||
|
|
||||||
|
assertNotNull(result)
|
||||||
|
assertEquals(result?.statusCode, HttpStatus.OK)
|
||||||
|
assertEquals(result?.body, "hello world")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testHelloService() {
|
||||||
|
val result = testRestTemplate?.getForEntity("/hello-service", String::class.java)
|
||||||
|
|
||||||
|
assertNotNull(result)
|
||||||
|
assertEquals(result?.statusCode, HttpStatus.OK)
|
||||||
|
assertEquals(result?.body, "hello service")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testHelloDto() {
|
||||||
|
val result = testRestTemplate?.getForEntity("/hello-dto", HelloDto::class.java)
|
||||||
|
|
||||||
|
assertNotNull(result)
|
||||||
|
assertEquals(result?.statusCode, HttpStatus.OK)
|
||||||
|
assertEquals(result?.body, HelloDto("Hello from the dto"))
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue