X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=6c7cff7de38056ea93f7804f9da26499a72fb3cc;hb=7107fd0b4795d95b6c7f49cf4e765b82c16d016e;hp=e2fe714b295c490ed65386a6187d1078c0284f5a;hpb=5ccc024e1695ef38409f211c65114b2cf7e4e12c;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
index e2fe714b..6c7cff7d 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
@@ -1,30 +1,45 @@
 package de.juplo.kafka.chat.backend.api;
 
-import de.juplo.kafka.chat.backend.domain.ChatHome;
+import de.juplo.kafka.chat.backend.ChatBackendProperties;
+import de.juplo.kafka.chat.backend.domain.ChatHomeService;
 import de.juplo.kafka.chat.backend.domain.ChatRoomData;
-import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
-import lombok.RequiredArgsConstructor;
+import de.juplo.kafka.chat.backend.implementation.StorageStrategy;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.UUID;
+import java.util.logging.Level;
 
 
 @RestController
-@RequiredArgsConstructor
 public class ChatBackendController
 {
-  private final ChatHome chatHome;
+  private final ChatHomeService chatHomeService;
   private final StorageStrategy storageStrategy;
+  private final String loggingCategory = ChatBackendController.class.getSimpleName();
+  private final Level loggingLevel;
+  private final boolean showOperatorLine;
+
+
+  public ChatBackendController(
+      ChatHomeService chatHomeService,
+      StorageStrategy storageStrategy,
+      ChatBackendProperties properties)
+  {
+    this.chatHomeService = chatHomeService;
+    this.storageStrategy = storageStrategy;
+    this.loggingLevel = properties.getProjectreactor().getLoggingLevel();
+    this.showOperatorLine = properties.getProjectreactor().isShowOperatorLine();
+  }
 
 
   @PostMapping("create")
   public Mono<ChatRoomInfoTo> create(@RequestBody String name)
   {
     UUID chatRoomId = UUID.randomUUID();
-    return chatHome
+    return chatHomeService
         .createChatRoom(chatRoomId, name)
         .map(ChatRoomInfoTo::from);
   }
@@ -32,7 +47,7 @@ public class ChatBackendController
   @GetMapping("list")
   public Flux<ChatRoomInfoTo> list()
   {
-    return chatHome
+    return chatHomeService
         .getChatRoomInfo()
         .map(chatroomInfo -> ChatRoomInfoTo.from(chatroomInfo));
   }
@@ -40,7 +55,7 @@ public class ChatBackendController
   @GetMapping("{chatRoomId}/list")
   public Flux<MessageTo> list(@PathVariable UUID chatRoomId)
   {
-    return chatHome
+    return chatHomeService
         .getChatRoomData(chatRoomId)
         .flatMapMany(chatRoomData -> chatRoomData
             .getMessages()
@@ -50,7 +65,7 @@ public class ChatBackendController
   @GetMapping("{chatRoomId}")
   public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatRoomId)
   {
-    return chatHome
+    return chatHomeService
         .getChatRoomInfo(chatRoomId)
         .map(chatRoomInfo -> ChatRoomInfoTo.from(chatRoomInfo));
   }
@@ -63,7 +78,7 @@ public class ChatBackendController
       @RequestBody String text)
   {
     return
-        chatHome
+        chatHomeService
             .getChatRoomData(chatRoomId)
             .flatMap(chatRoomData -> put(chatRoomData, username, messageId, text));
   }
@@ -90,7 +105,7 @@ public class ChatBackendController
       @PathVariable Long messageId)
   {
     return
-        chatHome
+        chatHomeService
             .getChatRoomData(chatRoomId)
             .flatMap(chatRoomData -> get(chatRoomData, username, messageId));
   }
@@ -109,7 +124,7 @@ public class ChatBackendController
   @GetMapping(path = "{chatRoomId}/listen")
   public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatRoomId)
   {
-    return chatHome
+    return chatHomeService
         .getChatRoomData(chatRoomId)
         .flatMapMany(chatRoomData -> listen(chatRoomData));
   }
@@ -118,7 +133,10 @@ public class ChatBackendController
   {
     return chatRoomData
         .listen()
-        .log()
+        .log(
+            loggingCategory,
+            loggingLevel,
+            showOperatorLine)
         .map(message -> MessageTo.from(message))
         .map(messageTo ->
             ServerSentEvent
@@ -128,9 +146,17 @@ public class ChatBackendController
                 .build());
   }
 
+  @GetMapping("/shards")
+  public Mono<String[]> getShardOwners()
+  {
+    return chatHomeService.getShardOwners();
+  }
+
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.write(chatHome);
+    storageStrategy
+        .write(chatHomeService)
+        .subscribe();
   }
 }