From 1e790cf99ddd949655a63c7d9d87a75a7cd8ea07 Mon Sep 17 00:00:00 2001
From: naveenad <4078118+naveenad@users.noreply.github.com>
Date: Mon, 20 May 2024 09:18:31 +0100
Subject: [PATCH] Updated to use GF 2.0 (#13)

Co-authored-by: GitLab <naveena.dhougoda-hamal@diffusiondata.com>
---
 .../adapter/human/HumanStreamingSourceHandler.java | 14 +++++++++++++-
 .../gateway/example/ExampleGatewayApplication.java |  3 ++-
 pom.xml                                            |  2 +-
 .../src/main/java/diffusion/Application.java       |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/human-diffusion-adapter/src/main/java/com/diffusiondata/example/adapter/human/HumanStreamingSourceHandler.java b/human-diffusion-adapter/src/main/java/com/diffusiondata/example/adapter/human/HumanStreamingSourceHandler.java
index 8a47d6e..1164ba3 100644
--- a/human-diffusion-adapter/src/main/java/com/diffusiondata/example/adapter/human/HumanStreamingSourceHandler.java
+++ b/human-diffusion-adapter/src/main/java/com/diffusiondata/example/adapter/human/HumanStreamingSourceHandler.java
@@ -32,7 +32,19 @@ public HumanStreamingSourceHandler(
         this.gui = new HumanGui(
             greeting,
             this.stateHandler::getState,
-            ev -> this.stateHandler.reportStatus(ev.getStatus(), ev.getTitle(), ev.getDescription())
+            ev -> {
+                try {
+                    return
+                        this
+                            .stateHandler
+                            .reportStatus(ev.getStatus(), ev.getTitle(), ev.getDescription())
+                            .get(5000, TimeUnit.MILLISECONDS);
+                }
+                catch (InterruptedException | ExecutionException |
+                       TimeoutException ex) {
+                    throw new IllegalStateException(ex);
+                }
+            }
         );
         this.gui.addSendEventHandler((ev) -> {
             try {
diff --git a/misc/src/main/java/com/diffusiondata/gateway/example/ExampleGatewayApplication.java b/misc/src/main/java/com/diffusiondata/gateway/example/ExampleGatewayApplication.java
index 3b201ce..f709129 100644
--- a/misc/src/main/java/com/diffusiondata/gateway/example/ExampleGatewayApplication.java
+++ b/misc/src/main/java/com/diffusiondata/gateway/example/ExampleGatewayApplication.java
@@ -64,7 +64,8 @@ public void initialize(
     }
 
     @Override
-    public GatewayMeterRegistry getGatewayMeterRegistry() {
+    public GatewayMeterRegistry initializeGatewayMeterRegistry(
+        Map<String, Object> globalParams) {
         return () -> meterRegistry;
     }
 
diff --git a/pom.xml b/pom.xml
index 6a3c3f3..4b4e90e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.diffusiondata.gateway</groupId>
             <artifactId>gateway-framework</artifactId>
-            <version>2.0.0_RC1</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
diff --git a/sample-diffusion-adapter/src/main/java/diffusion/Application.java b/sample-diffusion-adapter/src/main/java/diffusion/Application.java
index 7e7052a..5c91075 100644
--- a/sample-diffusion-adapter/src/main/java/diffusion/Application.java
+++ b/sample-diffusion-adapter/src/main/java/diffusion/Application.java
@@ -27,7 +27,8 @@ public class Application implements GatewayApplication {
         new JmxMeterRegistry(s -> null, Clock.SYSTEM);
 
     @Override
-    public GatewayMeterRegistry getGatewayMeterRegistry() {
+    public GatewayMeterRegistry initializeGatewayMeterRegistry(
+        Map<String, Object> globalParams) {
         return () -> meterRegistry;
     }