X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=47ae6a5daa6f37279d10e349826c1594ed3349fd;hb=2800b80bb0a02feb70ab9d0c804b2fcc9915f479;hp=339451a8da61bf970a0adcdd8c90e5b24cc4848a;hpb=8837fa6b1caed563ef8fb1929e8d66609477153c;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 339451a8..47ae6a5d 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,32 +1,44 @@
 package de.juplo.kafka.chat.backend.api;
 
-import de.juplo.kafka.chat.backend.domain.ChatHome;
-import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.ChatRoomFactory;
-import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
-import lombok.RequiredArgsConstructor;
+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.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 ChatRoomFactory factory;
+  private final ChatHomeService chatHomeService;
   private final StorageStrategy storageStrategy;
+  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 factory
+    return chatHomeService
         .createChatRoom(chatRoomId, name)
         .map(ChatRoomInfoTo::from);
   }
@@ -34,50 +46,50 @@ public class ChatBackendController
   @GetMapping("list")
   public Flux<ChatRoomInfoTo> list()
   {
-    return chatHome
-        .getChatRooms()
-        .map(chatroom -> ChatRoomInfoTo.from(chatroom));
+    return chatHomeService
+        .getChatRoomInfo()
+        .map(chatroomInfo -> ChatRoomInfoTo.from(chatroomInfo));
   }
 
-  @GetMapping("{chatroomId}/list")
-  public Flux<MessageTo> list(@PathVariable UUID chatroomId)
+  @GetMapping("{chatRoomId}/list")
+  public Flux<MessageTo> list(@PathVariable UUID chatRoomId)
   {
-    return chatHome
-        .getChatRoom(chatroomId)
-        .flatMapMany(chatroom -> chatroom
+    return chatHomeService
+        .getChatRoomData(chatRoomId)
+        .flatMapMany(chatRoomData -> chatRoomData
             .getMessages()
             .map(MessageTo::from));
   }
 
-  @GetMapping("{chatroomId}")
-  public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatroomId)
+  @GetMapping("{chatRoomId}")
+  public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatRoomId)
   {
-    return chatHome
-        .getChatRoom(chatroomId)
-        .map(chatroom -> ChatRoomInfoTo.from(chatroom));
+    return chatHomeService
+        .getChatRoomInfo(chatRoomId)
+        .map(chatRoomInfo -> ChatRoomInfoTo.from(chatRoomInfo));
   }
 
-  @PutMapping("{chatroomId}/{username}/{messageId}")
+  @PutMapping("{chatRoomId}/{username}/{messageId}")
   public Mono<MessageTo> put(
-      @PathVariable UUID chatroomId,
+      @PathVariable UUID chatRoomId,
       @PathVariable String username,
       @PathVariable Long messageId,
       @RequestBody String text)
   {
     return
-        chatHome
-            .getChatRoom(chatroomId)
-            .flatMap(chatroom -> put(chatroom, username, messageId, text));
+        chatHomeService
+            .getChatRoomData(chatRoomId)
+            .flatMap(chatRoomData -> put(chatRoomData, username, messageId, text));
   }
 
   private Mono<MessageTo> put(
-      ChatRoom chatroom,
+      ChatRoomData chatRoomData,
       String username,
       Long messageId,
       String text)
   {
     return
-        chatroom
+        chatRoomData
             .addMessage(
                 messageId,
                 username,
@@ -85,42 +97,45 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping("{chatroomId}/{username}/{messageId}")
+  @GetMapping("{chatRoomId}/{username}/{messageId}")
   public Mono<MessageTo> get(
-      @PathVariable UUID chatroomId,
+      @PathVariable UUID chatRoomId,
       @PathVariable String username,
       @PathVariable Long messageId)
   {
     return
-        chatHome
-            .getChatRoom(chatroomId)
-            .flatMap(chatroom -> get(chatroom, username, messageId));
+        chatHomeService
+            .getChatRoomData(chatRoomId)
+            .flatMap(chatRoomData -> get(chatRoomData, username, messageId));
   }
 
   private Mono<MessageTo> get(
-      ChatRoom chatroom,
+      ChatRoomData chatRoomData,
       String username,
       Long messageId)
   {
     return
-        chatroom
+        chatRoomData
             .getMessage(username, messageId)
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(path = "{chatroomId}/listen")
-  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
+  @GetMapping(path = "{chatRoomId}/listen")
+  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatRoomId)
   {
-    return chatHome
-        .getChatRoom(chatroomId)
-        .flatMapMany(chatroom -> listen(chatroom));
+    return chatHomeService
+        .getChatRoomData(chatRoomId)
+        .flatMapMany(chatRoomData -> listen(chatRoomData));
   }
 
-  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
+  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoomData chatRoomData)
   {
-    return chatroom
+    return chatRoomData
         .listen()
-        .log()
+        .log(
+            ChatBackendController.class.getSimpleName(),
+            loggingLevel,
+            showOperatorLine)
         .map(message -> MessageTo.from(message))
         .map(messageTo ->
             ServerSentEvent
@@ -130,9 +145,17 @@ public class ChatBackendController
                 .build());
   }
 
+  @GetMapping("/shards")
+  public Mono<String[]> getShardOwners()
+  {
+    return chatHomeService.getShardOwners();
+  }
+
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.write(chatHome.getChatRooms());
+    storageStrategy
+        .write(chatHomeService)
+        .subscribe();
   }
 }