diff --git a/src/main/kotlin/de/thk/gm/gdw/todolist/controllers/UsersController.kt b/src/main/kotlin/de/thk/gm/gdw/todolist/controllers/UsersController.kt index ecc33ee4dd09d4a3665596e42d76ab31a221be36..160859f0e99c186edc981679cdb3506db7294953 100644 --- a/src/main/kotlin/de/thk/gm/gdw/todolist/controllers/UsersController.kt +++ b/src/main/kotlin/de/thk/gm/gdw/todolist/controllers/UsersController.kt @@ -1,6 +1,5 @@ package de.thk.gm.gdw.todolist.controllers -import de.thk.gm.gdw.todolist.services.WeatherService import org.springframework.http.MediaType import org.springframework.stereotype.Controller import org.springframework.ui.Model @@ -10,12 +9,11 @@ import org.springframework.web.bind.annotation.RequestMapping @Controller @RequestMapping(produces = [MediaType.TEXT_HTML_VALUE]) -class UsersController (private val usersRestController: UsersRestController, private val weatherService: WeatherService) { +class UsersController (private val usersRestController: UsersRestController) { @GetMapping("/") fun showUsers(model: Model): String { val users = usersRestController.getUsers() model.addAttribute("users", users) - model.addAttribute("temperature", weatherService.getCurrentWeather()) return "users/showUsers" } diff --git a/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherService.kt b/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherService.kt deleted file mode 100644 index 1e08388135a63adaf7e0babd20de6adf7209a5bf..0000000000000000000000000000000000000000 --- a/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherService.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.thk.gm.gdw.todolist.services - -interface WeatherService { - fun getCurrentWeather() : Float -} \ No newline at end of file diff --git a/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherServiceImpl.kt b/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherServiceImpl.kt deleted file mode 100644 index 2763798d5bfc2931840eb83ead03f1905c33fff6..0000000000000000000000000000000000000000 --- a/src/main/kotlin/de/thk/gm/gdw/todolist/services/WeatherServiceImpl.kt +++ /dev/null @@ -1,20 +0,0 @@ -package de.thk.gm.gdw.todolist.services - -import org.json.JSONObject -import org.springframework.stereotype.Service -import java.net.URI -import java.net.http.HttpClient -import java.net.http.HttpRequest -import java.net.http.HttpResponse - -@Service -class WeatherServiceImpl : WeatherService { - override fun getCurrentWeather() : Float { - val client = HttpClient.newBuilder().build(); - val request = HttpRequest.newBuilder().GET().uri(URI.create("https://api.open-meteo.com/v1/forecast?latitude=51.0261&longitude=7.5647¤t=temperature_2m,rain")).build() - val response = client.send(request, HttpResponse.BodyHandlers.ofString()) - val json = JSONObject(response.body()) - return json.getJSONObject("current").getFloat("temperature_2m") - - } -} \ No newline at end of file