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 15d542a742fbd50ac1dfa1e0db3a09aed7916c24..6091c0c5afd1a8288a7951be0771789f85ef5cff 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 9becd6eff89a3eb2227da68a2d6ff9c462cc58fa..19ff4aa4f0a5ad88730054be870171a9bcda5492 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 69527f66119933cfe979733d4968fcaaa61b61ad..6d2f07946cdde03b33eeba2bf5e0dae30cb3cd41 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 90061e65b21b3d77783639e34e1b1477603d5502..11542edd3172b48e8540ee3a2823412cd9eaffdc 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 0f0c9524a502d210b278b9dfd4d1c5688e5f4380..8eaaccc6cbc76640c7c193f698fef3b1075a625a 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 1c6ae915c7cf4970874ff5b89a32e4242d6ec2a1..5d3f8626e65578818b49fbbf7b721d740223de65 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 bf99dbffb504fff4edb689985af70d6ae186652a..2bccc3add7de8791b6e25582cc7bc1fd6ea36098 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 f80223489ae3cd71099ba36cd501aa230ec301bf..77ecf1ca3bb384094f1666f683cb84dda8880872 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