Issue #258: Handle Collection and Map types when converting annotated…

… properties for GetAll method call
hypfvieh · May 17, 2024 · cb77cfc · cb77cfc
1 parent fc6506c
commit cb77cfc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...va-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java b/...va-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java
@@ -122,6 +122,13 @@ protected PropHandled handleGetAll(ExportedObject _exportObject, final MethodCal
                         try {
                             _methodCall.setArgs(new Object[0]);
                             Object val = invokeMethod(_methodCall, propMeth, object);
+
+                            // when the value is a collection or map, wrap them in a proper variant type
+                            if (Collection.class.isInstance(val) || (Map.class.isInstance(val))) {
+                                String[] dataType = Marshalling.getDBusType(propEn.getValue().getGenericReturnType());
+                                val = new Variant<>(val, String.join("", dataType));
+                            }
+
                             resultMap.put(propEn.getKey().getName(), val);
                         } catch (Throwable _ex) {
                             getLogger().debug("Error executing method {} on method call {}", propMeth, _methodCall, _ex);