refactor: Cleaned up code

diff --git a/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageConfiguration.java b/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageConfiguration.java
index ad57da5c88072fea48a3f33aca485f2dd80d212e..4c0f1df76c0241fa2d0db63e5e773301de4cf941 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageConfiguration.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/storage/mongodb/MongoDbStorageConfiguration.java
@@ -17,12 +17,10 @@ public class MongoDbStorageConfiguration
   @Bean
   public StorageStrategy storageStrategy(
       ChatRoomRepository chatRoomRepository,
-      MessageRepository messageRepository,
-      ShardingStrategy shardingStrategy)
+      MessageRepository messageRepository)
   {
     return new MongoDbStorageStrategy(
         chatRoomRepository,
-        messageRepository,
-        shardingStrategy);
+        messageRepository);
   }
 }

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 95b1dd6ceabbadee005660620181b533d2fc04bb..c3ec0996b85c63b66235f02b339c64d1698016c6 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
@@ -2,7 +2,6 @@ package de.juplo.kafka.chat.backend.storage.mongodb;
 
 import de.juplo.kafka.chat.backend.domain.ChatRoomInfo;
 import de.juplo.kafka.chat.backend.domain.Message;
-import de.juplo.kafka.chat.backend.implementation.ShardingStrategy;
 import de.juplo.kafka.chat.backend.implementation.StorageStrategy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +16,6 @@ public class MongoDbStorageStrategy implements StorageStrategy
 {
   private final ChatRoomRepository chatRoomRepository;
   private final MessageRepository messageRepository;
-  private final ShardingStrategy shardingStrategy;
 
 
   @Override
@@ -25,14 +23,15 @@ public class MongoDbStorageStrategy implements StorageStrategy
   {
     return chatRoomInfoFlux
         .map(ChatRoomTo::from)
-        .map(chatroomTo -> chatRoomRepository.save(chatroomTo))
+        .map(chatRoomTo -> chatRoomRepository.save(chatRoomTo))
         .map(ChatRoomTo::toChatRoomInfo);
   }
 
   @Override
   public Flux<ChatRoomInfo> readChatRoomInfo()
   {
-    return chatRoomRepository.findAll()
+    return chatRoomRepository
+        .findAll()
         .map(chatRoomTo ->
         {
           UUID chatRoomId = UUID.fromString(chatRoomTo.getId());
@@ -45,14 +44,15 @@ public class MongoDbStorageStrategy implements StorageStrategy
   {
     return messageFlux
         .map(message -> MessageTo.from(chatRoomId, message))
-        .map(messageTo -> messageRepository.save(messageTo))
+        .flatMap(messageTo -> messageRepository.save(messageTo))
         .map(MessageTo::toMessage);
   }
 
   @Override
   public Flux<Message> readChatRoomData(UUID chatRoomId)
   {
-    return messageRepository.findByChatRoomIdOrderBySerialAsc(chatRoomId.toString())
+    return messageRepository
+        .findByChatRoomIdOrderBySerialAsc(chatRoomId.toString())
         .map(messageTo -> messageTo.toMessage());
   }
 }

diff --git a/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java b/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
index 43a09003baf164f3c66caa574768ce962e7a2e65..48f32ff5b0b81bff08d2d4bd327a64d722187330 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
@@ -60,13 +60,11 @@ public class InMemoryWithMongoDbStorageIT extends AbstractInMemoryStorageIT
     @Bean
     MongoDbStorageStrategy storageStrategy(
         ChatRoomRepository chatRoomRepository,
-        MessageRepository messageRepository,
-        Clock clock)
+        MessageRepository messageRepository)
     {
       return new MongoDbStorageStrategy(
           chatRoomRepository,
-          messageRepository,
-          chatRoomId -> 0);
+          messageRepository);
     }
 
     @Bean