fix(deviceManagementConfiguration): fixed serialization of DeviceConfiguration of Password properties

commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/PasswordPropertyAdapter.java

@@ -32,6 +32,11 @@
         return Password.class.equals(objectClass);
     }
 
+    @Override
+    public boolean doesEncrypt() {
+        return true;
+    }
+
     @Override
     public String marshallValue(Object value) {
         return cryptoUtil.encodeBase64(value.toString());
@@ -42,6 +47,7 @@
         return new Password(cryptoUtil.decodeBase64(value));
     }
 
+    @Override
     public Object unmarshallValues(XmlPropertyAdapted<?> property) {
         if (!property.getArray()) {
             return property.isEncrypted() ? unmarshallValue(property.getValues()[0]) : new Password(property.getValues()[0]);

service/api/src/main/java/org/eclipse/kapua/model/xml/adapters/ClassBasedXmlPropertyAdapterBase.java

@@ -32,14 +32,20 @@
         return objectClass.isArray() ? clazz.equals(objectClass.getComponentType()) : clazz.equals(objectClass);
     }
 
+    @Override
+    public boolean doesEncrypt() {
+        return false;
+    }
+
     @Override
     public void marshallValues(XmlPropertyAdapted<?> property, Object value) {
         if (!value.getClass().isArray()) {
             property.setArray(false);
-            property.setEncrypted(false);
+            property.setEncrypted(doesEncrypt());
             property.setValues(new String[]{marshallValue(value)});
         } else {
             property.setArray(true);
+            property.setEncrypted(doesEncrypt());
             Object[] nativeValues = (Object[]) value;
             String[] stringValues = new String[nativeValues.length];
             for (int i = 0; i < nativeValues.length; i++) {

service/api/src/main/java/org/eclipse/kapua/model/xml/adapters/XmlPropertyAdapter.java

@@ -17,6 +17,8 @@
 public interface XmlPropertyAdapter {
     boolean canMarshall(Class<?> objectClass);
 
+    boolean doesEncrypt();
+
     void marshallValues(XmlPropertyAdapted<?> property, Object value);
 
     Object unmarshallValues(XmlPropertyAdapted<?> property);

service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/xml/KuraPasswordPropertyAdapter.java

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.device.call.kura.model.configuration.xml;
+
+import org.eclipse.kapua.commons.crypto.CryptoUtil;
+import org.eclipse.kapua.model.xml.XmlPropertyAdapted;
+import org.eclipse.kapua.model.xml.adapters.ClassBasedXmlPropertyAdapterBase;
+import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraPassword;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class KuraPasswordPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<KuraPassword> {
+    private final CryptoUtil cryptoUtil;
+
+    public KuraPasswordPropertyAdapter(CryptoUtil cryptoUtil) {
+        super(KuraPassword.class);
+        this.cryptoUtil = cryptoUtil;
+    }
+
+    @Override
+    public boolean canMarshall(Class objectClass) {
+        return KuraPassword.class.equals(objectClass);
+    }
+
+    @Override
+    public boolean doesEncrypt() {
+        return true;
+    }
+
+    @Override
+    public String marshallValue(Object value) {
+        return cryptoUtil.encodeBase64(value.toString());
+    }
+
+    @Override
+    public KuraPassword unmarshallValue(String value) {
+        return new KuraPassword(cryptoUtil.decodeBase64(value));
+    }
+
+    @Override
+    public Object unmarshallValues(XmlPropertyAdapted<?> property) {
+        if (!property.getArray()) {
+            return property.isEncrypted() ? unmarshallValue(property.getValues()[0]) : new KuraPassword(property.getValues()[0]);
+        } else {
+            return Arrays
+                    .stream(property.getValues())
+                    .map(value -> property.isEncrypted() ? unmarshallValue(value) : new KuraPassword(value))
+                    .collect(Collectors.toList()).toArray();
+        }
+    }
+}

service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/xml/KuraXmlConfigPropertiesAdapter.java

@@ -12,7 +12,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.call.kura.model.configuration.xml;
 
-import org.eclipse.kapua.commons.configuration.metatype.PasswordPropertyAdapter;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.model.xml.adapters.BooleanPropertyAdapter;
@@ -50,7 +49,7 @@ public class KuraXmlConfigPropertiesAdapter extends XmlAdapter<KuraXmlConfigProp
             put(ConfigPropertyType.charType, new CharPropertyAdapter());
             put(ConfigPropertyType.booleanType, new BooleanPropertyAdapter());
             put(ConfigPropertyType.shortType, new ShortPropertyAdapter());
-            put(ConfigPropertyType.passwordType, new PasswordPropertyAdapter(KapuaLocator.getInstance().getComponent(CryptoUtil.class)));
+            put(ConfigPropertyType.passwordType, new KuraPasswordPropertyAdapter(KapuaLocator.getInstance().getComponent(CryptoUtil.class)));
         }
     });