From 35a8b6dcee134e1ca64e2cc78f3fd9000c081edf Mon Sep 17 00:00:00 2001 From: hindujaB Date: Mon, 18 Nov 2024 22:57:11 +0530 Subject: [PATCH] Remove completable future usage with null --- .../stdlib/mqtt/caller/CallerActions.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/native/src/main/java/io/ballerina/stdlib/mqtt/caller/CallerActions.java b/native/src/main/java/io/ballerina/stdlib/mqtt/caller/CallerActions.java index 1667f50..2b69c4a 100644 --- a/native/src/main/java/io/ballerina/stdlib/mqtt/caller/CallerActions.java +++ b/native/src/main/java/io/ballerina/stdlib/mqtt/caller/CallerActions.java @@ -23,13 +23,11 @@ import io.ballerina.runtime.api.values.BObject; import io.ballerina.stdlib.mqtt.utils.MqttConstants; import io.ballerina.stdlib.mqtt.utils.MqttUtils; -import io.ballerina.stdlib.mqtt.utils.Util; import org.eclipse.paho.mqttv5.client.MqttClient; import org.eclipse.paho.mqttv5.common.MqttException; import org.eclipse.paho.mqttv5.common.MqttMessage; import java.util.Objects; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -49,16 +47,14 @@ public static Object complete(Environment env, BObject callerObject) { int messageId = (int) callerObject.getNativeData(MqttConstants.MESSAGE_ID); int qos = (int) callerObject.getNativeData(MqttConstants.QOS); return env.yieldAndRun(() -> { - CompletableFuture future = new CompletableFuture<>(); executorService.execute(() -> { try { subscriber.messageArrivedComplete(messageId, qos); - future.complete(null); } catch (MqttException e) { - future.complete(MqttUtils.createMqttError(e)); + throw MqttUtils.createMqttError(e); } }); - return Util.getResult(future); + return null; }); } @@ -74,16 +70,14 @@ public static Object respond(Environment env, BObject callerObject, BMap message mqttMessage.getProperties().setCorrelationData(correlationData); } return env.yieldAndRun(() -> { - CompletableFuture future = new CompletableFuture<>(); executorService.execute(() -> { try { subscriber.publish(responseTopic, mqttMessage); - future.complete(null); } catch (MqttException e) { - future.complete(MqttUtils.createMqttError(e)); + throw MqttUtils.createMqttError(e); } }); - return Util.getResult(future); + return null; }); } }