Removed usage of deprecated DeviceCallExcecutor

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Aug 2, 2023 · d784254 · d784254
1 parent 6816868
commit d784254
Show file tree

Hide file tree

Showing 10 changed files with 349 additions and 82 deletions.
diff --git a/...main/java/org/eclipse/kapua/service/device/management/commons/call/DeviceCallBuilder.java b/...main/java/org/eclipse/kapua/service/device/management/commons/call/DeviceCallBuilder.java
@@ -82,20 +82,44 @@ public class DeviceCallBuilder<C extends KapuaRequestChannel, P extends KapuaReq
     private DeviceCallBuilder() {
     }
 
+    /**
+     * Instantiates a new {@link DeviceCallBuilder}.
+     *
+     * @return The newly instantiated {@link DeviceCallBuilder}.
+     * @since 1.4.0
+     */
     public static DeviceCallBuilder newBuilder() {
         return new DeviceCallBuilder();
     }
 
+    /**
+     * Configures the {@link KapuaRequestMessage} to send.
+     *
+     * @return The {@link DeviceCallBuilder} itself.
+     * @since 1.4.0
+     */
     public DeviceCallBuilder withRequestMessage(RQ requestMessage) {
         this.requestMessage = requestMessage;
         return this;
     }
 
+    /**
+     * Configures the timeout of the MQTT request-reply.
+     *
+     * @return The {@link DeviceCallBuilder} itself.
+     * @since 1.4.0
+     */
     public DeviceCallBuilder withTimeout(Long timeout) {
         this.timeout = timeout;
         return this;
     }
 
+    /**
+     * Configures the timeout of the MQTT request-reply and sets the {@link #DEFAULT_TIMEOUT} if provided timeout is {@code null}.
+     *
+     * @return The {@link DeviceCallBuilder} itself.
+     * @since 1.4.0
+     */
     public DeviceCallBuilder withTimeoutOrDefault(Long timeout) {
         this.timeout = timeout != null ? timeout : DEFAULT_TIMEOUT;
         return this;
@@ -110,7 +134,7 @@ public DeviceCallBuilder withTimeoutOrDefault(Long timeout) {
      * @throws DeviceNotConnectedException      If the {@link Device} is not {@link DeviceConnectionStatus#CONNECTED}.
      * @throws DeviceManagementTimeoutException If waiting of the {@link KapuaResponseMessage} goes on timeout.
      * @throws DeviceManagementSendException    If sending the {@link KapuaRequestMessage} goes on error.
-     * @since 1.0.0
+     * @since 1.4.0
      */
     public RS send() throws KapuaEntityNotFoundException, KapuaIllegalArgumentException, DeviceNotConnectedException, DeviceManagementTimeoutException, DeviceManagementSendException, TransportException {
 

diff --git a/...ipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java b/...ipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java
@@ -25,7 +25,7 @@
 import org.eclipse.kapua.service.device.management.asset.message.internal.AssetRequestPayload;
 import org.eclipse.kapua.service.device.management.asset.message.internal.AssetResponseMessage;
 import org.eclipse.kapua.service.device.management.commons.AbstractDeviceManagementServiceImpl;
-import org.eclipse.kapua.service.device.management.commons.call.DeviceCallExecutor;
+import org.eclipse.kapua.service.device.management.commons.call.DeviceCallBuilder;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementRequestContentException;
 import org.eclipse.kapua.service.device.management.message.KapuaMethod;
 
@@ -77,10 +77,17 @@ public DeviceAssets get(KapuaId scopeId, KapuaId deviceId, DeviceAssets deviceAs
         assetRequestMessage.setPayload(assetRequestPayload);
         assetRequestMessage.setChannel(assetRequestChannel);
 
+        //
+        // Build call
+        DeviceCallBuilder<AssetRequestChannel, AssetRequestPayload, AssetRequestMessage, AssetResponseMessage> assetDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(assetRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do get
-        DeviceCallExecutor<?, ?, ?, AssetResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(assetRequestMessage, timeout);
-        AssetResponseMessage responseMessage = deviceApplicationCall.send();
+        AssetResponseMessage responseMessage = assetDeviceCallBuilder.send();
 
         //
         // Create event
@@ -125,10 +132,17 @@ public DeviceAssets read(KapuaId scopeId, KapuaId deviceId, DeviceAssets deviceA
         assetRequestMessage.setPayload(assetRequestPayload);
         assetRequestMessage.setChannel(assetRequestChannel);
 
+        //
+        // Build call
+        DeviceCallBuilder<AssetRequestChannel, AssetRequestPayload, AssetRequestMessage, AssetResponseMessage> assetDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(assetRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do read
-        DeviceCallExecutor<?, ?, ?, AssetResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(assetRequestMessage, timeout);
-        AssetResponseMessage responseMessage = deviceApplicationCall.send();
+        AssetResponseMessage responseMessage = assetDeviceCallBuilder.send();
 
         //
         // Create event
@@ -173,10 +187,17 @@ public DeviceAssets write(KapuaId scopeId, KapuaId deviceId, DeviceAssets device
         assetRequestMessage.setPayload(assetRequestPayload);
         assetRequestMessage.setChannel(assetRequestChannel);
 
+        //
+        // Build call
+        DeviceCallBuilder<AssetRequestChannel, AssetRequestPayload, AssetRequestMessage, AssetResponseMessage> assetDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(assetRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do write
-        DeviceCallExecutor<?, ?, ?, AssetResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(assetRequestMessage, timeout);
-        AssetResponseMessage responseMessage = deviceApplicationCall.send();
+        AssetResponseMessage responseMessage = assetDeviceCallBuilder.send();
 
         //
         // Create event

diff --git a/...se/kapua/service/device/management/bundle/internal/DeviceBundleManagementServiceImpl.java b/...se/kapua/service/device/management/bundle/internal/DeviceBundleManagementServiceImpl.java
@@ -26,7 +26,7 @@
 import org.eclipse.kapua.service.device.management.bundle.message.internal.BundleRequestPayload;
 import org.eclipse.kapua.service.device.management.bundle.message.internal.BundleResponseMessage;
 import org.eclipse.kapua.service.device.management.commons.AbstractDeviceManagementServiceImpl;
-import org.eclipse.kapua.service.device.management.commons.call.DeviceCallExecutor;
+import org.eclipse.kapua.service.device.management.commons.call.DeviceCallBuilder;
 import org.eclipse.kapua.service.device.management.message.KapuaMethod;
 
 import java.util.Date;
@@ -70,10 +70,17 @@ public DeviceBundles get(KapuaId scopeId, KapuaId deviceId, Long timeout)
         bundleRequestMessage.setPayload(bundleRequestPayload);
         bundleRequestMessage.setChannel(bundleRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<BundleRequestChannel, BundleRequestPayload, BundleRequestMessage, BundleResponseMessage> bundleDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(bundleRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do get
-        DeviceCallExecutor<?, ?, ?, BundleResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(bundleRequestMessage, timeout);
-        BundleResponseMessage responseMessage = deviceApplicationCall.send();
+        BundleResponseMessage responseMessage = bundleDeviceCallBuilder.send();
 
         //
         // Create event
@@ -115,10 +122,17 @@ public void start(KapuaId scopeId, KapuaId deviceId, String bundleId, Long timeo
         bundleRequestMessage.setPayload(bundleRequestPayload);
         bundleRequestMessage.setChannel(bundleRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<BundleRequestChannel, BundleRequestPayload, BundleRequestMessage, BundleResponseMessage> bundleDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(bundleRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do start
-        DeviceCallExecutor<?, ?, ?, BundleResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(bundleRequestMessage, timeout);
-        BundleResponseMessage responseMessage = deviceApplicationCall.send();
+        BundleResponseMessage responseMessage = bundleDeviceCallBuilder.send();
 
         //
         // Create event
@@ -160,10 +174,17 @@ public void stop(KapuaId scopeId, KapuaId deviceId, String bundleId, Long timeou
         bundleRequestMessage.setPayload(bundleRequestPayload);
         bundleRequestMessage.setChannel(bundleRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<BundleRequestChannel, BundleRequestPayload, BundleRequestMessage, BundleResponseMessage> bundleDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(bundleRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do stop
-        DeviceCallExecutor<?, ?, ?, BundleResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(bundleRequestMessage, timeout);
-        BundleResponseMessage responseMessage = deviceApplicationCall.send();
+        BundleResponseMessage responseMessage = bundleDeviceCallBuilder.send();
 
         //
         // Create event

diff --git a/.../kapua/service/device/management/command/internal/DeviceCommandManagementServiceImpl.java b/.../kapua/service/device/management/command/internal/DeviceCommandManagementServiceImpl.java
@@ -27,7 +27,7 @@
 import org.eclipse.kapua.service.device.management.command.message.internal.CommandResponseMessage;
 import org.eclipse.kapua.service.device.management.command.message.internal.CommandResponsePayload;
 import org.eclipse.kapua.service.device.management.commons.AbstractDeviceManagementServiceImpl;
-import org.eclipse.kapua.service.device.management.commons.call.DeviceCallExecutor;
+import org.eclipse.kapua.service.device.management.commons.call.DeviceCallBuilder;
 import org.eclipse.kapua.service.device.management.message.KapuaMethod;
 
 import java.util.Date;
@@ -79,10 +79,17 @@ public DeviceCommandOutput exec(KapuaId scopeId, KapuaId deviceId, DeviceCommand
         commandRequestMessage.setPayload(commandRequestPayload);
         commandRequestMessage.setChannel(commandRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<CommandRequestChannel, CommandRequestPayload, CommandRequestMessage, CommandResponseMessage> commandDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(commandRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do exec
-        DeviceCallExecutor<?, ?, ?, CommandResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(commandRequestMessage, timeout);
-        CommandResponseMessage responseMessage = deviceApplicationCall.send();
+        CommandResponseMessage responseMessage = commandDeviceCallBuilder.send();
 
         //
         // Create event

diff --git a/...ce/device/management/configuration/internal/DeviceConfigurationManagementServiceImpl.java b/...ce/device/management/configuration/internal/DeviceConfigurationManagementServiceImpl.java
@@ -21,7 +21,7 @@
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.device.management.DeviceManagementDomains;
 import org.eclipse.kapua.service.device.management.commons.AbstractDeviceManagementServiceImpl;
-import org.eclipse.kapua.service.device.management.commons.call.DeviceCallExecutor;
+import org.eclipse.kapua.service.device.management.commons.call.DeviceCallBuilder;
 import org.eclipse.kapua.service.device.management.commons.setting.DeviceManagementSetting;
 import org.eclipse.kapua.service.device.management.commons.setting.DeviceManagementSettingKey;
 import org.eclipse.kapua.service.device.management.configuration.DeviceComponentConfiguration;
@@ -84,10 +84,17 @@ public DeviceConfiguration get(KapuaId scopeId, KapuaId deviceId, String configu
         configurationRequestMessage.setPayload(configurationRequestPayload);
         configurationRequestMessage.setChannel(configurationRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<ConfigurationRequestChannel, ConfigurationRequestPayload, ConfigurationRequestMessage, ConfigurationResponseMessage> configurationDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(configurationRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do get
-        DeviceCallExecutor<?, ?, ?, ConfigurationResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(configurationRequestMessage, timeout);
-        ConfigurationResponseMessage responseMessage = deviceApplicationCall.send();
+        ConfigurationResponseMessage responseMessage = configurationDeviceCallBuilder.send();
 
         //
         // Create event
@@ -138,10 +145,17 @@ public void put(KapuaId scopeId, KapuaId deviceId, DeviceComponentConfiguration
         configurationRequestMessage.setPayload(configurationRequestPayload);
         configurationRequestMessage.setChannel(configurationRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<ConfigurationRequestChannel, ConfigurationRequestPayload, ConfigurationRequestMessage, ConfigurationResponseMessage> configurationDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(configurationRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do put
-        DeviceCallExecutor<?, ?, ?, ConfigurationResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(configurationRequestMessage, timeout);
-        ConfigurationResponseMessage responseMessage = deviceApplicationCall.send();
+        ConfigurationResponseMessage responseMessage = configurationDeviceCallBuilder.send();
 
         //
         // Create event
@@ -200,10 +214,17 @@ public void put(KapuaId scopeId, KapuaId deviceId, DeviceConfiguration deviceCon
         configurationRequestMessage.setPayload(configurationRequestPayload);
         configurationRequestMessage.setChannel(configurationRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<ConfigurationRequestChannel, ConfigurationRequestPayload, ConfigurationRequestMessage, ConfigurationResponseMessage> configurationDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(configurationRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do put
-        DeviceCallExecutor<?, ?, ?, ConfigurationResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(configurationRequestMessage, timeout);
-        ConfigurationResponseMessage responseMessage = deviceApplicationCall.send();
+        ConfigurationResponseMessage responseMessage = configurationDeviceCallBuilder.send();
 
         //
         // Create event

diff --git a/...apua/service/device/management/snapshot/internal/DeviceSnapshotManagementServiceImpl.java b/...apua/service/device/management/snapshot/internal/DeviceSnapshotManagementServiceImpl.java
@@ -19,7 +19,7 @@
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.device.management.DeviceManagementDomains;
 import org.eclipse.kapua.service.device.management.commons.AbstractDeviceManagementServiceImpl;
-import org.eclipse.kapua.service.device.management.commons.call.DeviceCallExecutor;
+import org.eclipse.kapua.service.device.management.commons.call.DeviceCallBuilder;
 import org.eclipse.kapua.service.device.management.configuration.internal.DeviceConfigurationAppProperties;
 import org.eclipse.kapua.service.device.management.message.KapuaMethod;
 import org.eclipse.kapua.service.device.management.snapshot.DeviceSnapshotManagementService;
@@ -67,10 +67,17 @@ public DeviceSnapshots get(KapuaId scopeId, KapuaId deviceId, Long timeout)
         snapshotRequestMessage.setPayload(snapshotRequestPayload);
         snapshotRequestMessage.setChannel(snapshotRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<SnapshotRequestChannel, SnapshotRequestPayload, SnapshotRequestMessage, SnapshotResponseMessage> snapshotDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(snapshotRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do get
-        DeviceCallExecutor<?, ?, ?, SnapshotResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(snapshotRequestMessage, timeout);
-        SnapshotResponseMessage responseMessage = deviceApplicationCall.send();
+        SnapshotResponseMessage responseMessage = snapshotDeviceCallBuilder.send();
 
         //
         // Create event
@@ -111,10 +118,17 @@ public void rollback(KapuaId scopeId, KapuaId deviceId, String snapshotId, Long
         snapshotRequestMessage.setPayload(snapshotRequestPayload);
         snapshotRequestMessage.setChannel(snapshotRequestChannel);
 
+        //
+        // Build request
+        DeviceCallBuilder<SnapshotRequestChannel, SnapshotRequestPayload, SnapshotRequestMessage, SnapshotResponseMessage> snapshotDeviceCallBuilder =
+                DeviceCallBuilder
+                        .newBuilder()
+                        .withRequestMessage(snapshotRequestMessage)
+                        .withTimeoutOrDefault(timeout);
+
         //
         // Do exec
-        DeviceCallExecutor<?, ?, ?, SnapshotResponseMessage> deviceApplicationCall = new DeviceCallExecutor<>(snapshotRequestMessage, timeout);
-        SnapshotResponseMessage responseMessage = deviceApplicationCall.send();
+        SnapshotResponseMessage responseMessage = snapshotDeviceCallBuilder.send();
 
         //
         // Create event