diff --git a/pom.xml b/pom.xml
index 1a92f6ee8f..76bfe1eb4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
11
UTF-8
UTF-8
- 1.13.2.Final
+ 1.13.3.Final
${quarkus.platform.version}
quarkus-bom
io.quarkus
@@ -54,24 +54,20 @@
io.quarkus
- quarkus-resteasy
+ quarkus-resteasy-reactive-jackson
io.quarkus
- quarkus-rest-client
+ quarkus-resteasy-reactive-qute
io.quarkus
- quarkus-resteasy-jackson
+ quarkus-rest-client-reactive
io.quarkus
quarkus-mutiny
-
- io.quarkus
- quarkus-resteasy-mutiny
-
io.quarkus
quarkus-smallrye-context-propagation
@@ -112,10 +108,6 @@
io.quarkus
quarkus-cache
-
- io.quarkus
- quarkus-resteasy-qute
-
io.quarkus
quarkus-hibernate-reactive
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 getEndpoints(String tenant, String bundleName, String applicationName, String eventTypeName) {
return resources.getTargetEndpoints(tenant, bundleName, applicationName, eventTypeName)
- .onItem().transformToMultiAndConcatenate((Function>) endpoint -> {
+ .onItem().transformToMultiAndConcatenate((Function>) 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 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 deleteAllFrom(Class> classname) {