clean codes.

anyuruf · Oct 24, 2018 · dc0c864 · dc0c864
1 parent bbd11df
commit dc0c864
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/kotlin-dsl/pom.xml b/kotlin-dsl/pom.xml
@@ -23,7 +23,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<kotlin.version>1.1.61</kotlin.version>
+		<kotlin.version>1.2.41</kotlin.version>
 	</properties>
 
 	<dependencies>

diff --git a/kotlin-dsl/src/main/kotlin/com/example/demo/Application.kt b/kotlin-dsl/src/main/kotlin/com/example/demo/Application.kt
@@ -4,37 +4,38 @@ import org.springframework.context.support.GenericApplicationContext
 import org.springframework.http.server.reactive.HttpHandler
 import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder
-import reactor.ipc.netty.http.server.HttpServer
-import reactor.ipc.netty.tcp.BlockingNettyContext
+import reactor.netty.DisposableServer
+import reactor.netty.http.server.HttpServer
+
 
 class Application {
 
     private val httpHandler: HttpHandler
 
     private val server: HttpServer
 
-    private var nettyContext: BlockingNettyContext? = null
+    private var nettyContext: DisposableServer? = null
 
     constructor(port: Int = 8080) {
         val context = GenericApplicationContext()
         beans().initialize(context)
         context.refresh()
         context.getBean(DataInitializr::class.java).initData()
-        server = HttpServer.create(port)
+        server = HttpServer.create().host("localhost").port(port)
         httpHandler = WebHttpHandlerBuilder.applicationContext(context)
                 .build()
     }
 
     fun start() {
-        nettyContext = server.start(ReactorHttpHandlerAdapter(httpHandler))
+        nettyContext = server.handle(ReactorHttpHandlerAdapter(httpHandler)).bindNow()
     }
 
     fun startAndAwait() {
-        server.startAndAwait(ReactorHttpHandlerAdapter(httpHandler), { nettyContext = it })
+        server.handle(ReactorHttpHandlerAdapter(httpHandler)).bindNow().onDispose().block()
     }
 
     fun stop() {
-        nettyContext?.shutdown()
+        nettyContext?.disposeNow()
     }
 }
 

diff --git a/kotlin-routes/src/main/kotlin/com/example/demo/Application.kt b/kotlin-routes/src/main/kotlin/com/example/demo/Application.kt
@@ -5,8 +5,8 @@ import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.*
 import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder
-import reactor.ipc.netty.NettyContext
-import reactor.ipc.netty.http.server.HttpServer
+import reactor.netty.DisposableServer
+import reactor.netty.http.server.HttpServer
 
 @Configuration
 @ComponentScan
@@ -18,11 +18,11 @@ class Application {
 
     @Profile("default")
     @Bean
-    fun nettyContext(context: ApplicationContext): NettyContext {
+    fun nettyHttpServer(context: ApplicationContext): DisposableServer {
         val handler = WebHttpHandlerBuilder.applicationContext(context).build()
         val adapter = ReactorHttpHandlerAdapter(handler)
-        val httpServer = HttpServer.create("localhost", this.port)
-        return httpServer.newHandler(adapter).block()
+        val httpServer = HttpServer.create().host("localhost").port(this.port)
+        return httpServer.handle(adapter).bindNow()
     }
 }
 
@@ -31,6 +31,6 @@ fun main(args: Array<String>) {
     AnnotationConfigApplicationContext {
         register(Application::class.java)
         refresh()
-        getBean(NettyContext::class.java).onClose().block()
+        getBean(DisposableServer::class.java).onDispose().block()
     }
 }
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -23,7 +23,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<kotlin.version>1.1.61</kotlin.version>
+		<kotlin.version>1.2.41</kotlin.version>
 	</properties>
 
 	<dependencies>

diff --git a/kotlin/src/main/kotlin/com/example/demo/Application.kt b/kotlin/src/main/kotlin/com/example/demo/Application.kt
@@ -5,8 +5,8 @@ import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.*
 import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder
-import reactor.ipc.netty.NettyContext
-import reactor.ipc.netty.http.server.HttpServer
+import reactor.netty.DisposableServer
+import reactor.netty.http.server.HttpServer
 
 @Configuration
 @ComponentScan
@@ -18,11 +18,11 @@ class Application {
 
     @Profile("default")
     @Bean
-    fun nettyContext(context: ApplicationContext): NettyContext {
+    fun nettyHttpServer(context: ApplicationContext): DisposableServer {
         val handler = WebHttpHandlerBuilder.applicationContext(context).build()
         val adapter = ReactorHttpHandlerAdapter(handler)
-        val httpServer = HttpServer.create("localhost", this.port)
-        return httpServer.newHandler(adapter).block()
+        val httpServer = HttpServer.create().host("localhost").port(this.port)
+        return httpServer.handle(adapter).bindNow()
     }
 }
 
@@ -31,6 +31,6 @@ fun main(args: Array<String>) {
     AnnotationConfigApplicationContext {
         register(Application::class.java)
         refresh()
-        getBean(NettyContext::class.java).onClose().block()
+        getBean(DisposableServer::class.java).onDispose().block()
     }
 }
diff --git a/kotlin/src/test/kotlin/com/example/demo/ApplicationTests.kt b/kotlin/src/test/kotlin/com/example/demo/ApplicationTests.kt
@@ -15,14 +15,14 @@ import reactor.test.test
 @ContextConfiguration(classes = arrayOf(Application::class))
 class ApplicationTests {
 
-    @Value("#{@nettyContext.address().getPort()}")
+    @Value("#{@nettyHttpServer.port()}")
     var port = 8080
 
     lateinit var client: WebClient
 
     @Before
     fun setup() {
-        client = WebClient.create("http://localhost:8080")
+        client = WebClient.create("http://localhost:" + this.port)
     }
 
     @Test