X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FTestListener.java;h=e5b25293dc11238da625424459cd8fac9e89b604;hb=ab1eee218b7944a848148ed4ba0272fea9f23780;hp=1c993c17059cd6bcbfd0aa90ad37c24a3504656a;hpb=764392103f804972ca81072bd2a9470a9b575d4f;p=demos%2Fkafka%2Fchat

diff --git a/src/test/java/de/juplo/kafka/chat/backend/TestListener.java b/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
index 1c993c17..e5b25293 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
@@ -7,54 +7,55 @@ import de.juplo.kafka.chat.backend.api.ChatRoomInfoTo;
 import de.juplo.kafka.chat.backend.api.MessageTo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
 
-import java.nio.charset.Charset;
-import java.time.Duration;
-import java.util.concurrent.ThreadLocalRandom;
+import java.util.*;
 
 
 @Slf4j
-public class TestListener implements Runnable
+public class TestListener
 {
   static final ParameterizedTypeReference<ServerSentEvent<String>> SSE_TYPE = new ParameterizedTypeReference<>() {};
 
 
-  @Override
-  public void run()
+  public Flux<MessageTo> run()
   {
-    Flux
+    return Flux
         .fromArray(chatRooms)
-        .flatMap(chatRoom -> receiveMessages(chatRoom)
-            .flatMap(sse ->
-            {
-              try
-              {
-                return Mono.just(objectMapper.readValue(sse.data(), MessageTo.class));
-              }
-              catch (Exception e)
-              {
-                return Mono.error(e);
-              }
-            })
-            .doOnNext(message -> log.info(
-                "Received a message from chat-room {}: {}",
-                chatRoom,
-                message))
-            .take(30))
-        .takeUntil(message -> !running)
-        .then()
-        .block();
+        .flatMap(chatRoom ->
+        {
+          List<MessageTo> list = new LinkedList<>();
+          receivedMessages.put(chatRoom.getId(), list);
+          return receiveMessages(chatRoom);
+        });
   }
 
-  Flux<ServerSentEvent<String>> receiveMessages(ChatRoomInfoTo chatRoom)
+  Flux<MessageTo> receiveMessages(ChatRoomInfoTo chatRoom)
+  {
+    log.info("Requesting messages for chat-room {}", chatRoom);
+    List<MessageTo> list = receivedMessages.get(chatRoom.getId());
+    return receiveServerSentEvents(chatRoom)
+        .flatMap(sse ->
+        {
+          try
+          {
+            return Mono.just(objectMapper.readValue(sse.data(), MessageTo.class));
+          }
+          catch (Exception e)
+          {
+            return Mono.error(e);
+          }
+        })
+        .doOnNext(message -> list.add(message))
+        .doOnComplete(() -> log.info("{} was completed!", chatRoom))
+        .doOnError(throwalbe -> log.error("{} failed: {}", chatRoom, throwalbe));
+  }
+
+  Flux<ServerSentEvent<String>> receiveServerSentEvents(ChatRoomInfoTo chatRoom)
   {
     return webClient
         .get()
@@ -71,7 +72,7 @@ public class TestListener implements Runnable
   private final ChatRoomInfoTo[] chatRooms;
   private final ObjectMapper objectMapper;
 
-  volatile boolean running = true;
+  final Map<UUID, List<MessageTo>> receivedMessages = new HashMap<>();
 
 
   TestListener(Integer port, ChatRoomInfoTo[] chatRooms)