From f29ebcd74ca89a87f346b25dce28f13a38368aac Mon Sep 17 00:00:00 2001
From: marius <marius@because-security.com>
Date: Sat, 18 Apr 2020 21:35:05 +0200
Subject: [PATCH] removed HTML template from REST controller

---
 .../chuckjokes/controllers/JokeController.kt  |  7 ++----
 .../controllers/JokesRestController.kt        | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/main/kotlin/com/becausesec/chuckjokes/controllers/JokesRestController.kt

diff --git a/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokeController.kt b/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokeController.kt
index eaa78d2..486f12c 100644
--- a/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokeController.kt
+++ b/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokeController.kt
@@ -15,17 +15,14 @@ class JokeController {
 
     @Autowired
     lateinit var jokeService: JokeService
+
     @RequestMapping(value=["/", ""], method = [RequestMethod.GET])
     fun showJoke(model : Model) : String {
         model.addAttribute("joke", jokeService.joke)
         return "chucknorris"
     }
 
-    @GetMapping(value=["/joke", ""], produces = [MediaType.APPLICATION_JSON_VALUE])
-    fun showJokeJSON(model : Model) : String {
-        model.addAttribute("joke", jokeService.jokeJSON)
-        return "chucknorris"
-    }
+
 
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokesRestController.kt b/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokesRestController.kt
new file mode 100644
index 0000000..c5df1a8
--- /dev/null
+++ b/src/main/kotlin/com/becausesec/chuckjokes/controllers/JokesRestController.kt
@@ -0,0 +1,24 @@
+package com.becausesec.chuckjokes.controllers
+
+import com.becausesec.chuckjokes.services.JokeService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.MediaType
+import org.springframework.ui.Model
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.ResponseBody
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class JokesRestController {
+
+    @Autowired
+    lateinit var jokeService: JokeService
+
+    @GetMapping(value=["/joke", ""], produces = [MediaType.APPLICATION_JSON_VALUE])
+    @ResponseBody
+    fun showJokeJSON(model : Model) : String {
+        return jokeService.jokeJSON
+    }
+
+
+}
\ No newline at end of file