X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FHandoverIT.java;h=b22166fad6e8d656f213155ddc3f74e2a27690aa;hb=993c3c7cbbd107e12d7a9b7a0945b2a254cf9dfd;hp=f384f7e8afdf641aa20f2ae1def14db5a177d015;hpb=45b6cc67b3b7997f64f8fb74ca15525642ef4f8d;p=demos%2Fkafka%2Fchat diff --git a/src/test/java/de/juplo/kafka/chat/backend/HandoverIT.java b/src/test/java/de/juplo/kafka/chat/backend/HandoverIT.java index f384f7e8..b22166fa 100644 --- a/src/test/java/de/juplo/kafka/chat/backend/HandoverIT.java +++ b/src/test/java/de/juplo/kafka/chat/backend/HandoverIT.java @@ -37,7 +37,6 @@ import java.util.stream.IntStream; public abstract class AbstractHandoverIT { static final ImagePullPolicy NEVER_PULL = imageName -> false; - static final ParameterizedTypeReference> SSE_TYPE = new ParameterizedTypeReference<>() {}; @Test @@ -61,70 +60,6 @@ public abstract class AbstractHandoverIT .block(); } - Mono createChatRoom(String name) - { - return webClient - .post() - .uri("/create") - .contentType(MediaType.TEXT_PLAIN) - .bodyValue(name) - .accept(MediaType.APPLICATION_JSON) - .exchangeToMono(response -> - { - if (response.statusCode().equals(HttpStatus.OK)) - { - return response.bodyToMono(ChatRoomInfoTo.class); - } - else - { - return response.createError(); - } - }); - } - - Mono sendMessage( - ChatRoomInfoTo chatRoom, - User user, - String message) - { - return webClient - .put() - .uri( - "/{chatRoomId}/{username}/{serial}", - chatRoom.getId(), - user.getName(), - user.nextSerial()) - .contentType(MediaType.TEXT_PLAIN) - .accept(MediaType.APPLICATION_JSON) - .bodyValue(message) - .exchangeToMono(response -> - { - if (response.statusCode().equals(HttpStatus.OK)) - { - return response.bodyToMono(MessageTo.class); - } - else - { - return response.createError(); - } - }); - } - - Flux> receiveMessages(ChatRoomInfoTo chatRoom) - { - return webClient - .get() - .uri( - "/{chatRoomId}/listen", - chatRoom.getId()) - .accept(MediaType.TEXT_EVENT_STREAM) - .retrieve() - .bodyToFlux(SSE_TYPE); - } - - - WebClient webClient; - abstract void setUpExtra() throws IOException, InterruptedException; @@ -137,9 +72,6 @@ public abstract class AbstractHandoverIT // backend2.start(); // backend3.start(); - Integer port = haproxy.getMappedPort(8400); - webClient = WebClient.create("http://localhost:" + port); - Awaitility .await() .atMost(Duration.ofMinutes(10)) @@ -173,7 +105,8 @@ public abstract class AbstractHandoverIT Awaitility .await() .atMost(Duration.ofMinutes(10)) - .until(() -> webClient + .until(() -> WebClient + .create("http://localhost:" + haproxy.getMappedPort(8400)) .get() .uri("/actuator/health") .exchangeToMono(response ->