NG

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
index 15d542a..6091c0c 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
@@ -10,5 +10,5 @@ public interface ChatHome
 {
   Mono<ChatRoom> getChatRoom(UUID id);
 
-  Flux<ChatRoomInfo> getChatRooms();
+  Flux<ChatRoom> getChatRooms();
 }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHomeService.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHomeService.java
index 9becd6e..19ff4aa 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHomeService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHomeService.java
@@ -9,5 +9,5 @@ import java.util.UUID;
 public interface ChatHomeService
 {
   Mono<ChatRoom> getChatRoom(int shard, UUID id);
-  Flux<ChatRoomInfo> getChatRooms(int shard);
+  Flux<ChatRoom> getChatRooms(int shard);
 }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ShardedChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ShardedChatHome.java
index 69527f6..6d2f079 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ShardedChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ShardedChatHome.java
@@ -47,7 +47,7 @@ public class ShardedChatHome implements ChatHome
   }
 
   @Override
-  public Flux<ChatRoomInfo> getChatRooms()
+  public Flux<ChatRoom> getChatRooms()
   {
     return Flux
         .fromIterable(ownedShards)

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/SimpleChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/SimpleChatHome.java
index 90061e6..11542ed 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/SimpleChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/SimpleChatHome.java
@@ -36,7 +36,7 @@ public class SimpleChatHome implements ChatHome
   }
 
   @Override
-  public Flux<ChatRoomInfo> getChatRooms()
+  public Flux<ChatRoom> getChatRooms()
   {
     return service.getChatRooms(shard);
   }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
index 0f0c952..8eaaccc 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
@@ -64,7 +64,7 @@ public class InMemoryChatHomeService implements ChatHomeService
   }
 
   @Override
-  public Flux<ChatRoomInfo> getChatRooms(int shard)
+  public Flux<ChatRoom> getChatRooms(int shard)
   {
     return Flux.fromStream(chatrooms[shard].values().stream());
   }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
index 1c6ae91..5d3f862 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
@@ -27,7 +27,7 @@ public class ChatRoomChannel implements Runnable
 {
   private final String topic;
   private final Consumer<String, AbstractTo> consumer;
-  private final Map<UUID, ChatRoomInfo> chatrooms = new HashMap<>();
+  private final Map<UUID, ChatRoom> chatrooms = new HashMap<>();
 
   private boolean running;
 
@@ -80,7 +80,7 @@ public class ChatRoomChannel implements Runnable
     chatrooms.put(chatRoomInfo.getId(), chatRoomInfo);
   }
 
-  Flux<ChatRoomInfo> getChatRooms()
+  Flux<ChatRoom> getChatRooms()
   {
     return Flux.fromIterable(chatrooms.values());
   }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
index bf99dbf..2bccc3a 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
@@ -36,7 +36,7 @@ public class KafkaChatHome implements ChatHome
   }
 
   @Override
-  public Flux<ChatRoomInfo> getChatRooms()
+  public Flux<ChatRoom> getChatRooms()
   {
       return chatRoomChannel.getChatRooms();
   }

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
index f802234..77ecf1c 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
@@ -34,7 +34,7 @@ public class KafkaChatRoomService implements ChatRoomService
 
   void persistMessage(Message message)
   {
-    messages.put(message.getKey(), message);
+    messages.put  (message.getKey(), message);
   }
 
   @Override