X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fimplementation%2FStorageStrategy.java;h=f9ce2b1256566cef7cfd5ff8f0d3111487fcc361;hb=4aacef9fa8d116ea4ef9687c42b8744841c09457;hp=019db6572838cf6fe7d0402ac6b1e804fb2e2301;hpb=d8e1f590717e83039312c034aad14e6ec10720f4;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java b/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
index 019db657..f9ce2b12 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
@@ -6,84 +6,36 @@ import de.juplo.kafka.chat.backend.domain.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 
 public interface StorageStrategy
 {
   Logger log = LoggerFactory.getLogger(StorageStrategy.class.getCanonicalName());
 
-  default void write(ChatHomeService chatHomeService)
+  default Flux<ChatRoomInfo> write(ChatHomeService chatHomeService)
   {
-    write(
-        chatHomeService,
-        this::logSuccessChatHomeService,
-        this::logFailureChatHomeService);
-  }
-
-  default void write(
-      ChatHomeService chatHomeService,
-      ChatHomeServiceWrittenSuccessCallback successCallback,
-      ChatHomeServiceWrittenFailureCallback failureCallback)
-  {
-    writeChatRoomInfo(
+    return writeChatRoomInfo(
         chatHomeService
             .getChatRoomInfo()
-            .doOnComplete(() -> successCallback.accept(chatHomeService))
-            .doOnError(throwable -> failureCallback.accept(chatHomeService, throwable))
-            .doOnNext(chatRoomInfo ->
+            .flatMap(chatRoomInfo ->
                 writeChatRoomData(
                     chatRoomInfo.getId(),
                     chatHomeService
                         .getChatRoomData(chatRoomInfo.getId())
-                        .flatMapMany(chatRoomData -> chatRoomData.getMessages()),
-                    this::logSuccessChatRoom,
-                    this::logFailureChatRoom)));
+                        .flatMapMany(chatRoomData -> chatRoomData.getMessages())
+                        )
+                    .then(Mono.just(chatRoomInfo))
+                    .doOnSuccess(empty -> log.info("Stored {}", chatRoomInfo))
+                    .doOnError(throwable -> log.error("Could not store {}: {}", chatRoomInfo, throwable))))
+        .doOnComplete(() -> log.info("Stored {}", chatHomeService))
+        .doOnError(throwable -> log.error("Could not store {}: {}", chatHomeService, throwable));
   }
 
-  void writeChatRoomInfo(Flux<ChatRoomInfo> chatRoomInfoFlux);
+  Flux<ChatRoomInfo> writeChatRoomInfo(Flux<ChatRoomInfo> chatRoomInfoFlux);
   Flux<ChatRoomInfo> readChatRoomInfo();
-  default void writeChatRoomData(
-      UUID chatRoomId,
-      Flux<Message> messageFlux,
-      ChatRoomWrittenSuccessCallback successCallback,
-      ChatRoomWrittenFailureCallback failureCallback)
-  {
-    writeChatRoomData(
-        chatRoomId,
-        messageFlux
-            .doOnComplete(() -> successCallback.accept(chatRoomId))
-            .doOnError(throwable -> failureCallback.accept(chatRoomId, throwable)));
-  }
-  void writeChatRoomData(UUID chatRoomId, Flux<Message> messageFlux);
+  Flux<Message> writeChatRoomData(UUID chatRoomId, Flux<Message> messageFlux);
   Flux<Message> readChatRoomData(UUID chatRoomId);
-
-  interface ChatHomeServiceWrittenSuccessCallback extends Consumer<ChatHomeService> {}
-  interface ChatHomeServiceWrittenFailureCallback extends BiConsumer<ChatHomeService, Throwable> {}
-
-  default void logSuccessChatHomeService(ChatHomeService chatHomeService)
-  {
-    log.info("Successfully stored {}", chatHomeService);
-  }
-
-  default void logFailureChatHomeService(ChatHomeService chatHomeService, Throwable throwable)
-  {
-    log.error("Could not store {}: {}", chatHomeService, throwable);
-  }
-
-  interface ChatRoomWrittenSuccessCallback extends Consumer<UUID> {}
-  interface ChatRoomWrittenFailureCallback extends BiConsumer<UUID, Throwable> {}
-
-  default void logSuccessChatRoom(UUID chatRoomId)
-  {
-    log.info("Successfully stored chat-room {}", chatRoomId);
-  }
-
-  default void logFailureChatRoom(UUID chatRoomId, Throwable throwable)
-  {
-    log.error("Could not store chat-room {}: {}", chatRoomId, throwable);
-  }
 }