X-Git-Url: https://juplo.de/gitweb/?p=demos%2Ftesting;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fdemo%2FRemoteContentController.java;h=00b0b96e0789f7400332cb6d59844863fa123deb;hp=fa0e49afd403fa66cc0c3ab4b5c6cfaa4671eef3;hb=7691a163511ebad7203eb96d3047d5abc1f815c5;hpb=323e1b0a1df5f61e7b6f9ee6f923a186f70772de

diff --git a/src/main/java/de/juplo/demo/RemoteContentController.java b/src/main/java/de/juplo/demo/RemoteContentController.java
index fa0e49a..00b0b96 100644
--- a/src/main/java/de/juplo/demo/RemoteContentController.java
+++ b/src/main/java/de/juplo/demo/RemoteContentController.java
@@ -1,41 +1,26 @@
 package de.juplo.demo;
 
-
-<<<<<<< HEAD:src/main/java/de/juplo/demo/RemoteContentController.java
-=======
->>>>>>> f9152f7... WIP: Implemented...:src/main/java/de/juplo/integrationtest/RemoteContentController.java
-import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
 
 
 /**
  * Fetches data from remote-webserver and renders them as HTML.
  * @author Kai Moritz
  */
+@RestController
 public class RemoteContentController
 {
-  WebClient webClient;
-
-
-  public RemoteContentController(WebClient webClient)
-  {
-    this.webClient = webClient;
-  }
+  @Autowired
+  RemoteContentService service;
 
 
   @GetMapping("/")
-  public String renderRemoteText(Model model, @RequestParam String path)
+  public Mono<String> renderRemoteText(@RequestParam String path)
   {
-    model.addAttribute(
-        "text",
-        webClient
-            .get()
-            .uri(path)
-            .retrieve()
-            .bodyToMono(String.class).block());
-
-    return "layout";
+    return service.getRemoteText(path);
   }
 }