Issue #257: Fixed handling of Structs in InterfaceCodeGenerator

hypfvieh · May 17, 2024 · a59852f · a59852f
1 parent 0ffdb6f
commit a59852f
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/...java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java b/...java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java
@@ -368,6 +368,7 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
         _clzBldr.getImports().add(DBusProperty.Access.class.getCanonicalName());
 
         String type;
+        boolean isStruct = false;
         if ("av".equals(attrType)) {
             // raw type list
             type = List.class.getName();
@@ -380,6 +381,7 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
             // contains structure
             String structPart = attrType.replaceAll("(\\(.+\\))", "$1");
             type = buildStructClass(structPart, "Property" + attrName + "Struct", _clzBldr, additionalClasses);
+            isStruct = true;
         } else {
             type = TypeConverter.getJavaTypeFromDBusType(attrType, _clzBldr.getImports());
         }
@@ -390,30 +392,39 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
         boolean isComplex = type.contains("<");
 
         String clzzName;
+        ClassBuilderInfo propertyTypeRef = null;
+        String origType = null;
         if (!isComplex) {
             clzzName = ClassBuilderInfo.getClassName(type);
         } else {
+            origType = type;
             type = TypeRef.class.getName() + "<" + type + ">";
             String typeRefInterfaceName = "Property" + attrName + "Type";
-            ClassBuilderInfo propertyTypeRef = new ClassBuilderInfo();
+            propertyTypeRef = new ClassBuilderInfo();
             propertyTypeRef.setClassType(ClassType.INTERFACE);
             propertyTypeRef.setClassName(typeRefInterfaceName);
             propertyTypeRef.setExtendClass(type);
             _clzBldr.getInnerClasses().add(propertyTypeRef);
             clzzName = _clzBldr.getClassName() + "." + typeRefInterfaceName;
         }
 
-        String annotationParams = "name = \"" + attrName + "\", "
-                + "type = " + clzzName + ".class, "
-                + "access = " + DBusProperty.Access.class.getSimpleName() + "." + access;
-
         if (propertyMethods) {
             if (DBusProperty.Access.READ.getAccessName().equals(attrAccess)
                 || DBusProperty.Access.READ_WRITE.getAccessName().equals(attrAccess)) {
+
+                String rtnType = origType != null ? origType : clzzName;
+
                 ClassMethod classMethod = new ClassMethod(
-                   ("boolean".equalsIgnoreCase(clzzName) ? "is" :  "get") + attrName, clzzName, false);
-                    _clzBldr.getMethods().add(classMethod);
-                classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName());
+                    ("boolean".equalsIgnoreCase(clzzName) ? "is" : "get") + attrName, rtnType, false);
+                _clzBldr.getMethods().add(classMethod);
+
+                if (propertyTypeRef != null) {
+                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName() + "(type = " + propertyTypeRef.getClassName() + ".class)");
+                } else if (isStruct) {
+                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName() + "(type = " + clzzName + ".class)");
+                } else {
+                    classMethod.getAnnotations().add("@" + DBusBoundProperty.class.getSimpleName());
+                }
                 _clzBldr.getImports().add(DBusBoundProperty.class.getName());
             }
 
@@ -426,6 +437,10 @@ private List<ClassBuilderInfo> extractProperties(Element _propertyElement, Class
                 _clzBldr.getImports().add(DBusBoundProperty.class.getName());
             }
         } else {
+            String annotationParams = "name = \"" + attrName + "\", "
+                + "type = " + clzzName + ".class, "
+                + "access = " + DBusProperty.Access.class.getSimpleName() + "." + access;
+
             AnnotationInfo annotationInfo = new AnnotationInfo(DBusProperty.class, annotationParams);
             _clzBldr.getAnnotations().add(annotationInfo);
         }