WIP - Ein Versuch (vielleicht Unsinn)

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 98db975..6d39956 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
@@ -33,7 +33,7 @@ public interface StorageStrategy
     Phaser writtenChatRooms = new Phaser(1);
     AtomicInteger numErrors = new AtomicInteger();
 
-    writeChatRoomInfo(
+    Flux<ChatRoomInfo> chatRoomInfoFlux =
         chatHomeService
             .getChatRoomInfo()
             .doOnNext(chatRoomInfo -> writtenChatRooms.register())
@@ -52,7 +52,9 @@ public interface StorageStrategy
                   logFailure(chatRoomId, throwable);
                   numErrors.incrementAndGet();
                   writtenChatRooms.arriveAndDeregister();
-                })));
+                }));
+
+    writeChatRoomInfo(chatRoomInfoFlux);
 
     writtenChatRooms.arriveAndAwaitAdvance();
     if (numErrors.get() > 0)

diff --git a/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java b/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java
index cb7dd31..00bb881 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/storage/files/FilesStorageStrategy.java
@@ -62,24 +62,24 @@ public class FilesStorageStrategy implements StorageStrategy
               throw new RuntimeException(e);
             }
           })
-          .doOnTerminate(() ->
+          .doOnNext(chatRoomInfo ->
           {
             try
             {
-              generator.writeEndArray();
-              generator.close();
+              ChatRoomInfoTo chatRoomInfoTo = ChatRoomInfoTo.from(chatRoomInfo);
+              generator.writeObject(chatRoomInfoTo);
             }
             catch (IOException e)
             {
               throw new RuntimeException(e);
             }
           })
-          .subscribe(chatRoomInfo ->
+          .doOnTerminate(() ->
           {
             try
             {
-              ChatRoomInfoTo chatRoomInfoTo = ChatRoomInfoTo.from(chatRoomInfo);
-              generator.writeObject(chatRoomInfoTo);
+              generator.writeEndArray();
+              generator.close();
             }
             catch (IOException e)
             {

diff --git a/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageStrategy.java b/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageStrategy.java
index 3f9ff20..1d742a5 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageStrategy.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageStrategy.java
@@ -25,8 +25,7 @@ public class MongoDbStorageStrategy implements StorageStrategy
   {
     chatRoomInfoFlux
         .map(ChatRoomTo::from)
-        .flatMap(chatroomTo -> chatRoomRepository.save(chatroomTo))
-        .subscribe();
+        .flatMap(chatroomTo -> chatRoomRepository.save(chatroomTo));
   }
 
   @Override