eclipse-aascw / aas-core-codegen / 36397783076

90%

Build Type

push

github

Committed by web-flow

Commit Message

Fix optional arguments and locals (#787)

The optional arguments of the verification functions, and the local
variables holding optional values, did not compile in Java, C++ and Go,
but no meta-model covered them so that went unnoticed.

Java declared an optional argument as ``Optional<String>`` without
importing ``Optional``, while the callers passed ``null`` for an empty
optional, and the body used the argument without ``.get()``. We keep
the nullability explicit: the callers pass on the ``Optional`` as-is,
wrap a non-optional value with ``Optional.of``, and the optional
arguments and locals are unwrapped like the optional properties:

    textIsShort(that.getOptionalText())
    return (!text.isPresent()) || StringHelpers.len(text.get()) <= 10;
    var note = item.getNote();

The hand-written snippet of ``ID_shorts_of_variables_are_unique`` in
the test data of ``aas_core_meta.v3`` now takes the ``Optional``'s as
well, instead of the nullable ``Iterable``'s. The snippet in
aas-core3.0-java needs the same change on the next re-generation.

C++ de-referenced an optional name without parentheses, so that
``*texts.size()`` and ``*item->name()`` accessed the optional itself.
We now always parenthesize the de-referenced value, ``(*texts).size()``.

Go de-referenced the value passed to an optional argument,
``TextIsShort(*that.OptionalText())``, and both sides of the assignment
to an optional local, ``*note := *item.Note()``. We now pass on
the pointer, and re-bind the pointer of a local, ``note := item.Note()``,
since writing through it would change the aliased property, while
Python only re-binds the name.

The new common meta-model ``optional_arguments`` covers the optional
arguments of all the kinds of types, their forwarding to another
verification function, and a local holding an optional property.

Coverage Stats

66 of 79 new or added lines in 4 files covered. (83.54%)

1 existing line in 1 file now uncovered.

41259 of 46609 relevant lines covered (88.52%)

2.66 hits per line