X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FTestListener.java;h=3f7fb9d8b9c9309e7b35cf41b1f8d0bfe11f3e2a;hb=0e5178b7a3b8c8f3167f99c2d36452a2a68c80fa;hp=e58cb2b605e7f085ce96d82a2b4100c9d5409c37;hpb=295c4aeab33547e7fc2445da7b7e3c0ae2504920;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 e58cb2b6..3f7fb9d8 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/TestListener.java
@@ -12,7 +12,9 @@ import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
 
+import java.time.Duration;
 import java.util.*;
 
 
@@ -28,28 +30,35 @@ public class TestListener
         .fromArray(chatRooms)
         .flatMap(chatRoom ->
         {
-          log.info("Requesting messages for chat-room {}", chatRoom);
           List<MessageTo> list = new LinkedList<>();
           receivedMessages.put(chatRoom.getId(), list);
-          return receiveMessages(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));
+          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))
+        .thenMany(Flux.defer(() -> receiveMessages(chatRoom)));
+  }
+
+  Flux<ServerSentEvent<String>> receiveServerSentEvents(ChatRoomInfoTo chatRoom)
   {
     return webClient
         .get()
@@ -58,7 +67,8 @@ public class TestListener
             chatRoom.getId())
         .accept(MediaType.TEXT_EVENT_STREAM)
         .retrieve()
-        .bodyToFlux(SSE_TYPE);
+        .bodyToFlux(SSE_TYPE)
+        .retryWhen(Retry.fixedDelay(15, Duration.ofSeconds(1)));
   }