aas-core-works / aas-core-codegen / 33978422058

85%

Build Type

push

github

Committed by web-flow

Commit Message

Simplify JSON and XML de/serialization in Java (#679)

We add generic ``parseArray``/``serializeArray`` helpers for JSON
list (de)serialization, replacing per-property inlined boilerplate
with shared calls.

We factor out a generic ``serializeElement`` helper for XML
serialization, mirroring C# (#676). It unifies the previously
duplicated ``writeStartElement``/``topLevel``/``writeEndElement``/
try-catch wrapping across all five property kinds (primitive,
enumeration, interface, concrete class, list), which also tightens
two branches' overly broad ``catch (Exception)`` down to ``catch
(XMLStreamException)``, matching what the other three branches
already did. A further ``serializeItems`` helper does the list-item
iteration generically as well, so every list-typed property collapses
to a single call instead of its own inlined ``for`` loop.

Rather than let the per-item and per-property content-writing logic
live on as duplicated lambda text at each call site, we follow the
shape of the merged C++ simplification (``SerializeBool``/
``SerializeInt64``/etc. plus a ``serialize_{enum}`` per enumeration):
we generate named methods once -- ``writeStringifiedContent``
(shared across ``boolean``/``long``/``double``/``String``, since
``Object.toString()`` is universal in Java, unlike C++),
``writeByteArrayContent``, and one ``write{Enum}Content`` per
enumeration and reference them via ``this::...`` from both the
standalone property and the list-item path.

A per-enum method is still needed there, even though the string
conversion itself is shared (see below), because Java resolves that
overload statically per concrete enum type, so a single generic wrapper
cannot call it.

We add ``Stringification.mustToString``, a per-enum helper that
returns the string representation of a literal or throws, and reuse
it for JSON's ``{enum}ToJsonValue`` and for XML's per-enum content
writer, removing three separate copies of the same
``Optional``-or-throw check.

We promote the ... (continued)

Coverage Stats

44 of 45 new or added lines in 5 files covered. (97.78%)

34 existing lines in 2 files now uncovered.

30924 of 36530 relevant lines covered (84.65%)

2.54 hits per line