From 32ba4288f64c27f8f33f26b2120b81089ccbae19 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 20 Feb 2024 07:47:22 +0100
Subject: [PATCH] refactor: Simplified `StorageStrategy`

* Reconfigurable success/error-logging was introduced for
  `NoStorageStorageStrategy`.
* But as it turns out, this strategy can simply apply its logging in the
  overwritten method, that disables the whole storing-logic.
* Hence, the interface was greatly simplified again, by removing this
  ununsed mechanism.
---
 .../implementation/StorageStrategy.java       | 63 ++-----------------
 1 file changed, 6 insertions(+), 57 deletions(-)

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 990d001a..61081635 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
@@ -8,8 +8,6 @@ import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 
 public interface StorageStrategy
@@ -17,74 +15,25 @@ public interface StorageStrategy
   Logger log = LoggerFactory.getLogger(StorageStrategy.class.getCanonicalName());
 
   default Flux<ChatRoomInfo> write(ChatHomeService chatHomeService)
-  {
-    return write(
-        chatHomeService,
-        this::logSuccessChatHomeService,
-        this::logFailureChatHomeService);
-  }
-
-  default Flux<ChatRoomInfo> write(
-      ChatHomeService chatHomeService,
-      ChatHomeServiceWrittenSuccessCallback successCallback,
-      ChatHomeServiceWrittenFailureCallback failureCallback)
   {
     return writeChatRoomInfo(
         chatHomeService
             .getChatRoomInfo()
-            .doOnComplete(() -> successCallback.accept(chatHomeService))
-            .doOnError(throwable -> failureCallback.accept(chatHomeService, throwable))
+            .doOnComplete(() -> log.info("Stored {}", chatHomeService))
+            .doOnError(throwable -> log.error("Could not store {}: {}", chatHomeService, throwable))
             .doOnNext(chatRoomInfo ->
                 writeChatRoomData(
                     chatRoomInfo.getId(),
                     chatHomeService
                         .getChatRoomData(chatRoomInfo.getId())
-                        .flatMapMany(chatRoomData -> chatRoomData.getMessages()),
-
-                    this::logSuccessChatRoom,
-                    this::logFailureChatRoom).subscribe()));
+                        .flatMapMany(chatRoomData -> chatRoomData.getMessages())
+                        .doOnComplete(() -> log.info("Stored {}", chatRoomInfo))
+                        .doOnError(throwable -> log.error("Could not store {}: {}", chatRoomInfo, throwable)))
+                    .subscribe()));
   }
 
   Flux<ChatRoomInfo> writeChatRoomInfo(Flux<ChatRoomInfo> chatRoomInfoFlux);
   Flux<ChatRoomInfo> readChatRoomInfo();
-  default Flux<Message> writeChatRoomData(
-      UUID chatRoomId,
-      Flux<Message> messageFlux,
-      ChatRoomWrittenSuccessCallback successCallback,
-      ChatRoomWrittenFailureCallback failureCallback)
-  {
-    return writeChatRoomData(
-        chatRoomId,
-        messageFlux
-            .doOnComplete(() -> successCallback.accept(chatRoomId))
-            .doOnError(throwable -> failureCallback.accept(chatRoomId, throwable)));
-  }
   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);
-  }
 }
-- 
2.20.1