Fix methods returning tuples #147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DBus specification does allow methods that do not have the "direction" attribute on their args. These are threatened as "in". The InferfaceCodeGenerator did ignore method args that do not have a direction set and no arguments where created on the java interface. With this commit now method args without a direction attribute are also threatened as if they'd had direction="in" set. Other values than "in" or "out" are still ignored.
Generated methods that have multiple "out" args solve this by having a *Tuple container class in java. This did not work. The generated return type of the method was the type of the first "out" arg in dbus. This is now fixed now the *Tuple class is the return type of a methode with multiple return values.
The generated extra Tuple classes were missing their member variables.
The generated Tuple classes were missing its constructor.
When generating a method and during this we have to generate an additional class, like when generating *Tuple classes, the @position annotation inside this additional class was not right. Every member had @position0 as its annotation. This is now fixed. We count the annotations upwards.
This import is used for Postion annotation and is included in generated classes. The wrong Position was imported. Now it uses the right one: org.freedesktop.dbus.annotations.Position
The arguments on Tuples constructor do not have to have the Position annotation. This does not compile. To achieve this we have to use new instances of the MemberOrArgument class for the constructor.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a number of things were neccessary to make methods that return Tuples work in InterfaceCodeGenerator.
It also fixes method args, that do not have an direction element, see third bullet here: https://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format