:ref: cleanup and tests for XmlPropertiesAdapter

Signed-off-by: dseurotech <davide.salvador@eurotech.com>

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

@@ -14,12 +14,12 @@
 
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.model.xml.XmlPropertyAdapted;
-import org.eclipse.kapua.model.xml.adapters.XmlPropertyAdapter;
+import org.eclipse.kapua.model.xml.adapters.ClassBasedXmlPropertyAdapterBase;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-public class PasswordPropertyAdapter extends XmlPropertyAdapter<Password> {
+public class PasswordPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Password> {
     private final CryptoUtil cryptoUtil;
 
     public PasswordPropertyAdapter(CryptoUtil cryptoUtil) {

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

@@ -12,90 +12,25 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+public interface XmlPropertyAdapted<T extends Enum<T>> {
 
-public abstract class XmlPropertyAdapted<T extends Enum<T>> {
-    /**
-     * The name of the property.
-     */
-    @XmlAttribute(name = "name")
-    private String name;
+    String getName();
 
-    /**
-     * Whether the property value is an array.
-     */
-    @XmlAttribute(name = "array")
-    private boolean array;
+    void setName(String name);
 
-    /**
-     * Whether the property value is encrypted.
-     */
-    @XmlAttribute(name = "encrypted")
-    private boolean encrypted;
+    boolean getArray();
 
-    /**
-     * The property type.
-     */
-    @XmlAttribute(name = "type")
-    private T type;
+    void setArray(boolean array);
 
-    /**
-     * The property value(s).
-     */
-    @XmlElement(name = "value")
-    private String[] values;
+    T getType();
 
-    public XmlPropertyAdapted() {
-    }
+    void setType(T type);
 
-    public XmlPropertyAdapted(String name,
-                              T type,
-                              String[] values) {
-        super();
+    boolean isEncrypted();
 
-        this.type = type;
-        this.values = values;
-        this.encrypted = false;
-    }
+    void setEncrypted(boolean encrypted);
 
-    public String getName() {
-        return name;
-    }
+    String[] getValues();
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean getArray() {
-        return array;
-    }
-
-    public void setArray(boolean array) {
-        this.array = array;
-    }
-
-    public T getType() {
-        return type;
-    }
-
-    public void setType(T type) {
-        this.type = type;
-    }
-
-    public boolean isEncrypted() {
-        return encrypted;
-    }
-
-    public void setEncrypted(boolean encrypted) {
-        this.encrypted = encrypted;
-    }
-
-    public String[] getValues() {
-        return values;
-    }
-
-    public void setValues(String[] values) {
-        this.values = values;
-    }
+    void setValues(String[] values);
 }

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class BooleanPropertyAdapter extends XmlPropertyAdapter<Boolean> {
+public class BooleanPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Boolean> {
 
     public BooleanPropertyAdapter() {
         super(Boolean.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class BytePropertyAdapter extends XmlPropertyAdapter<Byte> {
+public class BytePropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Byte> {
 
     public BytePropertyAdapter() {
         super(Byte.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class CharPropertyAdapter extends XmlPropertyAdapter<Character> {
+public class CharPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Character> {
 
     public CharPropertyAdapter() {
         super(Character.class);

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

@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2019, 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.model.xml.adapters;
+
+import org.eclipse.kapua.model.xml.XmlPropertyAdapted;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class ClassBasedXmlPropertyAdapterBase<T> implements XmlPropertyAdapter {
+
+    private final Class<T> clazz;
+
+    protected ClassBasedXmlPropertyAdapterBase(Class<T> clazz) {
+        this.clazz = clazz;
+    }
+
+    @Override
+    public boolean canMarshall(Class<?> objectClass) {
+        return objectClass.isArray() ? clazz.equals(objectClass.getComponentType()) : clazz.equals(objectClass);
+    }
+
+    @Override
+    public void marshallValues(XmlPropertyAdapted<?> property, Object value) {
+        if (!value.getClass().isArray()) {
+            property.setArray(false);
+            property.setEncrypted(false);
+            property.setValues(new String[]{marshallValue(value)});
+        } else {
+            property.setArray(true);
+            Object[] nativeValues = (Object[]) value;
+            String[] stringValues = new String[nativeValues.length];
+            for (int i = 0; i < nativeValues.length; i++) {
+                if (nativeValues[i] != null) {
+                    stringValues[i] = this.marshallValue(nativeValues[i]);
+                }
+            }
+            property.setValues(stringValues);
+        }
+    }
+
+    public String marshallValue(Object object) {
+        return object.toString();
+    }
+
+    public abstract T unmarshallValue(String value);
+
+    @Override
+    public Object unmarshallValues(XmlPropertyAdapted<?> property) {
+        if (!property.getArray()) {
+            return unmarshallValue(property.getValues()[0]);
+        } else {
+            final List<T> items = Arrays.stream(property.getValues()).map(this::unmarshallValue).collect(Collectors.toList());
+            return items.toArray((T[]) Array.newInstance(clazz, items.size()));
+        }
+    }
+
+}

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class DoublePropertyAdapter extends XmlPropertyAdapter<Double> {
+public class DoublePropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Double> {
 
     public DoublePropertyAdapter() {
         super(Double.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class FloatPropertyAdapter extends XmlPropertyAdapter<Float> {
+public class FloatPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Float> {
 
     public FloatPropertyAdapter() {
         super(Float.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class IntegerPropertyAdapter extends XmlPropertyAdapter<Integer> {
+public class IntegerPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Integer> {
 
     public IntegerPropertyAdapter() {
         super(Integer.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class LongPropertyAdapter extends XmlPropertyAdapter<Long> {
+public class LongPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Long> {
 
     public LongPropertyAdapter() {
         super(Long.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class ShortPropertyAdapter extends XmlPropertyAdapter<Short> {
+public class ShortPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Short> {
 
     public ShortPropertyAdapter() {
         super(Short.class);

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

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.xml.adapters;
 
-public class StringPropertyAdapter extends XmlPropertyAdapter<String> {
+public class StringPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<String> {
 
     public StringPropertyAdapter() {
         super(String.class);