Merge branch 'backport-4114' into release-1.6.x

eclipse · Oct 4, 2024 · 100ead3 · 100ead3
2 parents 97c6fca + 9a5cfbc
commit 100ead3
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/...clipse/kapua/translator/kura/kapua/inventory/AbstractTranslatorAppInventoryKuraKapua.java b/...clipse/kapua/translator/kura/kapua/inventory/AbstractTranslatorAppInventoryKuraKapua.java
@@ -140,12 +140,25 @@ protected DeviceInventoryContainers translate(KuraInventoryContainers kuraInvent
             deviceInventoryContainer.setVersion(kuraInventoryContainer.getVersion());
             deviceInventoryContainer.setContainerType(kuraInventoryContainer.getType());
 
-            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);
+            if (kuraInventoryContainer.getState() != null) {
+                switch (kuraInventoryContainer.getState()) {
+                    case "active":
+                        deviceInventoryContainer.setState(DeviceInventoryContainerState.ACTIVE);
+                        break;
+                    case "installed":
+                        deviceInventoryContainer.setState(DeviceInventoryContainerState.INSTALLED);
+                        break;
+                    case "uninstalled":
+                        deviceInventoryContainer.setState(DeviceInventoryContainerState.UNINSTALLED);
+                        break;
+                    case "unknown":
+                        deviceInventoryContainer.setState(DeviceInventoryContainerState.UNKNOWN);
+                        break;
+                    default: {
+                        LOG.warn("Unrecognised KuraInventoryContainer.state '{}' received. Defaulting to UNKNOWN state for DeviceInventoryContainer {}", kuraInventoryContainer.getState(), deviceInventoryContainer.getName());
+                        deviceInventoryContainer.setState(DeviceInventoryContainerState.UNKNOWN);
+                    }
+
                 }
             } else {
                 LOG.warn("Property KuraInventoryContainer.state '{}' not present. Defaulting to UNKNOWN state for DeviceInventoryContainer {}", kuraInventoryContainer.getState(), deviceInventoryContainer.getName());