fix: Errors during shard-publishing should not kill the instance

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / implementation / StorageStrategy.java

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 e701322..87208dc 100644 (file)
--- 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,57 +6,35 @@ 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 Mono<Void> write(ChatHomeService chatHomeService)
   {
-    writeChatRoomInfo(
-        chatHomeService
-            .getChatRoomInfo()
-            .doOnNext(chatRoomInfo -> writeChatRoomData(
-                chatRoomInfo.getId(),
-                chatHomeService
-                    .getChatRoomData(chatRoomInfo.getId())
-                    .flatMapMany(chatRoomData -> chatRoomData.getMessages()),
-                this::logSuccessChatRoom,
-                this::logFailureChatRoom)));
+    return writeChatRoomInfo(chatHomeService.getChatRoomInfo())
+        .flatMap(chatRoomInfo -> writeChatRoomData(
+            chatRoomInfo.getId(),
+            chatHomeService
+                .getChatRoomData(chatRoomInfo.getId())
+                .flatMapMany(chatRoomData -> chatRoomData.getMessages())
+            )
+            .count()
+            .doOnSuccess(count -> log.info("Stored {} messages for {}", count, chatRoomInfo))
+            .doOnError(throwable -> log.error("Could not store {}: {}", chatRoomInfo, throwable)))
+        .count()
+        .doOnSuccess(count -> log.info("Stored {} chat-rooms for {}", count, chatHomeService))
+        .doOnError(throwable -> log.error("Could not store {}: {}", chatHomeService, throwable))
+        .then();
   }
 
-  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 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);
-  }
 }