fix(deviceManageemnt): fixed required attributes for DeviceInventoryC…

…ontainer start and stop operations Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Jan 8, 2024 · 7850bf7 · 7850bf7
1 parent 586581c
commit 7850bf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ua/service/device/management/inventory/internal/DeviceInventoryManagementServiceImpl.java b/...ua/service/device/management/inventory/internal/DeviceInventoryManagementServiceImpl.java
@@ -330,8 +330,6 @@ public void execContainer(KapuaId scopeId, KapuaId deviceId, DeviceInventoryCont
         ArgumentValidator.notNull(deviceInventoryContainer, "deviceInventoryContainer");
         ArgumentValidator.notNull(deviceInventoryContainer.getName(), "deviceInventoryContainer.name");
         ArgumentValidator.notNull(deviceInventoryContainer.getVersion(), "deviceInventoryContainer.version");
-        ArgumentValidator.notNull(deviceInventoryContainer.getContainerType(), "deviceInventoryContainer.type");
-        ArgumentValidator.notNull(deviceInventoryContainer.getState(), "deviceInventoryContainer.state");
         ArgumentValidator.notNull(deviceInventoryContainerAction, "deviceInventoryContainerAction");
 
         //

diff --git a/...clipse/kapua/translator/kura/kapua/inventory/AbstractTranslatorAppInventoryKuraKapua.java b/...clipse/kapua/translator/kura/kapua/inventory/AbstractTranslatorAppInventoryKuraKapua.java
@@ -140,11 +140,13 @@ protected DeviceInventoryContainers translate(KuraInventoryContainers kuraInvent
             deviceInventoryContainer.setVersion(kuraInventoryContainer.getVersion());
             deviceInventoryContainer.setContainerType(kuraInventoryContainer.getType());
 
-            try {
-                deviceInventoryContainer.setState(DeviceInventoryContainerState.valueOf(kuraInventoryContainer.getState()));
-            } catch (IllegalArgumentException iae) {
-                LOG.warn("Unrecognised KuraInventoryContainer.state '{}' received. Defaulting to UNKNOWN state for DeviceInventoryContainer {}", kuraInventoryContainer.getState(), deviceInventoryContainer.getName(), iae);
-                deviceInventoryContainer.setState(DeviceInventoryContainerState.UNKNOWN);
+            if (deviceInventoryContainer.getState() != null) {
+                try {
+                    deviceInventoryContainer.setState(DeviceInventoryContainerState.valueOf(kuraInventoryContainer.getState()));
+                } catch (IllegalArgumentException iae) {
+                    LOG.warn("Unrecognised KuraInventoryContainer.state '{}' received. Defaulting to UNKNOWN state for DeviceInventoryContainer {}", kuraInventoryContainer.getState(), deviceInventoryContainer.getName(), iae);
+                    deviceInventoryContainer.setState(DeviceInventoryContainerState.UNKNOWN);
+                }
             }
 
             deviceInventoryContainers.addInventoryContainer(deviceInventoryContainer);