Upgrading to latest

Author: rosecky

build.gradle

@@ -27,8 +27,8 @@ wrapper {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'com.unblu.middleware:unblu-middleware-lib:1.8.0'
-    implementation 'com.unblu.openapi:jersey3-client-v4:8.24.0'
+    implementation 'com.unblu.middleware:unblu-middleware-lib:1.9.0'
+    implementation 'com.unblu.openapi:jersey3-client-v4:8.26.2'
     implementation 'org.projectlombok:lombok:1.18.34'
     annotationProcessor 'org.projectlombok:lombok:1.18.34'
 

src/main/java/com/unblu/middleware/test/TestMiddlewareService.java

@@ -4,7 +4,8 @@
 import com.unblu.middleware.bots.service.DialogBotService;
 import com.unblu.middleware.common.entity.ContextSpec;
 import com.unblu.middleware.webhooks.annotation.UnbluWebhooks;
-import com.unblu.middleware.webhooks.service.WebhookHandlerService;
+import com.unblu.middleware.webhooks.entity.WebhookHandlerOptions;
+import com.unblu.middleware.webhooks.service.WebhookHandler;
 import com.unblu.webapi.jersey.v4.api.BotsApi;
 import com.unblu.webapi.jersey.v4.invoker.ApiException;
 import com.unblu.webapi.model.v4.*;
@@ -16,7 +17,6 @@
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
-import static com.unblu.middleware.common.registry.RequestOrderSpec.canIgnoreOrder;
 import static com.unblu.middleware.webhooks.entity.EventName.eventName;
 
 @Service
@@ -28,31 +28,31 @@
 })
 public class TestMiddlewareService implements ApplicationRunner {
 
-    private final WebhookHandlerService webhookHandlerService;
+    private final WebhookHandler webhookHandler;
     private final DialogBotService dialogBotService;
     private final BotsApi botsApi;
 
     @Override
     public void run(ApplicationArguments args) {
         // accept every onboarding offer
         dialogBotService.acceptOnboardingOfferIf(_o -> Mono.just(true)
-                        .doOnNext(_r -> log.info("Accepting as usual")));
+                .doOnNext(_r -> log.info("Accepting as usual")));
 
         // greet the user when a dialog is opened
         dialogBotService.onDialogOpen(r ->
-                        Mono.fromRunnable(() -> sendMessage(r.getDialogToken(), "Hello, I am a bot!")));
+                Mono.fromRunnable(() -> sendMessage(r.getDialogToken(), "Hello, I am a bot!")));
 
         // echo every message back to the user
         dialogBotService.onDialogMessage(r ->
-                        Mono.fromRunnable(() -> echoIfSentByVisitor(r)));
+                Mono.fromRunnable(() -> echoIfSentByVisitor(r)));
 
         // log every message sent anywhere using a webhook handler
-        webhookHandlerService.onWebhook(eventName("conversation.new_message"), ConversationNewMessageEvent.class,
+        webhookHandler.onWebhook(eventName("conversation.new_message"), ConversationNewMessageEvent.class,
                 e -> Mono.fromRunnable(() -> log.info("Message received: {}", e.getConversationMessage().getFallbackText())),
-                canIgnoreOrder(),
-                ContextSpec.of(
-                        "conversationId", it -> it.getConversationMessage().getConversationId()
-                ));
+                WebhookHandlerOptions.contextSpec(
+                        ContextSpec.of(
+                                "conversationId", it -> it.getConversationMessage().getConversationId()
+                        )));
     }
 
     private void echoIfSentByVisitor(BotDialogMessageRequest r) {