From eb7990b5a52df5f94431ea2a5df757cce5631783 Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Fri, 12 May 2023 16:39:49 +0200
Subject: [PATCH 1/5] Update MessagingHealthTest to use Nima WebClient instead
 of Reactive WebClient

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 microprofile/messaging/health/pom.xml         | 17 +++------
 .../messaging/health/MessagingHealthTest.java | 37 ++++++++-----------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/microprofile/messaging/health/pom.xml b/microprofile/messaging/health/pom.xml
index 1ec6191dfd8..ddb0d82f144 100644
--- a/microprofile/messaging/health/pom.xml
+++ b/microprofile/messaging/health/pom.xml
@@ -56,23 +56,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.reactive.webclient</groupId>
-            <artifactId>helidon-reactive-webclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.reactive.media</groupId>
-            <artifactId>helidon-reactive-media-jsonp</artifactId>
+            <groupId>io.helidon.microprofile.tests</groupId>
+            <artifactId>helidon-microprofile-tests-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.reactive.media</groupId>
-            <artifactId>helidon-reactive-media-jsonb</artifactId>
+            <groupId>io.helidon.nima.webclient</groupId>
+            <artifactId>helidon-nima-webclient</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.microprofile.tests</groupId>
-            <artifactId>helidon-microprofile-tests-junit5</artifactId>
+            <groupId>io.helidon.nima.http.media</groupId>
+            <artifactId>helidon-nima-http-media-jsonp</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
index 7734b2a6876..58c25f672ac 100644
--- a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
+++ b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,9 @@
 import io.helidon.microprofile.tests.junit5.AddExtensions;
 import io.helidon.microprofile.tests.junit5.DisableDiscovery;
 import io.helidon.microprofile.tests.junit5.HelidonTest;
-import io.helidon.reactive.media.jsonp.JsonpSupport;
-import io.helidon.reactive.webclient.WebClient;
+import io.helidon.nima.webclient.WebClient;
+import io.helidon.nima.webclient.http1.Http1Client;
+import io.helidon.nima.webclient.http1.Http1ClientResponse;
 
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.spi.CDI;
@@ -82,16 +83,14 @@
 public class MessagingHealthTest {
 
     private static final String ERROR_MESSAGE = "BOOM!";
-
-    private WebClient client;
+    private Http1Client client;
 
     @BeforeEach
     void setUp() {
         ServerCdiExtension server = CDI.current().select(ServerCdiExtension.class).get();
         client = WebClient.builder()
-                .baseUri("http://localhost:" + server.port())
-                .addReader(JsonpSupport.reader())
-                .build();
+                 .baseUri("http://localhost:" + server.port())
+                 .build();
     }
 
     @Test
@@ -154,18 +153,14 @@ private void assertMessagingHealth(HealthCheckResponse.Status rootState, Map<Str
     }
 
     private JsonObject getHealthCheck(String checkName) {
-        return client.get()
-                .path("/health")
-                .submit()
-                .await(5, TimeUnit.SECONDS)
-                .content()
-                .as(JsonObject.class)
-                .await(500, TimeUnit.MILLISECONDS)
-                .getValue("/checks")
-                .asJsonArray().stream()
-                .map(JsonValue::asJsonObject)
-                .filter(check -> check.getString("name").equals(checkName))
-                .findFirst()
-                .orElseThrow(() -> new AssertionFailedError("Health check 'messaging' is missing!"));
+        try (Http1ClientResponse response = client.get("/health").request()) {
+            JsonObject jsonObject = response.as(JsonObject.class);
+            return jsonObject.getValue("/checks")
+                             .asJsonArray().stream()
+                             .map(JsonValue::asJsonObject)
+                             .filter(check -> check.getString("name").equals(checkName))
+                             .findFirst()
+                             .orElseThrow(() -> new AssertionFailedError("Health check 'messaging' is missing!"));
+        }
     }
 }

From c29fcc37504a232308676bce44e180d7f870a6a2 Mon Sep 17 00:00:00 2001
From: Andrii Serkes <andrii.serkes@oracle.com>
Date: Fri, 12 May 2023 19:06:42 +0200
Subject: [PATCH 2/5] Update pom.xml

---
 microprofile/messaging/health/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microprofile/messaging/health/pom.xml b/microprofile/messaging/health/pom.xml
index ddb0d82f144..4779852c714 100644
--- a/microprofile/messaging/health/pom.xml
+++ b/microprofile/messaging/health/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020,  2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From 26528e1cb7412134734c414e2f83739005d584b5 Mon Sep 17 00:00:00 2001
From: Andrii Serkes <andrii.serkes@oracle.com>
Date: Fri, 12 May 2023 19:07:17 +0200
Subject: [PATCH 3/5] Update pom.xml

---
 microprofile/messaging/health/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microprofile/messaging/health/pom.xml b/microprofile/messaging/health/pom.xml
index 4779852c714..ddb0d82f144 100644
--- a/microprofile/messaging/health/pom.xml
+++ b/microprofile/messaging/health/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020,  2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From 638124668a42c9d50b054e425e84632dbbff7cd4 Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Mon, 15 May 2023 15:10:28 +0200
Subject: [PATCH 4/5] replace Nima WebClient by jakarta.ws.rs.client.Client

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 microprofile/messaging/health/pom.xml         | 10 ----------
 .../messaging/health/MessagingHealthTest.java | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/microprofile/messaging/health/pom.xml b/microprofile/messaging/health/pom.xml
index ddb0d82f144..0b6b2646f69 100644
--- a/microprofile/messaging/health/pom.xml
+++ b/microprofile/messaging/health/pom.xml
@@ -60,15 +60,5 @@
             <artifactId>helidon-microprofile-tests-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.nima.webclient</groupId>
-            <artifactId>helidon-nima-webclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.nima.http.media</groupId>
-            <artifactId>helidon-nima-http-media-jsonp</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
index 58c25f672ac..33971339c45 100644
--- a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
+++ b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
@@ -30,15 +30,16 @@
 import io.helidon.microprofile.tests.junit5.AddExtensions;
 import io.helidon.microprofile.tests.junit5.DisableDiscovery;
 import io.helidon.microprofile.tests.junit5.HelidonTest;
-import io.helidon.nima.webclient.WebClient;
-import io.helidon.nima.webclient.http1.Http1Client;
-import io.helidon.nima.webclient.http1.Http1ClientResponse;
 
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
@@ -79,18 +80,17 @@
         @AddExtension(JaxRsCdiExtension.class),
         @AddExtension(HealthCdiExtension.class),
         @AddExtension(MessagingCdiExtension.class),
+        @AddExtension(CdiComponentProvider.class)
 })
 public class MessagingHealthTest {
 
     private static final String ERROR_MESSAGE = "BOOM!";
-    private Http1Client client;
+    private int port;
 
     @BeforeEach
     void setUp() {
         ServerCdiExtension server = CDI.current().select(ServerCdiExtension.class).get();
-        client = WebClient.builder()
-                 .baseUri("http://localhost:" + server.port())
-                 .build();
+        port = server.port();
     }
 
     @Test
@@ -153,8 +153,9 @@ private void assertMessagingHealth(HealthCheckResponse.Status rootState, Map<Str
     }
 
     private JsonObject getHealthCheck(String checkName) {
-        try (Http1ClientResponse response = client.get("/health").request()) {
-            JsonObject jsonObject = response.as(JsonObject.class);
+        try (Client client = ClientBuilder.newClient()) {
+            Response response = client.target("http://localhost:" + port).path("/health").request().get();
+            JsonObject jsonObject = response.readEntity(JsonObject.class);
             return jsonObject.getValue("/checks")
                              .asJsonArray().stream()
                              .map(JsonValue::asJsonObject)

From f7ac7ceddcbf6cc31977c3abc9292eda81fe0967 Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Wed, 17 May 2023 13:41:54 +0200
Subject: [PATCH 5/5] add WebTarget

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 .../messaging/health/MessagingHealthTest.java | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
index 33971339c45..9f0218c7841 100644
--- a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
+++ b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java
@@ -35,8 +35,7 @@
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider;
@@ -85,25 +84,23 @@
 public class MessagingHealthTest {
 
     private static final String ERROR_MESSAGE = "BOOM!";
-    private int port;
 
     @BeforeEach
     void setUp() {
         ServerCdiExtension server = CDI.current().select(ServerCdiExtension.class).get();
-        port = server.port();
     }
 
     @Test
-    void alivenessWithErrorSignal(SeContainer container) {
+    void alivenessWithErrorSignal(WebTarget webTarget, SeContainer container) {
         TestMessagingBean bean = container.select(TestMessagingBean.class).get();
 
-        assertMessagingHealth(UP, Map.of(
+        assertMessagingHealth(webTarget, UP, Map.of(
                 CHANNEL_1, UP,
                 CHANNEL_2, UP
         ));
 
         bean.getEmitter1().fail(new RuntimeException(ERROR_MESSAGE));
-        assertMessagingHealth(DOWN, Map.of(
+        assertMessagingHealth(webTarget, DOWN, Map.of(
                 CHANNEL_1, DOWN,
                 CHANNEL_2, UP
         ));
@@ -111,7 +108,7 @@ void alivenessWithErrorSignal(SeContainer container) {
                 equalTo(ERROR_MESSAGE));
 
         bean.getEmitter2().fail(new RuntimeException(ERROR_MESSAGE));
-        assertMessagingHealth(DOWN, Map.of(
+        assertMessagingHealth(webTarget, DOWN, Map.of(
                 CHANNEL_1, DOWN,
                 CHANNEL_2, DOWN
         ));
@@ -120,10 +117,10 @@ void alivenessWithErrorSignal(SeContainer container) {
     }
 
     @Test
-    void alivenessWithCancelSignal(SeContainer container) {
+    void alivenessWithCancelSignal(WebTarget webTarget, SeContainer container) {
         TestMessagingBean bean = container.select(TestMessagingBean.class).get();
 
-        assertMessagingHealth(UP, Map.of(
+        assertMessagingHealth(webTarget, UP, Map.of(
                 CHANNEL_1, UP,
                 CHANNEL_2, UP
         ));
@@ -131,37 +128,35 @@ void alivenessWithCancelSignal(SeContainer container) {
         assertThat(bean.getEmitter2().isCancelled(), equalTo(Boolean.FALSE));
 
         bean.getSubscriber1().cancel();
-        assertMessagingHealth(DOWN, Map.of(
+        assertMessagingHealth(webTarget, DOWN, Map.of(
                 CHANNEL_1, DOWN,
                 CHANNEL_2, UP
         ));
         assertThat(bean.getEmitter1().isCancelled(), equalTo(Boolean.TRUE));
 
         bean.getSubscriber2().cancel();
-        assertMessagingHealth(DOWN, Map.of(
+        assertMessagingHealth(webTarget, DOWN, Map.of(
                 CHANNEL_1, DOWN,
                 CHANNEL_2, DOWN
         ));
         assertThat(bean.getEmitter2().isCancelled(), equalTo(Boolean.TRUE));
     }
 
-    private void assertMessagingHealth(HealthCheckResponse.Status rootState, Map<String, HealthCheckResponse.Status> channels) {
-        JsonObject messaging = getHealthCheck("messaging");
+    private void assertMessagingHealth(WebTarget webTarget, HealthCheckResponse.Status rootState, Map<String, HealthCheckResponse.Status> channels) {
+        JsonObject messaging = getHealthCheck(webTarget, "messaging");
         assertThat(messaging.getString("status"), equalTo(rootState.name()));
         JsonObject data = messaging.getJsonObject("data");
         channels.forEach((name, state) -> assertThat(data.getString(name), equalTo(state.name())));
     }
 
-    private JsonObject getHealthCheck(String checkName) {
-        try (Client client = ClientBuilder.newClient()) {
-            Response response = client.target("http://localhost:" + port).path("/health").request().get();
-            JsonObject jsonObject = response.readEntity(JsonObject.class);
-            return jsonObject.getValue("/checks")
-                             .asJsonArray().stream()
-                             .map(JsonValue::asJsonObject)
-                             .filter(check -> check.getString("name").equals(checkName))
-                             .findFirst()
-                             .orElseThrow(() -> new AssertionFailedError("Health check 'messaging' is missing!"));
-        }
+    private JsonObject getHealthCheck(WebTarget webTarget, String checkName) {
+        Response response = webTarget.path("/health").request().get();
+        JsonObject jsonObject = response.readEntity(JsonObject.class);
+        return jsonObject.getValue("/checks")
+                         .asJsonArray().stream()
+                         .map(JsonValue::asJsonObject)
+                         .filter(check -> check.getString("name").equals(checkName))
+                         .findFirst()
+                         .orElseThrow(() -> new AssertionFailedError("Health check 'messaging' is missing!"));
     }
 }