Invoke the connector from the controller

Author: NirHershkovitz

src/main/kotlin/blog/codejunkie/demo/Connector.kt

@@ -1,7 +1,9 @@
 package blog.codejunkie.demo
 
+import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.client.WebClient
 
+@Component
 class IpApiConnector {
     private val client = WebClient.create("http://ip-api.com/json/")
 

src/main/kotlin/blog/codejunkie/demo/Controllers.kt

@@ -1,15 +1,13 @@
 package blog.codejunkie.demo
 
 import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class IspController {
+class IspController(val connector : IpApiConnector) {
 
     @GetMapping("/isp")
-    fun ispDetails() = mapOf(
-        "country" to "United States",
-        "isp" to "GoDaddy.com, LLC"
-    )
+    fun ispDetails(@RequestParam() host: String) = connector.invoke(host)
 
 }

src/main/kotlin/blog/codejunkie/demo/extra/RouterInsteadOfControllerExample.kt

@@ -0,0 +1,27 @@
+package blog.codejunkie.demo.extra
+
+import blog.codejunkie.demo.IpApiConnector
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.http.MediaType.ALL
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.web.reactive.function.server.ServerResponse.ok
+import org.springframework.web.reactive.function.server.body
+import org.springframework.web.reactive.function.server.router
+
+/**
+ * Present how to use the new functional routing instead of a controller
+ */
+@Configuration
+class RoutesExample(val connector : IpApiConnector) {
+
+    @Bean
+    fun router() = router {
+        (accept(ALL)).nest {
+                GET("/ispUsingRouter", {
+                    ok().
+                        contentType(APPLICATION_JSON).
+                        body(connector.invoke(it.queryParam("host").get()))})
+            }
+    }
+}

src/test/kotlin/blog/codejunkie/demo/E2eTests.kt

@@ -15,7 +15,7 @@ class SanityE2ETestsJavaStyle {
     @Test
     fun `isp details service passes sanity - Java`() {
         `when`().
-            get("/isp").
+            get("/isp?host=codejunkie.blog").
         then().
             statusCode(200)
     }
@@ -24,7 +24,7 @@ class SanityE2ETestsJavaStyle {
 class SanityE2ETestsPlain : StringSpec({
     "isp details service passes sanity - Plain" {
         `when`().
-            get("/isp").
+            get("/isp?host=codejunkie.blog").
         then().
             statusCode(200)
     }
@@ -34,7 +34,7 @@ class SanityE2ETests : StringSpec({
     "isp details service passes sanity - DSL" {
         given {
             on {
-                get("/isp") itHas {
+                get("/isp?host=codejunkie.blog") itHas {
                     statusCode(200)
                 }
             }

src/test/kotlin/blog/codejunkie/demo/IntegrationTests.kt

@@ -25,17 +25,29 @@ class IntegrationTests : StringSpec() {
     }
 
     init {
-        "isp controller passes integration" {
+        "codejunkie.blog return the correct details" {
             given {
                 on {
-                    get("/isp") itHas {
+                    get("/isp?host=codejunkie.blog") itHas {
                         statusCode(200)
                         body("country", CoreMatchers.equalTo("United States"))
                         body("isp", CoreMatchers.equalTo("GoDaddy.com, LLC"))
                     }
                 }
             }
         }
+
+        "google.com return the correct details" {
+            given {
+                on {
+                    get("/isp?host=google.com") itHas {
+                        statusCode(200)
+                        body("country", CoreMatchers.equalTo("United States"))
+                        body("isp", CoreMatchers.equalTo("Google"))
+                    }
+                }
+            }
+        }
     }
 }