Ensure fields annotated by @position are sorted by @position value an…

…d not by definition order
hypfvieh · Oct 30, 2024 · 09ba07e · 09ba07e
1 parent 80defd8
commit 09ba07e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java
@@ -278,6 +278,9 @@ private void createReturnArguments(Method _meth, StringBuilder _sb) throws DBusE
             argTypes = Arrays.stream(clz.getDeclaredFields())
                 .filter(f -> f.isAnnotationPresent(Position.class))
                 .filter(Objects::nonNull)
+                .map(f -> Map.entry(f.getAnnotation(Position.class).value(), f))
+                .sorted(Comparator.comparingInt(k -> k.getKey()))
+                .map(f -> f.getValue())
                 .map(Field::getType)
                 .map(Type.class::cast)
                 .toList();