From 7f1ad3957a78265e4660075427bd7d528762bfd7 Mon Sep 17 00:00:00 2001
From: Gwenneg Lepage <gwenneg@gmail.com>
Date: Mon, 26 Apr 2021 17:38:39 +0200
Subject: [PATCH] NOTIF-55 Migrate to resteasy-reactive and
 rest-client-reactive

---
 pom.xml                                          | 16 ++++------------
 .../notifications/events/EndpointProcessor.java  |  3 +--
 .../redhat/cloud/notifications/db/DbCleaner.java |  7 ++++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a92f6ee8f..76bfe1eb4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.platform.version>1.13.2.Final</quarkus.platform.version>
+        <quarkus.platform.version>1.13.3.Final</quarkus.platform.version>
         <quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
@@ -54,24 +54,20 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
+            <artifactId>quarkus-resteasy-reactive-qute</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-rest-client-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-context-propagation</artifactId>
@@ -112,10 +108,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-cache</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-qute</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-reactive</artifactId>
diff --git a/src/main/java/com/redhat/cloud/notifications/events/EndpointProcessor.java b/src/main/java/com/redhat/cloud/notifications/events/EndpointProcessor.java
index 2b38011356..c9ac236437 100644
--- a/src/main/java/com/redhat/cloud/notifications/events/EndpointProcessor.java
+++ b/src/main/java/com/redhat/cloud/notifications/events/EndpointProcessor.java
@@ -16,7 +16,6 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import org.hibernate.reactive.mutiny.Mutiny;
-import org.reactivestreams.Publisher;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
@@ -108,7 +107,7 @@ public EndpointTypeProcessor endpointTypeToProcessor(EndpointType endpointType)
     // TODO [BG Phase 2] Delete this method
     public Multi<Endpoint> getEndpoints(String tenant, String bundleName, String applicationName, String eventTypeName) {
         return resources.getTargetEndpoints(tenant, bundleName, applicationName, eventTypeName)
-                .onItem().transformToMultiAndConcatenate((Function<Endpoint, Publisher<Endpoint>>) endpoint -> {
+                .onItem().transformToMultiAndConcatenate((Function<Endpoint, Multi<Endpoint>>) endpoint -> {
                     // If the tenant has a default endpoint for the eventType, then add the target endpoints here
                     if (endpoint.getType() == EndpointType.DEFAULT) {
                         return defaultProcessor.getDefaultEndpoints(endpoint);
diff --git a/src/test/java/com/redhat/cloud/notifications/db/DbCleaner.java b/src/test/java/com/redhat/cloud/notifications/db/DbCleaner.java
index 383980832b..e1c7884c53 100644
--- a/src/test/java/com/redhat/cloud/notifications/db/DbCleaner.java
+++ b/src/test/java/com/redhat/cloud/notifications/db/DbCleaner.java
@@ -50,8 +50,8 @@ public class DbCleaner {
      * is a temporary workaround to make our tests more reliable and easy to maintain.
      */
     @DELETE
-    public void clean() {
-        session.withTransaction(transaction -> deleteAllFrom(EmailAggregation.class)
+    public Uni<Void> clean() {
+        return session.withTransaction(transaction -> deleteAllFrom(EmailAggregation.class)
                 .chain(() -> deleteAllFrom(EmailSubscription.class))
                 .chain(() -> deleteAllFrom(NotificationHistory.class))
                 .chain(() -> deleteAllFrom(EndpointDefault.class)) // TODO [BG Phase 2] Delete this line
@@ -82,7 +82,8 @@ public void clean() {
                     eventType.setDescription(DEFAULT_EVENT_TYPE_DESCRIPTION);
                     return appResources.addEventTypeToApplication(app.getId(), eventType);
                 })
-        ).await().indefinitely();
+                .replaceWith(Uni.createFrom().voidItem())
+        );
     }
 
     private Uni<Integer> deleteAllFrom(Class<?> classname) {