From f124fd5ff7f6717c10da0520b3a08be4c174e97b Mon Sep 17 00:00:00 2001 From: Tobias Langer Date: Mon, 16 Nov 2026 11:17:04 +0100 Subject: [PATCH 1/5] Add empty constructors for Java generation Until now the code generation for Java did not emit empty constructors. As Java does not permit to elide optional arguments, this made the construction of classes with only optional attributes tedious: users either had to use builders, or they had to provide a series of "null" values on construction. Furthermore, the pattern was inconsistent with how parameters are handled in general: we already generate constructors with only mandatory parameters, leaving out the optional ones. With this we address the issue and additionally generate empty constructors for classes for that all attributes are optinal. --- aas_core_codegen/java/lib/_generate_types.py | 18 ++++++------------ .../types/impl/AdministrativeInformation.java | 3 +++ .../aas_core/aas3_0/types/impl/Capability.java | 3 +++ .../aas3_0/types/impl/Environment.java | 3 +++ .../types/impl/MultiLanguageProperty.java | 3 +++ .../aas_core/aas3_0/types/impl/Operation.java | 3 +++ .../aas3_0/types/impl/ReferenceElement.java | 3 +++ .../types/impl/SubmodelElementCollection.java | 3 +++ .../java/dummy/types/impl/QueryCondition.java | 3 +++ .../main/java/dummy/types/impl/Container.java | 3 +++ .../main/java/dummy/types/impl/IecContent.java | 3 +++ .../src/main/java/dummy/types/impl/Branch.java | 3 +++ .../src/main/java/dummy/types/impl/Leaf.java | 3 +++ 13 files changed, 42 insertions(+), 12 deletions(-) diff --git a/aas_core_codegen/java/lib/_generate_types.py b/aas_core_codegen/java/lib/_generate_types.py index 2a16de93b..4333c2c60 100644 --- a/aas_core_codegen/java/lib/_generate_types.py +++ b/aas_core_codegen/java/lib/_generate_types.py @@ -1053,8 +1053,7 @@ def _generate_mandatory_constructor( """ Generate a default constructor for the given concrete class ``cls``. - Return empty string if there is an empty constructor or no default constructor - can be constructed. + Return empty string if there is an empty constructor. """ if ( len(cls.constructor.arguments) == 0 @@ -1062,12 +1061,6 @@ def _generate_mandatory_constructor( ): return Stripped(""), None - if all( - isinstance(arg.type_annotation, intermediate.OptionalTypeAnnotation) - for arg in cls.constructor.arguments - ): - return Stripped(""), None - cls_name = java_naming.class_name(cls.name) blocks: List[str] = [] @@ -1085,9 +1078,9 @@ def _generate_mandatory_constructor( arg_codes.append(Stripped(f"{arg_type} {arg_name}")) - assert len(arg_codes) > 0 - - if len(arg_codes) == 1: + if len(arg_codes) == 0: + blocks.append(f"public {cls_name}() {{") + elif len(arg_codes) == 1: blocks.append(f"public {cls_name}({arg_codes[0]}) {{") else: arg_block = ",\n".join(arg_codes) @@ -1170,7 +1163,8 @@ def _generate_mandatory_constructor( else: assert_never(stmt) - blocks.append("\n".join(textwrap.indent(stmt_code, I) for stmt_code in body)) + if len(body) > 0: + blocks.append("\n".join(textwrap.indent(stmt_code, I) for stmt_code in body)) blocks.append("}") diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/AdministrativeInformation.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/AdministrativeInformation.java index 8d3be7285..1669e4767 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/AdministrativeInformation.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/AdministrativeInformation.java @@ -75,6 +75,9 @@ public class AdministrativeInformation implements IAdministrativeInformation { */ private String templateId; + public AdministrativeInformation() { + } + public AdministrativeInformation( List embeddedDataSpecifications, String version, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Capability.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Capability.java index 02de77be8..f32aa5109 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Capability.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Capability.java @@ -115,6 +115,9 @@ public class Capability implements ICapability { */ private List embeddedDataSpecifications; + public Capability() { + } + public Capability( List extensions, String category, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Environment.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Environment.java index a1d62b8f4..23b3130fd 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Environment.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Environment.java @@ -50,6 +50,9 @@ public class Environment implements IEnvironment { */ private List conceptDescriptions; + public Environment() { + } + public Environment( List assetAdministrationShells, List submodels, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/MultiLanguageProperty.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/MultiLanguageProperty.java index d2dd9b26f..8858daf24 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/MultiLanguageProperty.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/MultiLanguageProperty.java @@ -135,6 +135,9 @@ public class MultiLanguageProperty implements IMultiLanguageProperty { */ private IReference valueId; + public MultiLanguageProperty() { + } + public MultiLanguageProperty( List extensions, String category, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Operation.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Operation.java index a4b1dd96e..84c440cec 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Operation.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/Operation.java @@ -139,6 +139,9 @@ public class Operation implements IOperation { */ private List inoutputVariables; + public Operation() { + } + public Operation( List extensions, String category, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/ReferenceElement.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/ReferenceElement.java index aa0e01390..3f01017fc 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/ReferenceElement.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/ReferenceElement.java @@ -123,6 +123,9 @@ public class ReferenceElement implements IReferenceElement { */ private IReference value; + public ReferenceElement() { + } + public ReferenceElement( List extensions, String category, diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/SubmodelElementCollection.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/SubmodelElementCollection.java index 79bdfa28e..aee977abe 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/SubmodelElementCollection.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/types/impl/SubmodelElementCollection.java @@ -120,6 +120,9 @@ public class SubmodelElementCollection implements ISubmodelElementCollection { */ private List value; + public SubmodelElementCollection() { + } + public SubmodelElementCollection( List extensions, String category, diff --git a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/types/impl/QueryCondition.java b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/types/impl/QueryCondition.java index 6d3e0dd04..a321e6c5b 100644 --- a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/types/impl/QueryCondition.java +++ b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/types/impl/QueryCondition.java @@ -36,6 +36,9 @@ public class QueryCondition implements IQueryCondition { */ private String notEq; + public QueryCondition() { + } + public QueryCondition( String eq, String notEq) { diff --git a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/types/impl/Container.java b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/types/impl/Container.java index 180f19b8d..647db246b 100644 --- a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/types/impl/Container.java +++ b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/types/impl/Container.java @@ -32,6 +32,9 @@ public class Container implements IContainer { private List children; + public Container() { + } + public Container( String optionalText, List children) { diff --git a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/types/impl/IecContent.java b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/types/impl/IecContent.java index f912ca669..3fa2f0ff8 100644 --- a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/types/impl/IecContent.java +++ b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/types/impl/IecContent.java @@ -30,6 +30,9 @@ public class IecContent implements IIecContent { private List definition; + public IecContent() { + } + public IecContent(List definition) { this.definition = definition; } diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Branch.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Branch.java index ce6c57a72..906ed298e 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Branch.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Branch.java @@ -30,6 +30,9 @@ public class Branch implements IBranch { private List optionalChildren; + public Branch() { + } + public Branch(List optionalChildren) { this.optionalChildren = optionalChildren; } diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Leaf.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Leaf.java index c8e168468..272f67a63 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Leaf.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/types/impl/Leaf.java @@ -30,6 +30,9 @@ public class Leaf implements ILeaf { private IItem optionalItem; + public Leaf() { + } + public Leaf(IItem optionalItem) { this.optionalItem = optionalItem; } From 9367907f2fee614093267dc2b9ccb1d2931e74b6 Mon Sep 17 00:00:00 2001 From: Tobias Langer Date: Mon, 16 Nov 2026 12:57:37 +0100 Subject: [PATCH 2/5] Replace deprecated json node accessor for Java With more recent versions of `com.fasterxml.jackson.core` the `fields()` accessor for json nodes has become deprecated. Instead, these the properties are now accessible via the `properties()` method. Adapt the code generation accordingly. --- .../java/lib/_generate_jsonization.py | 2 +- .../aas3_0/jsonization/Jsonization.java | 76 +++++++++---------- .../java/dummy/jsonization/Jsonization.java | 8 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 6 +- .../java/dummy/jsonization/Jsonization.java | 4 +- .../java/dummy/jsonization/Jsonization.java | 4 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 12 +-- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 4 +- .../java/dummy/jsonization/Jsonization.java | 10 +-- .../java/dummy/jsonization/Jsonization.java | 6 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 18 ++--- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 8 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 12 +-- .../java/dummy/jsonization/Jsonization.java | 6 +- .../java/dummy/jsonization/Jsonization.java | 8 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 4 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 2 +- .../java/dummy/jsonization/Jsonization.java | 4 +- .../java/dummy/jsonization/Jsonization.java | 6 +- .../java/dummy/jsonization/Jsonization.java | 20 ++--- .../java/dummy/jsonization/Jsonization.java | 8 +- .../java/dummy/jsonization/Jsonization.java | 2 +- 43 files changed, 136 insertions(+), 136 deletions(-) diff --git a/aas_core_codegen/java/lib/_generate_jsonization.py b/aas_core_codegen/java/lib/_generate_jsonization.py index f3e60efa2..c7ef5dab2 100644 --- a/aas_core_codegen/java/lib/_generate_jsonization.py +++ b/aas_core_codegen/java/lib/_generate_jsonization.py @@ -863,7 +863,7 @@ def _generate_from_object_body( foreach_writer = io.StringIO() foreach_writer.write( f"""\ -for (Iterator> iterator = node.fields(); iterator.hasNext(); ) {{ +for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) {{ {I}final Map.Entry keyValue = iterator.next(); {I}final String key = keyValue.getKey(); """ diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/jsonization/Jsonization.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/jsonization/Jsonization.java index 4654296f8..ae93b1617 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/jsonization/Jsonization.java @@ -549,7 +549,7 @@ private static Reporting.Result tryExtensionFrom(JsonNode node) { String theValue = null; List theRefersTo = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -884,7 +884,7 @@ private static Reporting.Result tryAdministrativeInfo IReference theCreator = null; String theTemplateId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1026,7 +1026,7 @@ private static Reporting.Result tryQualifierFrom(JsonNode node) { String theValue = null; IReference theValueId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1149,7 +1149,7 @@ private static Reporting.Result tryAssetAdministration IReference theDerivedFrom = null; List theSubmodels = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1294,7 +1294,7 @@ private static Reporting.Result tryAssetInformationFrom(JsonNo String theAssetType = null; IResource theDefaultThumbnail = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1371,7 +1371,7 @@ private static Reporting.Result tryResourceFrom(JsonNode node) { String thePath = null; String theContentType = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1432,7 +1432,7 @@ private static Reporting.Result trySpecificAssetIdFrom(JsonNode List theSupplementalSemanticIds = null; IReference theExternalSubjectId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1538,7 +1538,7 @@ private static Reporting.Result trySubmodelFromObject(JsonNode node) { List theEmbeddedDataSpecifications = null; List theSubmodelElements = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1800,7 +1800,7 @@ private static Reporting.Result tryRelationshipElementFromO List theQualifiers = null; List theEmbeddedDataSpecifications = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1979,7 +1979,7 @@ private static Reporting.Result trySubmodelElementListFromO DataTypeDefXsd theValueTypeListElement = null; List theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2168,7 +2168,7 @@ private static Reporting.Result trySubmodelElementCol List theEmbeddedDataSpecifications = null; List theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2354,7 +2354,7 @@ private static Reporting.Result tryPropertyFromObject(JsonNode node) { String theValue = null; IReference theValueId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2524,7 +2524,7 @@ private static Reporting.Result tryMultiLanguagePropertyF List theValue = null; IReference theValueId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2682,7 +2682,7 @@ private static Reporting.Result tryRangeFromObject(JsonNode node) { String theMin = null; String theMax = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2851,7 +2851,7 @@ private static Reporting.Result tryReferenceElementFromObject( List theEmbeddedDataSpecifications = null; IReference theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -2998,7 +2998,7 @@ private static Reporting.Result tryBlobFromObject(JsonNode node) { List theEmbeddedDataSpecifications = null; byte[] theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -3158,7 +3158,7 @@ private static Reporting.Result tryFileFromObject(JsonNode node) { List theEmbeddedDataSpecifications = null; String theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -3319,7 +3319,7 @@ private static Reporting.Result tryAnnotatedRelati List theEmbeddedDataSpecifications = null; List theAnnotations = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -3494,7 +3494,7 @@ private static Reporting.Result tryEntityFromObject(JsonNode node) { String theGlobalAssetId = null; List theSpecificAssetIds = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -3683,7 +3683,7 @@ private static Reporting.Result tryEventPayloadFrom(JsonNode node) IReference theSubjectId = null; byte[] thePayload = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -3851,7 +3851,7 @@ private static Reporting.Result tryBasicEventElementFromObjec String theMinInterval = null; String theMaxInterval = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4074,7 +4074,7 @@ private static Reporting.Result tryOperationFromObject(JsonNode node) List theOutputVariables = null; List theInoutputVariables = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4217,7 +4217,7 @@ private static Reporting.Result tryOperationVariableFrom(Json ISubmodelElement theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4280,7 +4280,7 @@ private static Reporting.Result tryCapabilityFromObject(JsonNode nod List theQualifiers = null; List theEmbeddedDataSpecifications = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4416,7 +4416,7 @@ private static Reporting.Result tryConceptDescriptionFromObj List theEmbeddedDataSpecifications = null; List theIsCaseOf = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4545,7 +4545,7 @@ private static Reporting.Result tryReferenceFrom(JsonNode node) { List theKeys = null; IReference theReferredSemanticId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4608,7 +4608,7 @@ private static Reporting.Result tryKeyFrom(JsonNode node) { KeyTypes theType = null; String theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4714,7 +4714,7 @@ private static Reporting.Result tryLangStringNameTypeFrom(Js String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4767,7 +4767,7 @@ private static Reporting.Result tryLangStringTextTypeFrom(Js String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4821,7 +4821,7 @@ private static Reporting.Result tryEnvironmentFrom(JsonNode node) { List theSubmodels = null; List theConceptDescriptions = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4904,7 +4904,7 @@ private static Reporting.Result tryEmbeddedDataSpecif IReference theDataSpecification = null; IDataSpecificationContent theDataSpecificationContent = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -4972,7 +4972,7 @@ private static Reporting.Result tryLevelTypeFrom(JsonNode node) { Boolean theTyp = null; Boolean theMax = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5051,7 +5051,7 @@ private static Reporting.Result tryValueReferencePairFrom(Js String theValue = null; IReference theValueId = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5103,7 +5103,7 @@ private static Reporting.Result tryValueListFrom(JsonNode node) { List theValueReferencePairs = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5144,7 +5144,7 @@ private static Reporting.Result tryLangStri String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5197,7 +5197,7 @@ private static Reporting.Result tryLangStringSh String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5250,7 +5250,7 @@ private static Reporting.Result tryLangStringD String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -5328,7 +5328,7 @@ private static Reporting.Result tryDataSpecificationI String theValue = null; ILevelType theLevelType = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 76801025e..091a89651 100644 --- a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -397,7 +397,7 @@ private static Reporting.Result tryItemFrom(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -481,7 +481,7 @@ private static Reporting.Result tryChildAFromObject(JsonNode node) { Long theAOnly = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -548,7 +548,7 @@ private static Reporting.Result tryChildBFromObject(JsonNode node) { Long theBOnly = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -721,7 +721,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { byte[] theOptionalData = null; ParentOrItem theOptionalMember = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 25aef5c67..b3b9ea1c6 100644 --- a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -243,7 +243,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Long theOptionalNumber = null; Double theOptionalRatio = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java index ed579db44..26a3988ec 100644 --- a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -392,7 +392,7 @@ private static Reporting.Result tryChildAFromObject(JsonNode node) { Long theNumber = null; Long theAOnly = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -462,7 +462,7 @@ private static Reporting.Result tryChildBFrom(JsonNode node) { private static Reporting.Result tryChildBFromObject(JsonNode node) { Long theNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -508,7 +508,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { IParent theParent = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/jsonization/Jsonization.java index c004cf26a..46ae22065 100644 --- a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -294,7 +294,7 @@ private static Reporting.Result tryItemFrom(JsonNode node) { Kind theMaybeKind = null; List theMaybeTexts = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -374,7 +374,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theItems = null; IItem theMaybeItem = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 4ffdce926..402b9ba22 100644 --- a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -349,7 +349,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theKinds = null; List theOptionalTexts = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -410,7 +410,7 @@ private static Reporting.Result tryGroupedFrom(JsonNode node) { List> theGroups = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 007bbf8b7..f17ad2b50 100644 --- a/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -237,7 +237,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Long theCount = null; Double theRatio = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/jsonization/Jsonization.java index f6a91b6b2..acee5514b 100644 --- a/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -222,7 +222,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { SomeEnum theSomeEnum = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 815c37909..81f912319 100644 --- a/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -237,7 +237,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theSomeString = null; byte[] theSomeBytes = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 0ab4e1304..b371dcab2 100644 --- a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -172,7 +172,7 @@ private static Reporting.Result tryQueryConditionFrom(JsonNode n String theEq = null; String theNotEq = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 9d326e550..7b0e24db4 100644 --- a/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -365,7 +365,7 @@ private static Reporting.Result tryBranchFromObject(JsonNode node) { String theIdentifier = null; String theDescription = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -466,7 +466,7 @@ private static Reporting.Result tryLeafFromObject(JsonNode node) { String theDescription = null; Long theValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -552,7 +552,7 @@ private static Reporting.Result tryBlossomFromObject(JsonNode node) { Long theValue = null; String theDetails = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -673,7 +673,7 @@ private static Reporting.Result tryPlainMarkerFrom(JsonNode node) { * @param node JSON object to be parsed */ private static Reporting.Result tryPlainMarkerFromObject(JsonNode node) { - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); @@ -702,7 +702,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { INode theSomeChoice = null; IBranch theSomethingWithoutChoice = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -755,7 +755,7 @@ private static Reporting.Result tryContainerFrom(JsonNode node) { INode theNode = null; ISomething theSomething = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 10ac61218..c7d48a3cc 100644 --- a/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -155,7 +155,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { return notAJsonObject(node); } - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); diff --git a/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 91f6149c2..53a4dfb7b 100644 --- a/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -222,7 +222,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Result theSomeResult = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 5103523fb..929b20523 100644 --- a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -293,7 +293,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Tuple2 theSomePair = null; Double theSomeOptionalFloat = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java index b5b36203c..b21038432 100644 --- a/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -352,7 +352,7 @@ private static Reporting.Result tryItemFrom(JsonNode node) { List theTexts = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -394,7 +394,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theTexts = null; List theItems = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java index b9c4246ba..e2e0de6ca 100644 --- a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -389,7 +389,7 @@ private static Reporting.Result tryItemFrom(JsonNode node) { String theName = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -484,7 +484,7 @@ private static Reporting.Result tryChildAFromObject(JsonNode node) { Long theAOnly = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -551,7 +551,7 @@ private static Reporting.Result tryChildBFromObject(JsonNode node) { Long theBOnly = null; String theOptionalText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -618,7 +618,7 @@ private static Reporting.Result tryContainerFromObject(JsonNode node) String theOptionalText = null; List theChildren = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -671,7 +671,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { IParent theOptionalParent = null; List theParents = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 89ee29072..48538f24e 100644 --- a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -389,7 +389,7 @@ private static Reporting.Result tryBoxFromObject(JsonNode node) { String theLabel = null; Color theColor = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -456,7 +456,7 @@ private static Reporting.Result tryBagFromObject(JsonNode node) { String theLabel = null; List theTags = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -512,7 +512,7 @@ private static Reporting.Result tryContainerFrom(JsonNode node) { List theNames = null; List theItems = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/jsonization/Jsonization.java index b13b45f4b..7d0de66f6 100644 --- a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -305,7 +305,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Long theCount = null; Long theMaybeCount = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 6b7bec0cb..f815bf49e 100644 --- a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -184,7 +184,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theLongText = null; String theMaybeNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 869a464c4..c1ca81adb 100644 --- a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -350,7 +350,7 @@ private static Reporting.Result tryLeafFromObject(JsonNode node) { String theIdentifier = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -451,7 +451,7 @@ private static Reporting.Result tryOrderedContainerFromObject( List theChildren = null; Boolean theIsSorted = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -535,7 +535,7 @@ private static Reporting.Result tryUnorderedContainerFromObj String theIdentifier = null; List theChildren = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -605,7 +605,7 @@ private static Reporting.Result tryGlobalAttributeFrom(JsonNode private static Reporting.Result tryGlobalAttributeFromObject(JsonNode node) { String theKind = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -662,7 +662,7 @@ private static Reporting.Result tryLocalAttributeFrom(JsonNode n private static Reporting.Result tryLocalAttributeFromObject(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -765,7 +765,7 @@ private static Reporting.Result tryAttributeOperandFrom(JsonNo private static Reporting.Result tryAttributeOperandFromObject(JsonNode node) { AttributeItem theAttribute = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -822,7 +822,7 @@ private static Reporting.Result tryStringLiteralFrom(JsonNode nod private static Reporting.Result tryStringLiteralFromObject(JsonNode node) { String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -879,7 +879,7 @@ private static Reporting.Result tryNumberLiteralFrom(JsonNode nod private static Reporting.Result tryNumberLiteralFromObject(JsonNode node) { Double theNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1024,7 +1024,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theValues = null; IElement theOptionalElement = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java index e7986f171..1b15ca6e6 100644 --- a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -301,7 +301,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { ArrayNode theOptionalValues = null; ObjectNode theOptionalMapping = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 590dc7cab..f005f2113 100644 --- a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -434,7 +434,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theOptionalObjects = null; ObjectNode theOptionalObject = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 0d5c0ef52..3d8ef0bcd 100644 --- a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -298,7 +298,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { ObjectNode theOptionalMapping = null; JsonNode theOptionalValue = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 94e3fc3ec..c12144b27 100644 --- a/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -400,7 +400,7 @@ private static Reporting.Result trySomeItemFrom(JsonNode node) { private static Reporting.Result trySomeItemFromObject(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -457,7 +457,7 @@ private static Reporting.Result tryAnotherItemFrom(JsonNode node) { private static Reporting.Result tryAnotherItemFromObject(JsonNode node) { Long theSerialNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -499,7 +499,7 @@ private static Reporting.Result trySimpleFrom(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -540,7 +540,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theSomeItems = null; List theSomeSimples = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 28957ff9b..e221ff0be 100644 --- a/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -240,7 +240,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theSomeNames = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 97b4be756..042225535 100644 --- a/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -281,7 +281,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theSomeResults = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java index eb7d6fc13..4325b6e97 100644 --- a/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -333,7 +333,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theSomeStrings = null; List theSomeBytes = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/jsonization/Jsonization.java index a3ebe1612..ce58f8384 100644 --- a/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -330,7 +330,7 @@ private static Reporting.Result tryBoxFromObject(JsonNode node) { String theLabel = null; Long theSize = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 5a7d54232..489e64eae 100644 --- a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -313,7 +313,7 @@ private static Reporting.Result tryLangStringFrom(JsonNode node) { String theLanguage = null; String theText = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -365,7 +365,7 @@ private static Reporting.Result tryLangStringSetFrom(JsonNode nod List theLangStrings = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -448,7 +448,7 @@ private static Reporting.Result tryIecContentFrom(JsonNode node) { private static Reporting.Result tryIecContentFromObject(JsonNode node) { List theDefinition = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -499,7 +499,7 @@ private static Reporting.Result tryOtherContentFrom(JsonNode node) * @param node JSON object to be parsed */ private static Reporting.Result tryOtherContentFromObject(JsonNode node) { - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); @@ -527,7 +527,7 @@ private static Reporting.Result trySpecificationFrom(JsonNode nod IContent theContent = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -568,7 +568,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theLangStringSets = null; List theSpecifications = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 89c742916..aea46c852 100644 --- a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -685,7 +685,7 @@ private static Reporting.Result trySomeItemFrom(JsonNode node) { private static Reporting.Result trySomeItemFromObject(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -742,7 +742,7 @@ private static Reporting.Result tryAnotherItemFrom(JsonNode node) { private static Reporting.Result tryAnotherItemFromObject(JsonNode node) { Long theSerialNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -838,7 +838,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List> theGridOfUnions = null; List> theOptionalGridOfItems = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/jsonization/Jsonization.java index ac5507e85..9c6cfb371 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -398,7 +398,7 @@ private static Reporting.Result tryItemFrom(JsonNode node) { String theName = null; String theNote = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -490,7 +490,7 @@ private static Reporting.Result tryBranchFrom(JsonNode node) { private static Reporting.Result tryBranchFromObject(JsonNode node) { List theOptionalChildren = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -543,7 +543,7 @@ private static Reporting.Result tryLeafFrom(JsonNode node) { private static Reporting.Result tryLeafFromObject(JsonNode node) { IItem theOptionalItem = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -586,7 +586,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theOptionalTexts = null; Kind theOptionalKind = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 815c37909..81f912319 100644 --- a/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -237,7 +237,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theSomeString = null; byte[] theSomeBytes = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/jsonization/Jsonization.java index fb2bb381e..bd308ec92 100644 --- a/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -183,7 +183,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theRange = null; String theVoid = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 809f81e3a..56e3e15c5 100644 --- a/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -180,7 +180,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theSomething = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 99d4d0bbf..3130bd15d 100644 --- a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -454,7 +454,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { List theOptionalTexts = null; Kind theOptionalKind = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -608,7 +608,7 @@ private static Reporting.Result tryCollectionFrom(JsonNode node) { Set theOptionalTexts = null; Set theOptionalDirections = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 083e4a2a9..f64969ced 100644 --- a/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -184,7 +184,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theOtherWord = null; String theAmount = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java index cf191792c..20d93b2a4 100644 --- a/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -278,7 +278,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { String theName = null; Long theNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/jsonization/Jsonization.java index ae0cc0021..085b6e59f 100644 --- a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -434,7 +434,7 @@ private static Reporting.Result tryFirstFromObject(JsonNode node) { Long theCount = null; Kind theKind = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -516,7 +516,7 @@ private static Reporting.Result trySecondFromObject(JsonNode node) { String theNote = null; Kind theKind = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/jsonization/Jsonization.java index e0f4bf807..68ce75039 100644 --- a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -559,7 +559,7 @@ private static Reporting.Result trySomeItemFrom(JsonNode node) { private static Reporting.Result trySomeItemFromObject(JsonNode node) { String theName = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -616,7 +616,7 @@ private static Reporting.Result tryAnotherItemFrom(JsonNode node) { private static Reporting.Result tryAnotherItemFromObject(JsonNode node) { Long theSerialNumber = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -667,7 +667,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { Result> theTricky = null; Tuple2 theOptionalPair = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 348bb9127..bc01bc838 100644 --- a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -380,7 +380,7 @@ private static Reporting.Result tryStructuralFirstFrom(JsonNode String theUniqueToFirst = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -419,7 +419,7 @@ private static Reporting.Result tryStructuralSecondFrom(JsonNo String theUniqueToSecond = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -518,7 +518,7 @@ private static Reporting.Result tryMixedAbstractDesc String theUniqueToAbstractDescendantOne = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -557,7 +557,7 @@ private static Reporting.Result tryMixedAbstractDesc String theUniqueToAbstractDescendantTwo = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -640,7 +640,7 @@ private static Reporting.Result tryMixedConcreteWi private static Reporting.Result tryMixedConcreteWithDescendantsFromObject(JsonNode node) { String theSomeBaseProperty = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -699,7 +699,7 @@ private static Reporting.Result tryMixedConcr String theSomeBaseProperty = null; String theSomeChildProperty = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -754,7 +754,7 @@ private static Reporting.Result tryMixedConcreteLeafFrom(Json String theUniqueToConcreteLeaf = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -878,7 +878,7 @@ private static Reporting.Result tryModelTypedFirstFrom(JsonNode private static Reporting.Result tryModelTypedFirstFromObject(JsonNode node) { String theSomeProperty = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -935,7 +935,7 @@ private static Reporting.Result tryModelTypedSecondFrom(JsonNo private static Reporting.Result tryModelTypedSecondFromObject(JsonNode node) { String theSomeProperty = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -1095,7 +1095,7 @@ private static Reporting.Result trySomethingFrom(JsonNode node) { ModelTypedUnion theOptionalModelTypedProperty = null; List theOptionalListOverlappingProperty = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/jsonization/Jsonization.java index e5a583dd5..eabaa5c93 100644 --- a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -439,7 +439,7 @@ private static Reporting.Result trySomeItemFromObject(JsonNode node) { String theName = null; String theNickname = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -507,7 +507,7 @@ private static Reporting.Result trySpecialItemFromObject(JsonNode n Long theLevel = null; String theNickname = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -573,7 +573,7 @@ private static Reporting.Result tryContainerFrom(JsonNode node) { List theSomeItems = null; List theSpecialItems = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); @@ -634,7 +634,7 @@ private static Reporting.Result tryWrapperFrom(JsonNode node) { IContainer theContainer = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); diff --git a/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/jsonization/Jsonization.java b/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/jsonization/Jsonization.java index 01a9bc746..75fa61c4b 100644 --- a/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/jsonization/Jsonization.java +++ b/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/jsonization/Jsonization.java @@ -277,7 +277,7 @@ private static Reporting.Result tryBoxFromObject(JsonNode node) { String theNumber = null; String theCode = null; - for (Iterator> iterator = node.fields(); iterator.hasNext(); ) { + for (Iterator> iterator = node.properties().iterator(); iterator.hasNext(); ) { final Map.Entry keyValue = iterator.next(); final String key = keyValue.getKey(); final JsonNode value = keyValue.getValue(); From 60b3f9717c4f61a1aa5c626856b6f5024281f348 Mon Sep 17 00:00:00 2001 From: Tobias Langer Date: Mon, 16 Nov 2026 16:35:09 +0100 Subject: [PATCH 3/5] Fix broken link in Java doc comment The java doc comments for XmlCommon contained a broken link to a generic group of functions. This caused the documentation publishing step to break. Replace the link with rendering in mono-space font. --- aas_core_codegen/java/lib/_generate_xml_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aas_core_codegen/java/lib/_generate_xml_common.py b/aas_core_codegen/java/lib/_generate_xml_common.py index cc01872ce..77437c66d 100644 --- a/aas_core_codegen/java/lib/_generate_xml_common.py +++ b/aas_core_codegen/java/lib/_generate_xml_common.py @@ -670,7 +670,7 @@ def _generate_write_element(uses_json_types: bool) -> Stripped: *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {{@link #writeListOf}} in the generated writers). + * (see {{@code writeListOf}} in the generated writers). */ public static void writeElement( {I}String name, From 0241c3c107b86fd900a3f48c1c16e4b68120b593 Mon Sep 17 00:00:00 2001 From: Tobias Langer Date: Mon, 16 Nov 2026 16:50:14 +0100 Subject: [PATCH 4/5] Add missing import for Java XmlCommon Due to a missing import, the docs generation for Java failed, as a type referenced in the doc comments was unknown. --- aas_core_codegen/java/lib/_generate_xml_common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aas_core_codegen/java/lib/_generate_xml_common.py b/aas_core_codegen/java/lib/_generate_xml_common.py index 77437c66d..21a47fe89 100644 --- a/aas_core_codegen/java/lib/_generate_xml_common.py +++ b/aas_core_codegen/java/lib/_generate_xml_common.py @@ -876,6 +876,7 @@ def generate( Stripped("import javax.xml.stream.XMLStreamWriter;"), Stripped("import java.util.Optional;"), Stripped("import java.util.regex.Pattern;"), + Stripped(f"import {package}.types.model.*;"), Stripped(f"import {package}.reporting.Reporting;"), ] From 20d54f3d2a2a68d5e56b5c972213a38e8c00c76e Mon Sep 17 00:00:00 2001 From: Tobias Langer Date: Wed, 18 Nov 2026 14:54:09 +0100 Subject: [PATCH 5/5] Optimize handling of Optionals in Java The java code internally would wrap/unwrap optional properties multiple times. Introduce temporary variables & lambda accessors to skip these wrap/unwrap calls and prevent the associated allocations. --- .../java/lib/_generate_enhancing.py | 7 +- .../java/lib/_generate_verification.py | 91 +- .../aas_core/aas3_0/enhancing/_Wrapper.java | 1018 ++++---- .../aas3_0/verification/Verification.java | 2190 +++++++++-------- .../aas_core/aas3_0/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 12 +- .../java/dummy/verification/Verification.java | 36 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 20 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 6 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 6 +- .../java/dummy/verification/Verification.java | 13 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 4 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 1 + .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 1 + .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 18 +- .../java/dummy/verification/Verification.java | 50 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 7 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 7 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 7 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 6 +- .../java/dummy/verification/Verification.java | 13 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 17 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 12 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 26 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 14 +- .../java/dummy/verification/Verification.java | 17 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 7 +- .../java/dummy/verification/Verification.java | 11 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 19 +- .../java/dummy/verification/Verification.java | 54 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 26 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../java/dummy/verification/Verification.java | 13 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 7 +- .../java/dummy/verification/Verification.java | 10 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 27 +- .../java/dummy/verification/Verification.java | 22 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/enhancing/_Wrapper.java | 7 +- .../java/dummy/verification/Verification.java | 26 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- .../main/java/dummy/xmlcommon/XmlCommon.java | 3 +- 79 files changed, 2171 insertions(+), 1783 deletions(-) diff --git a/aas_core_codegen/java/lib/_generate_enhancing.py b/aas_core_codegen/java/lib/_generate_enhancing.py index 60308a550..82787e383 100644 --- a/aas_core_codegen/java/lib/_generate_enhancing.py +++ b/aas_core_codegen/java/lib/_generate_enhancing.py @@ -679,7 +679,7 @@ def _generate_transform(cls: intermediate.ConcreteClass) -> Stripped: optional = isinstance(prop.type_annotation, intermediate.OptionalTypeAnnotation) value_wrap = _generate_wrap_expr( - f"that.{getter_name}().get()" if optional else f"that.{getter_name}()", + "value" if optional else f"that.{getter_name}()", intermediate.beneath_optional(prop.type_annotation), descendability, ) @@ -694,11 +694,12 @@ def _generate_transform(cls: intermediate.ConcreteClass) -> Stripped: ) if optional: + # Call the getter only once as it allocates an ``Optional``. stmt = Stripped( f"""\ -if (that.{getter_name}().isPresent()) {{ +that.{getter_name}().ifPresent(value -> {{ {I}{indent_but_first_line(stmt, I)} -}}""" +}});""" ) blocks.append(stmt) diff --git a/aas_core_codegen/java/lib/_generate_verification.py b/aas_core_codegen/java/lib/_generate_verification.py index 5f30a5876..9c5f96a8f 100644 --- a/aas_core_codegen/java/lib/_generate_verification.py +++ b/aas_core_codegen/java/lib/_generate_verification.py @@ -7,6 +7,7 @@ import io import textwrap from typing import ( + Dict, List, Mapping, Optional, @@ -678,6 +679,33 @@ def _generate_enum_value_sets(symbol_table: intermediate.SymbolTable) -> Strippe return Stripped(writer.getvalue()) +class _HoistedOptionals: + """Collect the ``Optional`` properties of ``that`` which are read once.""" + + def __init__(self) -> None: + """Initialize with no properties hoisted.""" + self._declarations: Dict[Identifier, Stripped] = dict() + self._locals: Dict[Identifier, Stripped] = dict() + + def hoist(self, prop: intermediate.Property) -> Stripped: + """Declare the local variable for ``prop`` and return its name.""" + local = self._locals.get(prop.name, None) + if local is None: + local = Stripped(java_naming.variable_name(Identifier(f"that_{prop.name}"))) + prop_type = java_common.generate_type(prop.type_annotation) + getter_name = java_naming.getter_name(prop.name) + self._locals[prop.name] = local + self._declarations[prop.name] = Stripped( + f"final {prop_type} {local} = that.{getter_name}();" + ) + + return local + + def declarations(self) -> List[Stripped]: + """List the declarations of all the hoisted variables.""" + return list(self._declarations.values()) + + class _InvariantTranspiler(java_transpilation.Transpiler): def __init__( self, @@ -691,6 +719,7 @@ def __init__( environment: intermediate_type_inference.Environment, downcast_map: Mapping[parse_tree.Node, intermediate_type_inference.Downcast], symbol_table: intermediate.SymbolTable, + hoisted: _HoistedOptionals, ) -> None: """Initialize with the given values.""" java_transpilation.Transpiler.__init__( @@ -702,6 +731,38 @@ def __init__( ) self._symbol_table = symbol_table + self._hoisted = hoisted + + def transform_member( + self, node: parse_tree.Member + ) -> Tuple[Optional[Stripped], Optional[Error]]: + code, error = super().transform_member(node) + if error is not None: + return None, error + + assert code is not None + + # Every call of an optional getter allocates an ``Optional``, so we read + # each optional property of ``that`` once and refer to the local variable. + if ( + isinstance(node.instance, parse_tree.Name) + and node.instance.identifier == "self" + and self._optional_map[node] + ): + instance_type = intermediate_type_inference.beneath_optional( + self.type_map[node.instance] + ) + assert isinstance( + instance_type, intermediate_type_inference.OurTypeAnnotation + ) and isinstance(instance_type.our_type, intermediate.Class) + + prop = instance_type.our_type.properties_by_name[node.name] + local = self._hoisted.hoist(prop) + getter_call = f"that.{java_naming.getter_name(prop.name)}()" + assert code.startswith(getter_call), code + return Stripped(local + code[len(getter_call) :]), None + + return code, None def transform_name( self, node: parse_tree.Name @@ -742,8 +803,9 @@ def _transpile_invariant( invariant: intermediate.Invariant, symbol_table: intermediate.SymbolTable, type_inference: intermediate_type_inference.TypeInference, + hoisted: _HoistedOptionals, ) -> Tuple[Optional[Stripped], Optional[Error]]: - """Translate the invariant from the meta-model into C# code.""" + """Translate the invariant from the meta-model into Java code.""" inference = type_inference.by_invariant[invariant] environment = inference.environment_with_self type_map = inference.type_map @@ -768,6 +830,7 @@ def _transpile_invariant( environment=environment, downcast_map=inference.downcast_map, symbol_table=symbol_table, + hoisted=hoisted, ) expr, error = transpiler.transform(invariant.parsed.body) @@ -1123,6 +1186,7 @@ def _generate_transform_for_class( """Generate the transform method to errors for the given concrete class.""" errors: List[Error] = [] blocks: List[Stripped] = [] + hoisted = _HoistedOptionals() name = java_naming.class_name(cls.name) @@ -1131,6 +1195,7 @@ def _generate_transform_for_class( invariant=invariant, symbol_table=symbol_table, type_inference=type_inference, + hoisted=hoisted, ) if error is not None: errors.append( @@ -1159,9 +1224,11 @@ def _generate_transform_for_class( optional = isinstance(prop.type_annotation, intermediate.OptionalTypeAnnotation) - source_expr = ( - f"that.{getter_name}().get()" if optional else f"that.{getter_name}()" - ) + if optional: + local = hoisted.hoist(prop) + source_expr = f"{local}.get()" + else: + source_expr = f"that.{getter_name}()" block = Stripped( f"""\ @@ -1178,7 +1245,7 @@ def _generate_transform_for_class( if optional: block = Stripped( f"""\ -if (that.{getter_name}().isPresent()) {{ +if ({local}.isPresent()) {{ {I}{indent_but_first_line(block, I)} }}""" ) @@ -1208,6 +1275,13 @@ def _generate_transform_for_class( """ ) + for declaration in hoisted.declarations(): + writer.write(textwrap.indent(declaration, I)) + writer.write("\n") + + if len(hoisted.declarations()) > 0: + writer.write("\n") + for i, stmt in enumerate(blocks): if i > 0: writer.write("\n\n") @@ -1618,6 +1692,7 @@ def _generate_verify_constrained_primitive( invariant=invariant, symbol_table=symbol_table, type_inference=type_inference, + hoisted=_HoistedOptionals(), ) if error is not None: errors.append( @@ -1813,9 +1888,15 @@ def generate( ): imports.append(Stripped("import java.util.List;")) + # NOTE: + # The verification of a class reads its optional properties as ``Optional``. if any( isinstance(type_annotation, intermediate.OptionalTypeAnnotation) for type_annotation in signature_type_annotations + ) or any( + isinstance(prop.type_annotation, intermediate.OptionalTypeAnnotation) + for cls in symbol_table.concrete_classes + for prop in cls.properties ): imports.append(Stripped("import java.util.Optional;")) diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/enhancing/_Wrapper.java index 032449b43..f46438752 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/enhancing/_Wrapper.java @@ -34,18 +34,17 @@ public IClass transformExtension( ); } - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getRefersTo().isPresent()) { - that.setRefersTo(wrapListOf_IReference(that.getRefersTo().get())); - } + that.getRefersTo().ifPresent(value -> { + that.setRefersTo(wrapListOf_IReference(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -67,14 +66,14 @@ public IClass transformAdministrativeInformation( ); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getCreator().isPresent()) { - that.setCreator(wrap(that.getCreator().get())); - } + that.getCreator().ifPresent(value -> { + that.setCreator(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -96,18 +95,17 @@ public IClass transformQualifier( ); } - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getValueId().isPresent()) { - that.setValueId(wrap(that.getValueId().get())); - } + that.getValueId().ifPresent(value -> { + that.setValueId(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -129,38 +127,36 @@ public IClass transformAssetAdministrationShell( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getAdministration().isPresent()) { - that.setAdministration(wrap(that.getAdministration().get())); - } + that.getAdministration().ifPresent(value -> { + that.setAdministration(wrap(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getDerivedFrom().isPresent()) { - that.setDerivedFrom(wrap(that.getDerivedFrom().get())); - } + that.getDerivedFrom().ifPresent(value -> { + that.setDerivedFrom(wrap(value)); + }); that.setAssetInformation(wrap(that.getAssetInformation())); - if (that.getSubmodels().isPresent()) { - that.setSubmodels(wrapListOf_IReference(that.getSubmodels().get())); - } + that.getSubmodels().ifPresent(value -> { + that.setSubmodels(wrapListOf_IReference(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -182,14 +178,13 @@ public IClass transformAssetInformation( ); } - if (that.getSpecificAssetIds().isPresent()) { - that.setSpecificAssetIds( - wrapListOf_ISpecificAssetId(that.getSpecificAssetIds().get())); - } + that.getSpecificAssetIds().ifPresent(value -> { + that.setSpecificAssetIds(wrapListOf_ISpecificAssetId(value)); + }); - if (that.getDefaultThumbnail().isPresent()) { - that.setDefaultThumbnail(wrap(that.getDefaultThumbnail().get())); - } + that.getDefaultThumbnail().ifPresent(value -> { + that.setDefaultThumbnail(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -231,18 +226,17 @@ public IClass transformSpecificAssetId( ); } - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getExternalSubjectId().isPresent()) { - that.setExternalSubjectId(wrap(that.getExternalSubjectId().get())); - } + that.getExternalSubjectId().ifPresent(value -> { + that.setExternalSubjectId(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -264,46 +258,42 @@ public IClass transformSubmodel( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getAdministration().isPresent()) { - that.setAdministration(wrap(that.getAdministration().get())); - } + that.getAdministration().ifPresent(value -> { + that.setAdministration(wrap(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getSubmodelElements().isPresent()) { - that.setSubmodelElements( - wrapListOf_ISubmodelElement(that.getSubmodelElements().get())); - } + that.getSubmodelElements().ifPresent(value -> { + that.setSubmodelElements(wrapListOf_ISubmodelElement(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -325,37 +315,34 @@ public IClass transformRelationshipElement( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); that.setFirst(wrap(that.getFirst())); @@ -381,46 +368,42 @@ public IClass transformSubmodelElementList( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getSemanticIdListElement().isPresent()) { - that.setSemanticIdListElement( - wrap(that.getSemanticIdListElement().get())); - } + that.getSemanticIdListElement().ifPresent(value -> { + that.setSemanticIdListElement(wrap(value)); + }); - if (that.getValue().isPresent()) { - that.setValue(wrapListOf_ISubmodelElement(that.getValue().get())); - } + that.getValue().ifPresent(value -> { + that.setValue(wrapListOf_ISubmodelElement(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -442,41 +425,38 @@ public IClass transformSubmodelElementCollection( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getValue().isPresent()) { - that.setValue(wrapListOf_ISubmodelElement(that.getValue().get())); - } + that.getValue().ifPresent(value -> { + that.setValue(wrapListOf_ISubmodelElement(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -498,41 +478,38 @@ public IClass transformProperty( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getValueId().isPresent()) { - that.setValueId(wrap(that.getValueId().get())); - } + that.getValueId().ifPresent(value -> { + that.setValueId(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -554,45 +531,42 @@ public IClass transformMultiLanguageProperty( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getValue().isPresent()) { - that.setValue(wrapListOf_ILangStringTextType(that.getValue().get())); - } + that.getValue().ifPresent(value -> { + that.setValue(wrapListOf_ILangStringTextType(value)); + }); - if (that.getValueId().isPresent()) { - that.setValueId(wrap(that.getValueId().get())); - } + that.getValueId().ifPresent(value -> { + that.setValueId(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -614,37 +588,34 @@ public IClass transformRange( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -666,41 +637,38 @@ public IClass transformReferenceElement( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getValue().isPresent()) { - that.setValue(wrap(that.getValue().get())); - } + that.getValue().ifPresent(value -> { + that.setValue(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -722,37 +690,34 @@ public IClass transformBlob( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -774,37 +739,34 @@ public IClass transformFile( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -826,46 +788,42 @@ public IClass transformAnnotatedRelationshipElement( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); that.setFirst(wrap(that.getFirst())); that.setSecond(wrap(that.getSecond())); - if (that.getAnnotations().isPresent()) { - that.setAnnotations( - wrapListOf_IDataElement(that.getAnnotations().get())); - } + that.getAnnotations().ifPresent(value -> { + that.setAnnotations(wrapListOf_IDataElement(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -887,47 +845,42 @@ public IClass transformEntity( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getStatements().isPresent()) { - that.setStatements( - wrapListOf_ISubmodelElement(that.getStatements().get())); - } + that.getStatements().ifPresent(value -> { + that.setStatements(wrapListOf_ISubmodelElement(value)); + }); - if (that.getSpecificAssetIds().isPresent()) { - that.setSpecificAssetIds( - wrapListOf_ISpecificAssetId(that.getSpecificAssetIds().get())); - } + that.getSpecificAssetIds().ifPresent(value -> { + that.setSpecificAssetIds(wrapListOf_ISpecificAssetId(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -951,20 +904,19 @@ public IClass transformEventPayload( that.setSource(wrap(that.getSource())); - if (that.getSourceSemanticId().isPresent()) { - that.setSourceSemanticId(wrap(that.getSourceSemanticId().get())); - } + that.getSourceSemanticId().ifPresent(value -> { + that.setSourceSemanticId(wrap(value)); + }); that.setObservableReference(wrap(that.getObservableReference())); - if (that.getObservableSemanticId().isPresent()) { - that.setObservableSemanticId( - wrap(that.getObservableSemanticId().get())); - } + that.getObservableSemanticId().ifPresent(value -> { + that.setObservableSemanticId(wrap(value)); + }); - if (that.getSubjectId().isPresent()) { - that.setSubjectId(wrap(that.getSubjectId().get())); - } + that.getSubjectId().ifPresent(value -> { + that.setSubjectId(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -986,43 +938,40 @@ public IClass transformBasicEventElement( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); that.setObserved(wrap(that.getObserved())); - if (that.getMessageBroker().isPresent()) { - that.setMessageBroker(wrap(that.getMessageBroker().get())); - } + that.getMessageBroker().ifPresent(value -> { + that.setMessageBroker(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -1044,52 +993,46 @@ public IClass transformOperation( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getInputVariables().isPresent()) { - that.setInputVariables( - wrapListOf_IOperationVariable(that.getInputVariables().get())); - } + that.getInputVariables().ifPresent(value -> { + that.setInputVariables(wrapListOf_IOperationVariable(value)); + }); - if (that.getOutputVariables().isPresent()) { - that.setOutputVariables( - wrapListOf_IOperationVariable(that.getOutputVariables().get())); - } + that.getOutputVariables().ifPresent(value -> { + that.setOutputVariables(wrapListOf_IOperationVariable(value)); + }); - if (that.getInoutputVariables().isPresent()) { - that.setInoutputVariables( - wrapListOf_IOperationVariable(that.getInoutputVariables().get())); - } + that.getInoutputVariables().ifPresent(value -> { + that.setInoutputVariables(wrapListOf_IOperationVariable(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -1133,37 +1076,34 @@ public IClass transformCapability( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getSemanticId().isPresent()) { - that.setSemanticId(wrap(that.getSemanticId().get())); - } + that.getSemanticId().ifPresent(value -> { + that.setSemanticId(wrap(value)); + }); - if (that.getSupplementalSemanticIds().isPresent()) { - that.setSupplementalSemanticIds( - wrapListOf_IReference(that.getSupplementalSemanticIds().get())); - } + that.getSupplementalSemanticIds().ifPresent(value -> { + that.setSupplementalSemanticIds(wrapListOf_IReference(value)); + }); - if (that.getQualifiers().isPresent()) { - that.setQualifiers(wrapListOf_IQualifier(that.getQualifiers().get())); - } + that.getQualifiers().ifPresent(value -> { + that.setQualifiers(wrapListOf_IQualifier(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -1185,32 +1125,30 @@ public IClass transformConceptDescription( ); } - if (that.getExtensions().isPresent()) { - that.setExtensions(wrapListOf_IExtension(that.getExtensions().get())); - } + that.getExtensions().ifPresent(value -> { + that.setExtensions(wrapListOf_IExtension(value)); + }); - if (that.getDisplayName().isPresent()) { - that.setDisplayName( - wrapListOf_ILangStringNameType(that.getDisplayName().get())); - } + that.getDisplayName().ifPresent(value -> { + that.setDisplayName(wrapListOf_ILangStringNameType(value)); + }); - if (that.getDescription().isPresent()) { - that.setDescription( - wrapListOf_ILangStringTextType(that.getDescription().get())); - } + that.getDescription().ifPresent(value -> { + that.setDescription(wrapListOf_ILangStringTextType(value)); + }); - if (that.getAdministration().isPresent()) { - that.setAdministration(wrap(that.getAdministration().get())); - } + that.getAdministration().ifPresent(value -> { + that.setAdministration(wrap(value)); + }); - if (that.getEmbeddedDataSpecifications().isPresent()) { + that.getEmbeddedDataSpecifications().ifPresent(value -> { that.setEmbeddedDataSpecifications( - wrapListOf_IEmbeddedDataSpecification(that.getEmbeddedDataSpecifications().get())); - } + wrapListOf_IEmbeddedDataSpecification(value)); + }); - if (that.getIsCaseOf().isPresent()) { - that.setIsCaseOf(wrapListOf_IReference(that.getIsCaseOf().get())); - } + that.getIsCaseOf().ifPresent(value -> { + that.setIsCaseOf(wrapListOf_IReference(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -1232,9 +1170,9 @@ public IClass transformReference( ); } - if (that.getReferredSemanticId().isPresent()) { - that.setReferredSemanticId(wrap(that.getReferredSemanticId().get())); - } + that.getReferredSemanticId().ifPresent(value -> { + that.setReferredSemanticId(wrap(value)); + }); that.setKeys(wrapListOf_IKey(that.getKeys())); @@ -1318,19 +1256,18 @@ public IClass transformEnvironment( ); } - if (that.getAssetAdministrationShells().isPresent()) { + that.getAssetAdministrationShells().ifPresent(value -> { that.setAssetAdministrationShells( - wrapListOf_IAssetAdministrationShell(that.getAssetAdministrationShells().get())); - } + wrapListOf_IAssetAdministrationShell(value)); + }); - if (that.getSubmodels().isPresent()) { - that.setSubmodels(wrapListOf_ISubmodel(that.getSubmodels().get())); - } + that.getSubmodels().ifPresent(value -> { + that.setSubmodels(wrapListOf_ISubmodel(value)); + }); - if (that.getConceptDescriptions().isPresent()) { - that.setConceptDescriptions( - wrapListOf_IConceptDescription(that.getConceptDescriptions().get())); - } + that.getConceptDescriptions().ifPresent(value -> { + that.setConceptDescriptions(wrapListOf_IConceptDescription(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -1505,27 +1442,26 @@ public IClass transformDataSpecificationIec61360( that.setPreferredName( wrapListOf_ILangStringPreferredNameTypeIec61360(that.getPreferredName())); - if (that.getShortName().isPresent()) { - that.setShortName( - wrapListOf_ILangStringShortNameTypeIec61360(that.getShortName().get())); - } + that.getShortName().ifPresent(value -> { + that.setShortName(wrapListOf_ILangStringShortNameTypeIec61360(value)); + }); - if (that.getUnitId().isPresent()) { - that.setUnitId(wrap(that.getUnitId().get())); - } + that.getUnitId().ifPresent(value -> { + that.setUnitId(wrap(value)); + }); - if (that.getDefinition().isPresent()) { + that.getDefinition().ifPresent(value -> { that.setDefinition( - wrapListOf_ILangStringDefinitionTypeIec61360(that.getDefinition().get())); - } + wrapListOf_ILangStringDefinitionTypeIec61360(value)); + }); - if (that.getValueList().isPresent()) { - that.setValueList(wrap(that.getValueList().get())); - } + that.getValueList().ifPresent(value -> { + that.setValueList(wrap(value)); + }); - if (that.getLevelType().isPresent()) { - that.setLevelType(wrap(that.getLevelType().get())); - } + that.getLevelType().ifPresent(value -> { + that.setLevelType(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/verification/Verification.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/verification/Verification.java index 970d92c25..a7e6ac24b 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/verification/Verification.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/verification/Verification.java @@ -2076,9 +2076,15 @@ public Stream transformExtension( IExtension that) { Stream errorStream = Stream.empty(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatRefersTo = that.getRefersTo(); + final Optional thatValue = that.getValue(); + final Optional thatValueType = that.getValueType(); + if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2087,8 +2093,8 @@ public Stream transformExtension( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2097,8 +2103,8 @@ public Stream transformExtension( } if (!( - !(that.getRefersTo().isPresent()) - || (that.getRefersTo().get().size() >= 1))) { + !(thatRefersTo.isPresent()) + || (thatRefersTo.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2106,19 +2112,17 @@ public Stream transformExtension( } if (!( - !(that.getValue().isPresent()) - || valueConsistentWithXsdType( - that.getValue().orElse(null), - that.valueTypeOrDefault()))) { + !(thatValue.isPresent()) + || valueConsistentWithXsdType(thatValue.orElse(null), that.valueTypeOrDefault()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "The value must match the value type."))); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2127,9 +2131,9 @@ public Stream transformExtension( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -2147,9 +2151,9 @@ public Stream transformExtension( return error; })); - if (that.getValueType().isPresent()) { + if (thatValueType.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueType().get()) + Stream.of(thatValueType.get()) .flatMap(Verification::verifyDataTypeDefXsd) .map(error -> { error.prependSegment( @@ -2158,9 +2162,9 @@ public Stream transformExtension( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyValueDataType) .map(error -> { error.prependSegment( @@ -2169,9 +2173,9 @@ public Stream transformExtension( })); } - if (that.getRefersTo().isPresent()) { + if (thatRefersTo.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getRefersTo().get()) + Stream.of(thatRefersTo.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -2188,9 +2192,15 @@ public Stream transformAdministrativeInformation( IAdministrativeInformation that) { Stream errorStream = Stream.empty(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatRevision = that.getRevision(); + final Optional thatVersion = that.getVersion(); + final Optional thatCreator = that.getCreator(); + final Optional thatTemplateId = that.getTemplateId(); + if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2199,8 +2209,8 @@ public Stream transformAdministrativeInformation( } if (!( - !(that.getRevision().isPresent()) - || (that.getVersion().isPresent()))) { + !(thatRevision.isPresent()) + || (thatVersion.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2210,9 +2220,9 @@ public Stream transformAdministrativeInformation( "revision either. Revision is optional."))); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -2221,9 +2231,9 @@ public Stream transformAdministrativeInformation( })); } - if (that.getVersion().isPresent()) { + if (thatVersion.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getVersion().get()) + Stream.of(thatVersion.get()) .flatMap(Verification::verifyVersionType) .map(error -> { error.prependSegment( @@ -2232,9 +2242,9 @@ public Stream transformAdministrativeInformation( })); } - if (that.getRevision().isPresent()) { + if (thatRevision.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getRevision().get()) + Stream.of(thatRevision.get()) .flatMap(Verification::verifyRevisionType) .map(error -> { error.prependSegment( @@ -2243,9 +2253,9 @@ public Stream transformAdministrativeInformation( })); } - if (that.getCreator().isPresent()) { + if (thatCreator.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCreator().get()) + Stream.of(thatCreator.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2254,9 +2264,9 @@ public Stream transformAdministrativeInformation( })); } - if (that.getTemplateId().isPresent()) { + if (thatTemplateId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getTemplateId().get()) + Stream.of(thatTemplateId.get()) .flatMap(Verification::verifyIdentifier) .map(error -> { error.prependSegment( @@ -2273,9 +2283,15 @@ public Stream transformQualifier( IQualifier that) { Stream errorStream = Stream.empty(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional thatValue = that.getValue(); + final Optional thatKind = that.getKind(); + final Optional thatValueId = that.getValueId(); + if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2284,8 +2300,8 @@ public Stream transformQualifier( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2294,8 +2310,8 @@ public Stream transformQualifier( } if (!( - !(that.getValue().isPresent()) - || valueConsistentWithXsdType(that.getValue().orElse(null), that.getValueType()))) { + !(thatValue.isPresent()) + || valueConsistentWithXsdType(thatValue.orElse(null), that.getValueType()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2303,9 +2319,9 @@ public Stream transformQualifier( "the data type as defined in value type."))); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2314,9 +2330,9 @@ public Stream transformQualifier( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -2325,9 +2341,9 @@ public Stream transformQualifier( })); } - if (that.getKind().isPresent()) { + if (thatKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getKind().get()) + Stream.of(thatKind.get()) .flatMap(Verification::verifyQualifierKind) .map(error -> { error.prependSegment( @@ -2354,9 +2370,9 @@ public Stream transformQualifier( return error; })); - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyValueDataType) .map(error -> { error.prependSegment( @@ -2365,9 +2381,9 @@ public Stream transformQualifier( })); } - if (that.getValueId().isPresent()) { + if (thatValueId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueId().get()) + Stream.of(thatValueId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2384,9 +2400,19 @@ public Stream transformAssetAdministrationShell( IAssetAdministrationShell that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatSubmodels = that.getSubmodels(); + final Optional thatDerivedFrom = that.getDerivedFrom(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatAdministration = that.getAdministration(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2394,8 +2420,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2404,8 +2430,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2414,8 +2440,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2423,8 +2449,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2433,8 +2459,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2442,8 +2468,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2452,8 +2478,8 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getSubmodels().isPresent()) - || (that.getSubmodels().get().size() >= 1))) { + !(thatSubmodels.isPresent()) + || (thatSubmodels.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2461,9 +2487,9 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getDerivedFrom().isPresent()) + !(thatDerivedFrom.isPresent()) || isModelReferenceTo( - that.getDerivedFrom().orElse(null), + thatDerivedFrom.orElse(null), KeyTypes.ASSET_ADMINISTRATION_SHELL))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -2473,9 +2499,9 @@ public Stream transformAssetAdministrationShell( } if (!( - !(that.getSubmodels().isPresent()) + !(thatSubmodels.isPresent()) || ( - that.getSubmodels().get().stream().allMatch( + thatSubmodels.get().stream().allMatch( reference -> isModelReferenceTo(reference, KeyTypes.SUBMODEL)) ))) { errorStream = Stream.concat(errorStream, @@ -2484,9 +2510,9 @@ public Stream transformAssetAdministrationShell( "All submodels must be model references to a submodel."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -2495,9 +2521,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -2506,9 +2532,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -2517,9 +2543,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -2528,9 +2554,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -2539,9 +2565,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getAdministration().isPresent()) { + if (thatAdministration.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAdministration().get()) + Stream.of(thatAdministration.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2559,9 +2585,9 @@ public Stream transformAssetAdministrationShell( return error; })); - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -2570,9 +2596,9 @@ public Stream transformAssetAdministrationShell( })); } - if (that.getDerivedFrom().isPresent()) { + if (thatDerivedFrom.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDerivedFrom().get()) + Stream.of(thatDerivedFrom.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2590,9 +2616,9 @@ public Stream transformAssetAdministrationShell( return error; })); - if (that.getSubmodels().isPresent()) { + if (thatSubmodels.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSubmodels().get()) + Stream.of(thatSubmodels.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -2609,15 +2635,20 @@ public Stream transformAssetInformation( IAssetInformation that) { Stream errorStream = Stream.empty(); + final Optional> thatSpecificAssetIds = that.getSpecificAssetIds(); + final Optional thatGlobalAssetId = that.getGlobalAssetId(); + final Optional thatAssetType = that.getAssetType(); + final Optional thatDefaultThumbnail = that.getDefaultThumbnail(); + if (!( - !(that.getSpecificAssetIds().isPresent()) + !(thatSpecificAssetIds.isPresent()) || ( - that.getSpecificAssetIds().get().stream().allMatch( + thatSpecificAssetIds.get().stream().allMatch( specificAssetId -> !Objects.equals(specificAssetId.getName(), "globalAssetId") || ( - (that.getGlobalAssetId().isPresent()) + (thatGlobalAssetId.isPresent()) && Objects.equals(specificAssetId.getName(), "globalAssetId") - && Objects.equals(specificAssetId.getValue(), that.getGlobalAssetId().get()) + && Objects.equals(specificAssetId.getValue(), thatGlobalAssetId.get()) )) ))) { errorStream = Stream.concat(errorStream, @@ -2631,12 +2662,12 @@ public Stream transformAssetInformation( if (!( ( - (that.getGlobalAssetId().isPresent()) - || (that.getSpecificAssetIds().isPresent()) + (thatGlobalAssetId.isPresent()) + || (thatSpecificAssetIds.isPresent()) ) && ( - !(that.getSpecificAssetIds().isPresent()) - || (that.getSpecificAssetIds().get().size() >= 1) + !(thatSpecificAssetIds.isPresent()) + || (thatSpecificAssetIds.get().size() >= 1) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -2646,8 +2677,8 @@ public Stream transformAssetInformation( } if (!( - !(that.getSpecificAssetIds().isPresent()) - || (that.getSpecificAssetIds().get().size() >= 1))) { + !(thatSpecificAssetIds.isPresent()) + || (thatSpecificAssetIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2664,9 +2695,9 @@ public Stream transformAssetInformation( return error; })); - if (that.getGlobalAssetId().isPresent()) { + if (thatGlobalAssetId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getGlobalAssetId().get()) + Stream.of(thatGlobalAssetId.get()) .flatMap(Verification::verifyIdentifier) .map(error -> { error.prependSegment( @@ -2675,9 +2706,9 @@ public Stream transformAssetInformation( })); } - if (that.getSpecificAssetIds().isPresent()) { + if (thatSpecificAssetIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSpecificAssetIds().get()) + Stream.of(thatSpecificAssetIds.get()) .flatMap(Verification::verifyListOf_ISpecificAssetId) .map(error -> { error.prependSegment( @@ -2686,9 +2717,9 @@ public Stream transformAssetInformation( })); } - if (that.getAssetType().isPresent()) { + if (thatAssetType.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAssetType().get()) + Stream.of(thatAssetType.get()) .flatMap(Verification::verifyIdentifier) .map(error -> { error.prependSegment( @@ -2697,9 +2728,9 @@ public Stream transformAssetInformation( })); } - if (that.getDefaultThumbnail().isPresent()) { + if (thatDefaultThumbnail.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDefaultThumbnail().get()) + Stream.of(thatDefaultThumbnail.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2716,6 +2747,8 @@ public Stream transformResource( IResource that) { Stream errorStream = Stream.empty(); + final Optional thatContentType = that.getContentType(); + errorStream = Stream.concat(errorStream, Stream.of(that.getPath()) .flatMap(Verification::verifyPathType) @@ -2725,9 +2758,9 @@ public Stream transformResource( return error; })); - if (that.getContentType().isPresent()) { + if (thatContentType.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getContentType().get()) + Stream.of(thatContentType.get()) .flatMap(Verification::verifyContentType) .map(error -> { error.prependSegment( @@ -2744,9 +2777,13 @@ public Stream transformSpecificAssetId( ISpecificAssetId that) { Stream errorStream = Stream.empty(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional thatExternalSubjectId = that.getExternalSubjectId(); + if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2755,8 +2792,8 @@ public Stream transformSpecificAssetId( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2765,8 +2802,8 @@ public Stream transformSpecificAssetId( } if (!( - !(that.getExternalSubjectId().isPresent()) - || (that.getExternalSubjectId().get().getType() == ReferenceTypes.EXTERNAL_REFERENCE))) { + !(thatExternalSubjectId.isPresent()) + || (thatExternalSubjectId.get().getType() == ReferenceTypes.EXTERNAL_REFERENCE))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2774,9 +2811,9 @@ public Stream transformSpecificAssetId( "an external reference."))); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2785,9 +2822,9 @@ public Stream transformSpecificAssetId( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -2814,9 +2851,9 @@ public Stream transformSpecificAssetId( return error; })); - if (that.getExternalSubjectId().isPresent()) { + if (thatExternalSubjectId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExternalSubjectId().get()) + Stream.of(thatExternalSubjectId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -2833,9 +2870,22 @@ public Stream transformSubmodel( ISubmodel that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatSubmodelElements = that.getSubmodelElements(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatAdministration = that.getAdministration(); + final Optional thatKind = that.getKind(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2843,8 +2893,8 @@ public Stream transformSubmodel( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2853,8 +2903,8 @@ public Stream transformSubmodel( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2863,8 +2913,8 @@ public Stream transformSubmodel( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2872,8 +2922,8 @@ public Stream transformSubmodel( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2882,8 +2932,8 @@ public Stream transformSubmodel( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2891,8 +2941,8 @@ public Stream transformSubmodel( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2901,8 +2951,8 @@ public Stream transformSubmodel( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2911,8 +2961,8 @@ public Stream transformSubmodel( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2920,8 +2970,8 @@ public Stream transformSubmodel( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2930,8 +2980,8 @@ public Stream transformSubmodel( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2940,8 +2990,8 @@ public Stream transformSubmodel( } if (!( - !(that.getSubmodelElements().isPresent()) - || (that.getSubmodelElements().get().size() >= 1))) { + !(thatSubmodelElements.isPresent()) + || (thatSubmodelElements.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2950,9 +3000,9 @@ public Stream transformSubmodel( } if (!( - !(that.getSubmodelElements().isPresent()) + !(thatSubmodelElements.isPresent()) || ( - that.getSubmodelElements().get().stream().allMatch( + thatSubmodelElements.get().stream().allMatch( item -> item.getIdShort().isPresent()) ))) { errorStream = Stream.concat(errorStream, @@ -2965,8 +3015,8 @@ public Stream transformSubmodel( } if (!( - !(that.getSubmodelElements().isPresent()) - || idShortsAreUnique(that.getSubmodelElements().orElse(null)))) { + !(thatSubmodelElements.isPresent()) + || idShortsAreUnique(thatSubmodelElements.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -2976,11 +3026,11 @@ public Stream transformSubmodel( } if (!( - !(that.getSubmodelElements().isPresent()) + !(thatSubmodelElements.isPresent()) || ( !(that.kindOrDefault() != ModellingKind.TEMPLATE) || ( - that.getSubmodelElements().get().stream().allMatch( + thatSubmodelElements.get().stream().allMatch( submodelElement -> !(submodelElement.getQualifiers().isPresent()) || ( submodelElement.getQualifiers().get().stream().allMatch( @@ -3000,10 +3050,10 @@ public Stream transformSubmodel( } if (!( - !(that.getQualifiers().isPresent()) + !(thatQualifiers.isPresent()) || ( !( - that.getQualifiers().get().stream().anyMatch( + thatQualifiers.get().stream().anyMatch( qualifier -> qualifier.kindOrDefault() == QualifierKind.TEMPLATE_QUALIFIER) ) || (that.kindOrDefault() == ModellingKind.TEMPLATE) @@ -3017,9 +3067,9 @@ public Stream transformSubmodel( "shall be of kind template."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -3028,9 +3078,9 @@ public Stream transformSubmodel( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -3039,9 +3089,9 @@ public Stream transformSubmodel( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -3050,9 +3100,9 @@ public Stream transformSubmodel( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -3061,9 +3111,9 @@ public Stream transformSubmodel( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -3072,9 +3122,9 @@ public Stream transformSubmodel( })); } - if (that.getAdministration().isPresent()) { + if (thatAdministration.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAdministration().get()) + Stream.of(thatAdministration.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3092,9 +3142,9 @@ public Stream transformSubmodel( return error; })); - if (that.getKind().isPresent()) { + if (thatKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getKind().get()) + Stream.of(thatKind.get()) .flatMap(Verification::verifyModellingKind) .map(error -> { error.prependSegment( @@ -3103,9 +3153,9 @@ public Stream transformSubmodel( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3114,9 +3164,9 @@ public Stream transformSubmodel( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -3125,9 +3175,9 @@ public Stream transformSubmodel( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -3136,9 +3186,9 @@ public Stream transformSubmodel( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -3147,9 +3197,9 @@ public Stream transformSubmodel( })); } - if (that.getSubmodelElements().isPresent()) { + if (thatSubmodelElements.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSubmodelElements().get()) + Stream.of(thatSubmodelElements.get()) .flatMap(Verification::verifyListOf_ISubmodelElement) .map(error -> { error.prependSegment( @@ -3166,9 +3216,19 @@ public Stream transformRelationshipElement( IRelationshipElement that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3176,8 +3236,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3186,8 +3246,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3196,8 +3256,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3205,8 +3265,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3215,8 +3275,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3224,8 +3284,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3234,8 +3294,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3244,8 +3304,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3253,8 +3313,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3263,8 +3323,8 @@ public Stream transformRelationshipElement( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3272,9 +3332,9 @@ public Stream transformRelationshipElement( "at least one item."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -3283,9 +3343,9 @@ public Stream transformRelationshipElement( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -3294,9 +3354,9 @@ public Stream transformRelationshipElement( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -3305,9 +3365,9 @@ public Stream transformRelationshipElement( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -3316,9 +3376,9 @@ public Stream transformRelationshipElement( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -3327,9 +3387,9 @@ public Stream transformRelationshipElement( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3338,9 +3398,9 @@ public Stream transformRelationshipElement( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -3349,9 +3409,9 @@ public Stream transformRelationshipElement( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -3360,9 +3420,9 @@ public Stream transformRelationshipElement( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -3397,9 +3457,22 @@ public Stream transformSubmodelElementList( ISubmodelElementList that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatValue = that.getValue(); + final Optional thatSemanticIdListElement = that.getSemanticIdListElement(); + final Optional thatValueTypeListElement = that.getValueTypeListElement(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3407,8 +3480,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3417,8 +3490,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3427,8 +3500,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3436,8 +3509,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3446,8 +3519,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3455,8 +3528,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3465,8 +3538,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3475,8 +3548,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3484,8 +3557,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3494,8 +3567,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3504,8 +3577,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getValue().isPresent()) - || (that.getValue().get().size() >= 1))) { + !(thatValue.isPresent()) + || (thatValue.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3514,15 +3587,15 @@ public Stream transformSubmodelElementList( if (!( !( - (that.getValue().isPresent()) - && (that.getSemanticIdListElement().isPresent()) + (thatValue.isPresent()) + && (thatSemanticIdListElement.isPresent()) ) || ( - that.getValue().get().stream().allMatch( + thatValue.get().stream().allMatch( child -> !(child.getSemanticId().isPresent()) || referenceKeyValuesEqual( child.getSemanticId().orElse(null), - that.getSemanticIdListElement().orElse(null))) + thatSemanticIdListElement.orElse(null))) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -3533,8 +3606,8 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getValue().isPresent()) - || submodelElementsHaveIdenticalSemanticIds(that.getValue().orElse(null)))) { + !(thatValue.isPresent()) + || submodelElementsHaveIdenticalSemanticIds(thatValue.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3543,9 +3616,9 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getValue().isPresent()) + !(thatValue.isPresent()) || ( - that.getValue().get().stream().allMatch( + thatValue.get().stream().allMatch( element -> submodelElementIsOfType(element, that.getTypeValueListElement())) ))) { errorStream = Stream.concat(errorStream, @@ -3562,12 +3635,12 @@ public Stream transformSubmodelElementList( || that.getTypeValueListElement() == AasSubmodelElements.RANGE ) || ( - (that.getValueTypeListElement().isPresent()) + (thatValueTypeListElement.isPresent()) && ( - (!that.getValue().isPresent()) + (!thatValue.isPresent()) || propertiesOrRangesHaveValueType( - that.getValue().orElse(null), - that.getValueTypeListElement().orElse(null)) + thatValue.orElse(null), + thatValueTypeListElement.orElse(null)) ) ))) { errorStream = Stream.concat(errorStream, @@ -3580,9 +3653,9 @@ public Stream transformSubmodelElementList( } if (!( - !(that.getValue().isPresent()) + !(thatValue.isPresent()) || ( - that.getValue().get().stream().allMatch( + thatValue.get().stream().allMatch( element -> !element.getIdShort().isPresent()) ))) { errorStream = Stream.concat(errorStream, @@ -3593,9 +3666,9 @@ public Stream transformSubmodelElementList( "specified."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -3604,9 +3677,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -3615,9 +3688,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -3626,9 +3699,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -3637,9 +3710,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -3648,9 +3721,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3659,9 +3732,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -3670,9 +3743,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -3681,9 +3754,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -3692,9 +3765,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getSemanticIdListElement().isPresent()) { + if (thatSemanticIdListElement.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticIdListElement().get()) + Stream.of(thatSemanticIdListElement.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3712,9 +3785,9 @@ public Stream transformSubmodelElementList( return error; })); - if (that.getValueTypeListElement().isPresent()) { + if (thatValueTypeListElement.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueTypeListElement().get()) + Stream.of(thatValueTypeListElement.get()) .flatMap(Verification::verifyDataTypeDefXsd) .map(error -> { error.prependSegment( @@ -3723,9 +3796,9 @@ public Stream transformSubmodelElementList( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyListOf_ISubmodelElement) .map(error -> { error.prependSegment( @@ -3742,9 +3815,20 @@ public Stream transformSubmodelElementCollection( ISubmodelElementCollection that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatValue = that.getValue(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3752,8 +3836,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3762,8 +3846,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3772,8 +3856,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3781,8 +3865,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3791,8 +3875,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3800,8 +3884,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3810,8 +3894,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3820,8 +3904,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3829,8 +3913,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3839,8 +3923,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3849,8 +3933,8 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getValue().isPresent()) - || (that.getValue().get().size() >= 1))) { + !(thatValue.isPresent()) + || (thatValue.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -3858,9 +3942,9 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getValue().isPresent()) + !(thatValue.isPresent()) || ( - that.getValue().get().stream().allMatch( + thatValue.get().stream().allMatch( item -> item.getIdShort().isPresent()) ))) { errorStream = Stream.concat(errorStream, @@ -3873,17 +3957,17 @@ public Stream transformSubmodelElementCollection( } if (!( - !(that.getValue().isPresent()) - || idShortsAreUnique(that.getValue().orElse(null)))) { + !(thatValue.isPresent()) + || idShortsAreUnique(thatValue.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "ID-shorts of the value must be unique."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -3892,9 +3976,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -3903,9 +3987,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -3914,9 +3998,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -3925,9 +4009,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -3936,9 +4020,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -3947,9 +4031,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -3958,9 +4042,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -3969,9 +4053,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -3980,9 +4064,9 @@ public Stream transformSubmodelElementCollection( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyListOf_ISubmodelElement) .map(error -> { error.prependSegment( @@ -3999,9 +4083,21 @@ public Stream transformProperty( IProperty that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatValue = that.getValue(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatValueId = that.getValueId(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4009,8 +4105,8 @@ public Stream transformProperty( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4019,8 +4115,8 @@ public Stream transformProperty( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4029,8 +4125,8 @@ public Stream transformProperty( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4038,8 +4134,8 @@ public Stream transformProperty( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4048,8 +4144,8 @@ public Stream transformProperty( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4057,8 +4153,8 @@ public Stream transformProperty( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4067,8 +4163,8 @@ public Stream transformProperty( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4077,8 +4173,8 @@ public Stream transformProperty( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4086,8 +4182,8 @@ public Stream transformProperty( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4096,8 +4192,8 @@ public Stream transformProperty( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4106,8 +4202,8 @@ public Stream transformProperty( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4117,17 +4213,17 @@ public Stream transformProperty( } if (!( - !(that.getValue().isPresent()) - || valueConsistentWithXsdType(that.getValue().orElse(null), that.getValueType()))) { + !(thatValue.isPresent()) + || valueConsistentWithXsdType(thatValue.orElse(null), that.getValueType()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Value must be consistent with the value type."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -4136,9 +4232,9 @@ public Stream transformProperty( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -4147,9 +4243,9 @@ public Stream transformProperty( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -4158,9 +4254,9 @@ public Stream transformProperty( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -4169,9 +4265,9 @@ public Stream transformProperty( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -4180,9 +4276,9 @@ public Stream transformProperty( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4191,9 +4287,9 @@ public Stream transformProperty( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -4202,9 +4298,9 @@ public Stream transformProperty( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -4213,9 +4309,9 @@ public Stream transformProperty( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -4233,9 +4329,9 @@ public Stream transformProperty( return error; })); - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyValueDataType) .map(error -> { error.prependSegment( @@ -4244,9 +4340,9 @@ public Stream transformProperty( })); } - if (that.getValueId().isPresent()) { + if (thatValueId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueId().get()) + Stream.of(thatValueId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4263,9 +4359,21 @@ public Stream transformMultiLanguageProperty( IMultiLanguageProperty that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional> thatValue = that.getValue(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatValueId = that.getValueId(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4273,8 +4381,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4283,8 +4391,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4293,8 +4401,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4302,8 +4410,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4312,8 +4420,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4321,8 +4429,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4331,8 +4439,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4341,8 +4449,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4350,8 +4458,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4360,8 +4468,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4370,8 +4478,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4381,8 +4489,8 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getValue().isPresent()) - || langStringsHaveUniqueLanguages(that.getValue().orElse(null)))) { + !(thatValue.isPresent()) + || langStringsHaveUniqueLanguages(thatValue.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4390,17 +4498,17 @@ public Stream transformMultiLanguageProperty( } if (!( - !(that.getValue().isPresent()) - || (that.getValue().get().size() >= 1))) { + !(thatValue.isPresent()) + || (thatValue.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Value must be either not set or have at least one item."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -4409,9 +4517,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -4420,9 +4528,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -4431,9 +4539,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -4442,9 +4550,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -4453,9 +4561,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4464,9 +4572,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -4475,9 +4583,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -4486,9 +4594,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -4497,9 +4605,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -4508,9 +4616,9 @@ public Stream transformMultiLanguageProperty( })); } - if (that.getValueId().isPresent()) { + if (thatValueId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueId().get()) + Stream.of(thatValueId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4527,9 +4635,21 @@ public Stream transformRange( IRange that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatMax = that.getMax(); + final Optional thatMin = that.getMin(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4537,8 +4657,8 @@ public Stream transformRange( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4547,8 +4667,8 @@ public Stream transformRange( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4557,8 +4677,8 @@ public Stream transformRange( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4566,8 +4686,8 @@ public Stream transformRange( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4576,8 +4696,8 @@ public Stream transformRange( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4585,8 +4705,8 @@ public Stream transformRange( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4595,8 +4715,8 @@ public Stream transformRange( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4605,8 +4725,8 @@ public Stream transformRange( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4614,8 +4734,8 @@ public Stream transformRange( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4624,8 +4744,8 @@ public Stream transformRange( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4634,8 +4754,8 @@ public Stream transformRange( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4645,8 +4765,8 @@ public Stream transformRange( } if (!( - !(that.getMax().isPresent()) - || valueConsistentWithXsdType(that.getMax().orElse(null), that.getValueType()))) { + !(thatMax.isPresent()) + || valueConsistentWithXsdType(thatMax.orElse(null), that.getValueType()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4654,17 +4774,17 @@ public Stream transformRange( } if (!( - !(that.getMin().isPresent()) - || valueConsistentWithXsdType(that.getMin().orElse(null), that.getValueType()))) { + !(thatMin.isPresent()) + || valueConsistentWithXsdType(thatMin.orElse(null), that.getValueType()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Min must be consistent with the value type."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -4673,9 +4793,9 @@ public Stream transformRange( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -4684,9 +4804,9 @@ public Stream transformRange( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -4695,9 +4815,9 @@ public Stream transformRange( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -4706,9 +4826,9 @@ public Stream transformRange( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -4717,9 +4837,9 @@ public Stream transformRange( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4728,9 +4848,9 @@ public Stream transformRange( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -4739,9 +4859,9 @@ public Stream transformRange( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -4750,9 +4870,9 @@ public Stream transformRange( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -4770,9 +4890,9 @@ public Stream transformRange( return error; })); - if (that.getMin().isPresent()) { + if (thatMin.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMin().get()) + Stream.of(thatMin.get()) .flatMap(Verification::verifyValueDataType) .map(error -> { error.prependSegment( @@ -4781,9 +4901,9 @@ public Stream transformRange( })); } - if (that.getMax().isPresent()) { + if (thatMax.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMax().get()) + Stream.of(thatMax.get()) .flatMap(Verification::verifyValueDataType) .map(error -> { error.prependSegment( @@ -4800,9 +4920,20 @@ public Stream transformReferenceElement( IReferenceElement that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatValue = that.getValue(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4810,8 +4941,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4820,8 +4951,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4830,8 +4961,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4839,8 +4970,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4849,8 +4980,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4858,8 +4989,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4868,8 +4999,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4878,8 +5009,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4887,8 +5018,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4897,8 +5028,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4907,8 +5038,8 @@ public Stream transformReferenceElement( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -4917,9 +5048,9 @@ public Stream transformReferenceElement( "VARIABLE."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -4928,9 +5059,9 @@ public Stream transformReferenceElement( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -4939,9 +5070,9 @@ public Stream transformReferenceElement( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -4950,9 +5081,9 @@ public Stream transformReferenceElement( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -4961,9 +5092,9 @@ public Stream transformReferenceElement( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -4972,9 +5103,9 @@ public Stream transformReferenceElement( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -4983,9 +5114,9 @@ public Stream transformReferenceElement( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -4994,9 +5125,9 @@ public Stream transformReferenceElement( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -5005,9 +5136,9 @@ public Stream transformReferenceElement( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -5016,9 +5147,9 @@ public Stream transformReferenceElement( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -5035,9 +5166,20 @@ public Stream transformBlob( IBlob that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatValue = that.getValue(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5045,8 +5187,8 @@ public Stream transformBlob( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5055,8 +5197,8 @@ public Stream transformBlob( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5065,8 +5207,8 @@ public Stream transformBlob( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5074,8 +5216,8 @@ public Stream transformBlob( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5084,8 +5226,8 @@ public Stream transformBlob( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5093,8 +5235,8 @@ public Stream transformBlob( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5103,8 +5245,8 @@ public Stream transformBlob( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5113,8 +5255,8 @@ public Stream transformBlob( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5122,8 +5264,8 @@ public Stream transformBlob( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5132,8 +5274,8 @@ public Stream transformBlob( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5142,8 +5284,8 @@ public Stream transformBlob( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5152,9 +5294,9 @@ public Stream transformBlob( "VARIABLE."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -5163,9 +5305,9 @@ public Stream transformBlob( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -5174,9 +5316,9 @@ public Stream transformBlob( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -5185,9 +5327,9 @@ public Stream transformBlob( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -5196,9 +5338,9 @@ public Stream transformBlob( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -5207,9 +5349,9 @@ public Stream transformBlob( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -5218,9 +5360,9 @@ public Stream transformBlob( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -5229,9 +5371,9 @@ public Stream transformBlob( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -5240,9 +5382,9 @@ public Stream transformBlob( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -5251,9 +5393,9 @@ public Stream transformBlob( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyBlobType) .map(error -> { error.prependSegment( @@ -5279,9 +5421,20 @@ public Stream transformFile( IFile that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatValue = that.getValue(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5289,8 +5442,8 @@ public Stream transformFile( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5299,8 +5452,8 @@ public Stream transformFile( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5309,8 +5462,8 @@ public Stream transformFile( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5318,8 +5471,8 @@ public Stream transformFile( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5328,8 +5481,8 @@ public Stream transformFile( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5337,8 +5490,8 @@ public Stream transformFile( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5347,8 +5500,8 @@ public Stream transformFile( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5357,8 +5510,8 @@ public Stream transformFile( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5366,8 +5519,8 @@ public Stream transformFile( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5376,8 +5529,8 @@ public Stream transformFile( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5386,8 +5539,8 @@ public Stream transformFile( } if (!( - !(that.getCategory().isPresent()) - || Constants.validCategoriesForDataElement.contains(that.getCategory().get()))) { + !(thatCategory.isPresent()) + || Constants.validCategoriesForDataElement.contains(thatCategory.get()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5396,9 +5549,9 @@ public Stream transformFile( "VARIABLE."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -5407,9 +5560,9 @@ public Stream transformFile( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -5418,9 +5571,9 @@ public Stream transformFile( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -5429,9 +5582,9 @@ public Stream transformFile( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -5440,9 +5593,9 @@ public Stream transformFile( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -5451,9 +5604,9 @@ public Stream transformFile( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -5462,9 +5615,9 @@ public Stream transformFile( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -5473,9 +5626,9 @@ public Stream transformFile( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -5484,9 +5637,9 @@ public Stream transformFile( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -5495,9 +5648,9 @@ public Stream transformFile( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyPathType) .map(error -> { error.prependSegment( @@ -5523,9 +5676,20 @@ public Stream transformAnnotatedRelationshipElement( IAnnotatedRelationshipElement that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatAnnotations = that.getAnnotations(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5533,8 +5697,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5543,8 +5707,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5553,8 +5717,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5562,8 +5726,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5572,8 +5736,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5581,8 +5745,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5591,8 +5755,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5601,8 +5765,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5610,8 +5774,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5620,8 +5784,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5630,8 +5794,8 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getAnnotations().isPresent()) - || (that.getAnnotations().get().size() >= 1))) { + !(thatAnnotations.isPresent()) + || (thatAnnotations.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5640,9 +5804,9 @@ public Stream transformAnnotatedRelationshipElement( } if (!( - !(that.getAnnotations().isPresent()) + !(thatAnnotations.isPresent()) || ( - that.getAnnotations().get().stream().allMatch( + thatAnnotations.get().stream().allMatch( item -> item.getIdShort().isPresent()) ))) { errorStream = Stream.concat(errorStream, @@ -5654,9 +5818,9 @@ public Stream transformAnnotatedRelationshipElement( "be specified)."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -5665,9 +5829,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -5676,9 +5840,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -5687,9 +5851,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -5698,9 +5862,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -5709,9 +5873,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -5720,9 +5884,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -5731,9 +5895,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -5742,9 +5906,9 @@ public Stream transformAnnotatedRelationshipElement( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -5771,9 +5935,9 @@ public Stream transformAnnotatedRelationshipElement( return error; })); - if (that.getAnnotations().isPresent()) { + if (thatAnnotations.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAnnotations().get()) + Stream.of(thatAnnotations.get()) .flatMap(Verification::verifyListOf_IDataElement) .map(error -> { error.prependSegment( @@ -5790,9 +5954,22 @@ public Stream transformEntity( IEntity that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatStatements = that.getStatements(); + final Optional thatGlobalAssetId = that.getGlobalAssetId(); + final Optional> thatSpecificAssetIds = that.getSpecificAssetIds(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5800,8 +5977,8 @@ public Stream transformEntity( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5810,8 +5987,8 @@ public Stream transformEntity( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5820,8 +5997,8 @@ public Stream transformEntity( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5829,8 +6006,8 @@ public Stream transformEntity( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5839,8 +6016,8 @@ public Stream transformEntity( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5848,8 +6025,8 @@ public Stream transformEntity( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5858,8 +6035,8 @@ public Stream transformEntity( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5868,8 +6045,8 @@ public Stream transformEntity( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5877,8 +6054,8 @@ public Stream transformEntity( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5887,8 +6064,8 @@ public Stream transformEntity( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5897,8 +6074,8 @@ public Stream transformEntity( } if (!( - !(that.getStatements().isPresent()) - || (that.getStatements().get().size() >= 1))) { + !(thatStatements.isPresent()) + || (thatStatements.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5906,9 +6083,9 @@ public Stream transformEntity( } if (!( - !(that.getStatements().isPresent()) + !(thatStatements.isPresent()) || ( - that.getStatements().get().stream().allMatch( + thatStatements.get().stream().allMatch( item -> item.getIdShort().isPresent()) ))) { errorStream = Stream.concat(errorStream, @@ -5925,20 +6102,20 @@ public Stream transformEntity( that.getEntityType() == EntityType.SELF_MANAGED_ENTITY && ( ( - (that.getGlobalAssetId().isPresent()) - && (!that.getSpecificAssetIds().isPresent()) + (thatGlobalAssetId.isPresent()) + && (!thatSpecificAssetIds.isPresent()) ) || ( - (!that.getGlobalAssetId().isPresent()) - && (that.getSpecificAssetIds().isPresent()) - && that.getSpecificAssetIds().get().size() >= 1 + (!thatGlobalAssetId.isPresent()) + && (thatSpecificAssetIds.isPresent()) + && thatSpecificAssetIds.get().size() >= 1 ) ) ) || ( that.getEntityType() != EntityType.SELF_MANAGED_ENTITY - && (!that.getGlobalAssetId().isPresent()) - && (!that.getSpecificAssetIds().isPresent()) + && (!thatGlobalAssetId.isPresent()) + && (!thatSpecificAssetIds.isPresent()) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -5949,8 +6126,8 @@ public Stream transformEntity( } if (!( - !(that.getSpecificAssetIds().isPresent()) - || (that.getSpecificAssetIds().get().size() >= 1))) { + !(thatSpecificAssetIds.isPresent()) + || (thatSpecificAssetIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -5958,9 +6135,9 @@ public Stream transformEntity( "one item."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -5969,9 +6146,9 @@ public Stream transformEntity( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -5980,9 +6157,9 @@ public Stream transformEntity( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -5991,9 +6168,9 @@ public Stream transformEntity( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -6002,9 +6179,9 @@ public Stream transformEntity( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -6013,9 +6190,9 @@ public Stream transformEntity( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6024,9 +6201,9 @@ public Stream transformEntity( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -6035,9 +6212,9 @@ public Stream transformEntity( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -6046,9 +6223,9 @@ public Stream transformEntity( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -6057,9 +6234,9 @@ public Stream transformEntity( })); } - if (that.getStatements().isPresent()) { + if (thatStatements.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getStatements().get()) + Stream.of(thatStatements.get()) .flatMap(Verification::verifyListOf_ISubmodelElement) .map(error -> { error.prependSegment( @@ -6077,9 +6254,9 @@ public Stream transformEntity( return error; })); - if (that.getGlobalAssetId().isPresent()) { + if (thatGlobalAssetId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getGlobalAssetId().get()) + Stream.of(thatGlobalAssetId.get()) .flatMap(Verification::verifyIdentifier) .map(error -> { error.prependSegment( @@ -6088,9 +6265,9 @@ public Stream transformEntity( })); } - if (that.getSpecificAssetIds().isPresent()) { + if (thatSpecificAssetIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSpecificAssetIds().get()) + Stream.of(thatSpecificAssetIds.get()) .flatMap(Verification::verifyListOf_ISpecificAssetId) .map(error -> { error.prependSegment( @@ -6107,6 +6284,12 @@ public Stream transformEventPayload( IEventPayload that) { Stream errorStream = Stream.empty(); + final Optional thatSourceSemanticId = that.getSourceSemanticId(); + final Optional thatObservableSemanticId = that.getObservableSemanticId(); + final Optional thatTopic = that.getTopic(); + final Optional thatSubjectId = that.getSubjectId(); + final Optional thatPayload = that.getPayload(); + if (!( isModelReferenceTo(that.getSource(), KeyTypes.EVENT_ELEMENT) || isModelReferenceTo(that.getSource(), KeyTypes.BASIC_EVENT_ELEMENT))) { @@ -6134,9 +6317,9 @@ public Stream transformEventPayload( return error; })); - if (that.getSourceSemanticId().isPresent()) { + if (thatSourceSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSourceSemanticId().get()) + Stream.of(thatSourceSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6154,9 +6337,9 @@ public Stream transformEventPayload( return error; })); - if (that.getObservableSemanticId().isPresent()) { + if (thatObservableSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getObservableSemanticId().get()) + Stream.of(thatObservableSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6165,9 +6348,9 @@ public Stream transformEventPayload( })); } - if (that.getTopic().isPresent()) { + if (thatTopic.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getTopic().get()) + Stream.of(thatTopic.get()) .flatMap(Verification::verifyMessageTopicType) .map(error -> { error.prependSegment( @@ -6176,9 +6359,9 @@ public Stream transformEventPayload( })); } - if (that.getSubjectId().isPresent()) { + if (thatSubjectId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSubjectId().get()) + Stream.of(thatSubjectId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6196,9 +6379,9 @@ public Stream transformEventPayload( return error; })); - if (that.getPayload().isPresent()) { + if (thatPayload.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getPayload().get()) + Stream.of(thatPayload.get()) .flatMap(Verification::verifyBlobType) .map(error -> { error.prependSegment( @@ -6215,9 +6398,24 @@ public Stream transformBasicEventElement( IBasicEventElement that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatMaxInterval = that.getMaxInterval(); + final Optional thatMessageBroker = that.getMessageBroker(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatMessageTopic = that.getMessageTopic(); + final Optional thatLastUpdate = that.getLastUpdate(); + final Optional thatMinInterval = that.getMinInterval(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6225,8 +6423,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6235,8 +6433,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6245,8 +6443,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6254,8 +6452,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6264,8 +6462,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6273,8 +6471,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6283,8 +6481,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6293,8 +6491,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6302,8 +6500,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6312,8 +6510,8 @@ public Stream transformBasicEventElement( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6323,7 +6521,7 @@ public Stream transformBasicEventElement( if (!( !(that.getDirection() == Direction.INPUT) - || (!that.getMaxInterval().isPresent()))) { + || (!thatMaxInterval.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6338,17 +6536,17 @@ public Stream transformBasicEventElement( } if (!( - !(that.getMessageBroker().isPresent()) - || isModelReferenceToReferable(that.getMessageBroker().orElse(null)))) { + !(thatMessageBroker.isPresent()) + || isModelReferenceToReferable(thatMessageBroker.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Message broker must be a model reference to a referable."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -6357,9 +6555,9 @@ public Stream transformBasicEventElement( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -6368,9 +6566,9 @@ public Stream transformBasicEventElement( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -6379,9 +6577,9 @@ public Stream transformBasicEventElement( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -6390,9 +6588,9 @@ public Stream transformBasicEventElement( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -6401,9 +6599,9 @@ public Stream transformBasicEventElement( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6412,9 +6610,9 @@ public Stream transformBasicEventElement( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -6423,9 +6621,9 @@ public Stream transformBasicEventElement( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -6434,9 +6632,9 @@ public Stream transformBasicEventElement( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -6472,9 +6670,9 @@ public Stream transformBasicEventElement( return error; })); - if (that.getMessageTopic().isPresent()) { + if (thatMessageTopic.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMessageTopic().get()) + Stream.of(thatMessageTopic.get()) .flatMap(Verification::verifyMessageTopicType) .map(error -> { error.prependSegment( @@ -6483,9 +6681,9 @@ public Stream transformBasicEventElement( })); } - if (that.getMessageBroker().isPresent()) { + if (thatMessageBroker.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMessageBroker().get()) + Stream.of(thatMessageBroker.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6494,9 +6692,9 @@ public Stream transformBasicEventElement( })); } - if (that.getLastUpdate().isPresent()) { + if (thatLastUpdate.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getLastUpdate().get()) + Stream.of(thatLastUpdate.get()) .flatMap(Verification::verifyDateTimeUtc) .map(error -> { error.prependSegment( @@ -6505,9 +6703,9 @@ public Stream transformBasicEventElement( })); } - if (that.getMinInterval().isPresent()) { + if (thatMinInterval.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMinInterval().get()) + Stream.of(thatMinInterval.get()) .flatMap(Verification::verifyDuration) .map(error -> { error.prependSegment( @@ -6516,9 +6714,9 @@ public Stream transformBasicEventElement( })); } - if (that.getMaxInterval().isPresent()) { + if (thatMaxInterval.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMaxInterval().get()) + Stream.of(thatMaxInterval.get()) .flatMap(Verification::verifyDuration) .map(error -> { error.prependSegment( @@ -6535,9 +6733,22 @@ public Stream transformOperation( IOperation that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatInputVariables = that.getInputVariables(); + final Optional> thatOutputVariables = that.getOutputVariables(); + final Optional> thatInoutputVariables = that.getInoutputVariables(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6545,8 +6756,8 @@ public Stream transformOperation( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6555,8 +6766,8 @@ public Stream transformOperation( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6565,8 +6776,8 @@ public Stream transformOperation( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6574,8 +6785,8 @@ public Stream transformOperation( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6584,8 +6795,8 @@ public Stream transformOperation( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6593,8 +6804,8 @@ public Stream transformOperation( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6603,8 +6814,8 @@ public Stream transformOperation( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6613,8 +6824,8 @@ public Stream transformOperation( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6622,8 +6833,8 @@ public Stream transformOperation( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6632,8 +6843,8 @@ public Stream transformOperation( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6643,9 +6854,9 @@ public Stream transformOperation( if (!( idShortsOfVariablesAreUnique( - that.getInputVariables(), - that.getOutputVariables(), - that.getInoutputVariables()))) { + thatInputVariables, + thatOutputVariables, + thatInoutputVariables))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6654,8 +6865,8 @@ public Stream transformOperation( } if (!( - !(that.getInputVariables().isPresent()) - || (that.getInputVariables().get().size() >= 1))) { + !(thatInputVariables.isPresent()) + || (thatInputVariables.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6664,8 +6875,8 @@ public Stream transformOperation( } if (!( - !(that.getOutputVariables().isPresent()) - || (that.getOutputVariables().get().size() >= 1))) { + !(thatOutputVariables.isPresent()) + || (thatOutputVariables.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6674,8 +6885,8 @@ public Stream transformOperation( } if (!( - !(that.getInoutputVariables().isPresent()) - || (that.getInoutputVariables().get().size() >= 1))) { + !(thatInoutputVariables.isPresent()) + || (thatInoutputVariables.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6683,9 +6894,9 @@ public Stream transformOperation( "one item."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -6694,9 +6905,9 @@ public Stream transformOperation( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -6705,9 +6916,9 @@ public Stream transformOperation( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -6716,9 +6927,9 @@ public Stream transformOperation( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -6727,9 +6938,9 @@ public Stream transformOperation( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -6738,9 +6949,9 @@ public Stream transformOperation( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -6749,9 +6960,9 @@ public Stream transformOperation( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -6760,9 +6971,9 @@ public Stream transformOperation( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -6771,9 +6982,9 @@ public Stream transformOperation( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -6782,9 +6993,9 @@ public Stream transformOperation( })); } - if (that.getInputVariables().isPresent()) { + if (thatInputVariables.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getInputVariables().get()) + Stream.of(thatInputVariables.get()) .flatMap(Verification::verifyListOf_IOperationVariable) .map(error -> { error.prependSegment( @@ -6793,9 +7004,9 @@ public Stream transformOperation( })); } - if (that.getOutputVariables().isPresent()) { + if (thatOutputVariables.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOutputVariables().get()) + Stream.of(thatOutputVariables.get()) .flatMap(Verification::verifyListOf_IOperationVariable) .map(error -> { error.prependSegment( @@ -6804,9 +7015,9 @@ public Stream transformOperation( })); } - if (that.getInoutputVariables().isPresent()) { + if (thatInoutputVariables.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getInoutputVariables().get()) + Stream.of(thatInoutputVariables.get()) .flatMap(Verification::verifyListOf_IOperationVariable) .map(error -> { error.prependSegment( @@ -6850,9 +7061,19 @@ public Stream transformCapability( ICapability that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatSupplementalSemanticIds = that.getSupplementalSemanticIds(); + final Optional thatSemanticId = that.getSemanticId(); + final Optional> thatQualifiers = that.getQualifiers(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6860,8 +7081,8 @@ public Stream transformCapability( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6870,8 +7091,8 @@ public Stream transformCapability( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6880,8 +7101,8 @@ public Stream transformCapability( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6889,8 +7110,8 @@ public Stream transformCapability( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6899,8 +7120,8 @@ public Stream transformCapability( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6908,8 +7129,8 @@ public Stream transformCapability( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSupplementalSemanticIds().get().size() >= 1))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSupplementalSemanticIds.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6918,8 +7139,8 @@ public Stream transformCapability( } if (!( - !(that.getSupplementalSemanticIds().isPresent()) - || (that.getSemanticId().isPresent()))) { + !(thatSupplementalSemanticIds.isPresent()) + || (thatSemanticId.isPresent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6928,8 +7149,8 @@ public Stream transformCapability( } if (!( - !(that.getQualifiers().isPresent()) - || (that.getQualifiers().get().size() >= 1))) { + !(thatQualifiers.isPresent()) + || (thatQualifiers.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6937,8 +7158,8 @@ public Stream transformCapability( } if (!( - !(that.getQualifiers().isPresent()) - || qualifierTypesAreUnique(that.getQualifiers().orElse(null)))) { + !(thatQualifiers.isPresent()) + || qualifierTypesAreUnique(thatQualifiers.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6947,8 +7168,8 @@ public Stream transformCapability( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -6956,9 +7177,9 @@ public Stream transformCapability( "at least one item."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -6967,9 +7188,9 @@ public Stream transformCapability( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -6978,9 +7199,9 @@ public Stream transformCapability( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -6989,9 +7210,9 @@ public Stream transformCapability( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -7000,9 +7221,9 @@ public Stream transformCapability( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -7011,9 +7232,9 @@ public Stream transformCapability( })); } - if (that.getSemanticId().isPresent()) { + if (thatSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSemanticId().get()) + Stream.of(thatSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -7022,9 +7243,9 @@ public Stream transformCapability( })); } - if (that.getSupplementalSemanticIds().isPresent()) { + if (thatSupplementalSemanticIds.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSupplementalSemanticIds().get()) + Stream.of(thatSupplementalSemanticIds.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -7033,9 +7254,9 @@ public Stream transformCapability( })); } - if (that.getQualifiers().isPresent()) { + if (thatQualifiers.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getQualifiers().get()) + Stream.of(thatQualifiers.get()) .flatMap(Verification::verifyListOf_IQualifier) .map(error -> { error.prependSegment( @@ -7044,9 +7265,9 @@ public Stream transformCapability( })); } - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -7063,9 +7284,18 @@ public Stream transformConceptDescription( IConceptDescription that) { Stream errorStream = Stream.empty(); + final Optional> thatExtensions = that.getExtensions(); + final Optional> thatDescription = that.getDescription(); + final Optional> thatDisplayName = that.getDisplayName(); + final Optional> thatEmbeddedDataSpecifications = that.getEmbeddedDataSpecifications(); + final Optional> thatIsCaseOf = that.getIsCaseOf(); + final Optional thatCategory = that.getCategory(); + final Optional thatIdShort = that.getIdShort(); + final Optional thatAdministration = that.getAdministration(); + if (!( - !(that.getExtensions().isPresent()) - || (that.getExtensions().get().size() >= 1))) { + !(thatExtensions.isPresent()) + || (thatExtensions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7073,8 +7303,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getExtensions().isPresent()) - || extensionNamesAreUnique(that.getExtensions().orElse(null)))) { + !(thatExtensions.isPresent()) + || extensionNamesAreUnique(thatExtensions.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7083,8 +7313,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getDescription().isPresent()) - || (that.getDescription().get().size() >= 1))) { + !(thatDescription.isPresent()) + || (thatDescription.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7093,8 +7323,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getDescription().isPresent()) - || langStringsHaveUniqueLanguages(that.getDescription().orElse(null)))) { + !(thatDescription.isPresent()) + || langStringsHaveUniqueLanguages(thatDescription.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7102,8 +7332,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getDisplayName().isPresent()) - || (that.getDisplayName().get().size() >= 1))) { + !(thatDisplayName.isPresent()) + || (thatDisplayName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7112,8 +7342,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getDisplayName().isPresent()) - || langStringsHaveUniqueLanguages(that.getDisplayName().orElse(null)))) { + !(thatDisplayName.isPresent()) + || langStringsHaveUniqueLanguages(thatDisplayName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7121,8 +7351,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) - || (that.getEmbeddedDataSpecifications().get().size() >= 1))) { + !(thatEmbeddedDataSpecifications.isPresent()) + || (thatEmbeddedDataSpecifications.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7131,8 +7361,8 @@ public Stream transformConceptDescription( } if (!( - !(that.getIsCaseOf().isPresent()) - || (that.getIsCaseOf().get().size() >= 1))) { + !(thatIsCaseOf.isPresent()) + || (thatIsCaseOf.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7140,10 +7370,10 @@ public Stream transformConceptDescription( } if (!( - !(that.getEmbeddedDataSpecifications().isPresent()) + !(thatEmbeddedDataSpecifications.isPresent()) || ( - dataSpecificationIec61360sHaveDefinitionAtLeastInEnglish(that.getEmbeddedDataSpecifications().orElse(null)) - || dataSpecificationIec61360sHaveValue(that.getEmbeddedDataSpecifications().orElse(null)) + dataSpecificationIec61360sHaveDefinitionAtLeastInEnglish(thatEmbeddedDataSpecifications.orElse(null)) + || dataSpecificationIec61360sHaveValue(thatEmbeddedDataSpecifications.orElse(null)) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -7156,11 +7386,11 @@ public Stream transformConceptDescription( if (!( !( - (that.getCategory().isPresent()) - && Objects.equals(that.getCategory().get(), "QUALIFIER_TYPE") - && (that.getEmbeddedDataSpecifications().isPresent()) + (thatCategory.isPresent()) + && Objects.equals(thatCategory.get(), "QUALIFIER_TYPE") + && (thatEmbeddedDataSpecifications.isPresent()) ) - || dataSpecificationIec61360sHaveDataType(that.getEmbeddedDataSpecifications().orElse(null)))) { + || dataSpecificationIec61360sHaveDataType(thatEmbeddedDataSpecifications.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7172,11 +7402,11 @@ public Stream transformConceptDescription( if (!( !( - (that.getCategory().isPresent()) - && Objects.equals(that.getCategory().get(), "DOCUMENT") - && (that.getEmbeddedDataSpecifications().isPresent()) + (thatCategory.isPresent()) + && Objects.equals(thatCategory.get(), "DOCUMENT") + && (thatEmbeddedDataSpecifications.isPresent()) ) - || dataSpecificationIec61360sForDocumentHaveAppropriateDataType(that.getEmbeddedDataSpecifications().orElse(null)))) { + || dataSpecificationIec61360sForDocumentHaveAppropriateDataType(thatEmbeddedDataSpecifications.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7188,11 +7418,11 @@ public Stream transformConceptDescription( if (!( !( - (that.getCategory().isPresent()) - && Objects.equals(that.getCategory().get(), "REFERENCE") - && (that.getEmbeddedDataSpecifications().isPresent()) + (thatCategory.isPresent()) + && Objects.equals(thatCategory.get(), "REFERENCE") + && (thatEmbeddedDataSpecifications.isPresent()) ) - || dataSpecificationIec61360sForReferenceHaveAppropriateDataType(that.getEmbeddedDataSpecifications().orElse(null)))) { + || dataSpecificationIec61360sForReferenceHaveAppropriateDataType(thatEmbeddedDataSpecifications.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7204,14 +7434,14 @@ public Stream transformConceptDescription( if (!( !( - (that.getCategory().isPresent()) + (thatCategory.isPresent()) && ( - Objects.equals(that.getCategory().get(), "PROPERTY") - || Objects.equals(that.getCategory().get(), "VALUE") + Objects.equals(thatCategory.get(), "PROPERTY") + || Objects.equals(thatCategory.get(), "VALUE") ) - && (that.getEmbeddedDataSpecifications().isPresent()) + && (thatEmbeddedDataSpecifications.isPresent()) ) - || dataSpecificationIec61360sForPropertyOrValueHaveAppropriateDataType(that.getEmbeddedDataSpecifications().orElse(null)))) { + || dataSpecificationIec61360sForPropertyOrValueHaveAppropriateDataType(thatEmbeddedDataSpecifications.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7224,9 +7454,9 @@ public Stream transformConceptDescription( "RATIONAL_MEASURE, TIME, TIMESTAMP."))); } - if (that.getExtensions().isPresent()) { + if (thatExtensions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getExtensions().get()) + Stream.of(thatExtensions.get()) .flatMap(Verification::verifyListOf_IExtension) .map(error -> { error.prependSegment( @@ -7235,9 +7465,9 @@ public Stream transformConceptDescription( })); } - if (that.getCategory().isPresent()) { + if (thatCategory.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getCategory().get()) + Stream.of(thatCategory.get()) .flatMap(Verification::verifyNameType) .map(error -> { error.prependSegment( @@ -7246,9 +7476,9 @@ public Stream transformConceptDescription( })); } - if (that.getIdShort().isPresent()) { + if (thatIdShort.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIdShort().get()) + Stream.of(thatIdShort.get()) .flatMap(Verification::verifyIdShortType) .map(error -> { error.prependSegment( @@ -7257,9 +7487,9 @@ public Stream transformConceptDescription( })); } - if (that.getDisplayName().isPresent()) { + if (thatDisplayName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDisplayName().get()) + Stream.of(thatDisplayName.get()) .flatMap(Verification::verifyListOf_ILangStringNameType) .map(error -> { error.prependSegment( @@ -7268,9 +7498,9 @@ public Stream transformConceptDescription( })); } - if (that.getDescription().isPresent()) { + if (thatDescription.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDescription().get()) + Stream.of(thatDescription.get()) .flatMap(Verification::verifyListOf_ILangStringTextType) .map(error -> { error.prependSegment( @@ -7279,9 +7509,9 @@ public Stream transformConceptDescription( })); } - if (that.getAdministration().isPresent()) { + if (thatAdministration.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAdministration().get()) + Stream.of(thatAdministration.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -7299,9 +7529,9 @@ public Stream transformConceptDescription( return error; })); - if (that.getEmbeddedDataSpecifications().isPresent()) { + if (thatEmbeddedDataSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getEmbeddedDataSpecifications().get()) + Stream.of(thatEmbeddedDataSpecifications.get()) .flatMap(Verification::verifyListOf_IEmbeddedDataSpecification) .map(error -> { error.prependSegment( @@ -7310,9 +7540,9 @@ public Stream transformConceptDescription( })); } - if (that.getIsCaseOf().isPresent()) { + if (thatIsCaseOf.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getIsCaseOf().get()) + Stream.of(thatIsCaseOf.get()) .flatMap(Verification::verifyListOf_IReference) .map(error -> { error.prependSegment( @@ -7329,6 +7559,8 @@ public Stream transformReference( IReference that) { Stream errorStream = Stream.empty(); + final Optional thatReferredSemanticId = that.getReferredSemanticId(); + if (!(that.getKeys().size() >= 1)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -7483,9 +7715,9 @@ public Stream transformReference( return error; })); - if (that.getReferredSemanticId().isPresent()) { + if (thatReferredSemanticId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getReferredSemanticId().get()) + Stream.of(thatReferredSemanticId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -7603,9 +7835,13 @@ public Stream transformEnvironment( IEnvironment that) { Stream errorStream = Stream.empty(); + final Optional> thatConceptDescriptions = that.getConceptDescriptions(); + final Optional> thatSubmodels = that.getSubmodels(); + final Optional> thatAssetAdministrationShells = that.getAssetAdministrationShells(); + if (!( - !(that.getConceptDescriptions().isPresent()) - || (that.getConceptDescriptions().get().size() >= 1))) { + !(thatConceptDescriptions.isPresent()) + || (thatConceptDescriptions.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7614,8 +7850,8 @@ public Stream transformEnvironment( } if (!( - !(that.getSubmodels().isPresent()) - || (that.getSubmodels().get().size() >= 1))) { + !(thatSubmodels.isPresent()) + || (thatSubmodels.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7623,8 +7859,8 @@ public Stream transformEnvironment( } if (!( - !(that.getAssetAdministrationShells().isPresent()) - || (that.getAssetAdministrationShells().get().size() >= 1))) { + !(thatAssetAdministrationShells.isPresent()) + || (thatAssetAdministrationShells.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7632,9 +7868,9 @@ public Stream transformEnvironment( "at least one item."))); } - if (that.getAssetAdministrationShells().isPresent()) { + if (thatAssetAdministrationShells.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getAssetAdministrationShells().get()) + Stream.of(thatAssetAdministrationShells.get()) .flatMap(Verification::verifyListOf_IAssetAdministrationShell) .map(error -> { error.prependSegment( @@ -7643,9 +7879,9 @@ public Stream transformEnvironment( })); } - if (that.getSubmodels().isPresent()) { + if (thatSubmodels.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSubmodels().get()) + Stream.of(thatSubmodels.get()) .flatMap(Verification::verifyListOf_ISubmodel) .map(error -> { error.prependSegment( @@ -7654,9 +7890,9 @@ public Stream transformEnvironment( })); } - if (that.getConceptDescriptions().isPresent()) { + if (thatConceptDescriptions.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getConceptDescriptions().get()) + Stream.of(thatConceptDescriptions.get()) .flatMap(Verification::verifyListOf_IConceptDescription) .map(error -> { error.prependSegment( @@ -7858,9 +8094,21 @@ public Stream transformDataSpecificationIec61360( IDataSpecificationIec61360 that) { Stream errorStream = Stream.empty(); + final Optional thatValue = that.getValue(); + final Optional thatValueList = that.getValueList(); + final Optional thatDataType = that.getDataType(); + final Optional thatUnit = that.getUnit(); + final Optional thatUnitId = that.getUnitId(); + final Optional> thatDefinition = that.getDefinition(); + final Optional> thatShortName = that.getShortName(); + final Optional thatSourceOfDefinition = that.getSourceOfDefinition(); + final Optional thatSymbol = that.getSymbol(); + final Optional thatValueFormat = that.getValueFormat(); + final Optional thatLevelType = that.getLevelType(); + if (!( - !((that.getValue().isPresent()) - && (that.getValueList().isPresent())))) { + !((thatValue.isPresent()) + && (thatValueList.isPresent())))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7870,12 +8118,12 @@ public Stream transformDataSpecificationIec61360( if (!( !( - (that.getDataType().isPresent()) - && Constants.iec61360DataTypesWithUnit.contains(that.getDataType().get()) + (thatDataType.isPresent()) + && Constants.iec61360DataTypesWithUnit.contains(thatDataType.get()) ) || ( - (that.getUnit().isPresent()) - || (that.getUnitId().isPresent()) + (thatUnit.isPresent()) + || (thatUnitId.isPresent()) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -7886,8 +8134,8 @@ public Stream transformDataSpecificationIec61360( } if (!( - !(that.getDefinition().isPresent()) - || (that.getDefinition().get().size() >= 1))) { + !(thatDefinition.isPresent()) + || (thatDefinition.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7895,8 +8143,8 @@ public Stream transformDataSpecificationIec61360( } if (!( - !(that.getDefinition().isPresent()) - || langStringsHaveUniqueLanguages(that.getDefinition().orElse(null)))) { + !(thatDefinition.isPresent()) + || langStringsHaveUniqueLanguages(thatDefinition.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7904,8 +8152,8 @@ public Stream transformDataSpecificationIec61360( } if (!( - !(that.getShortName().isPresent()) - || (that.getShortName().get().size() >= 1))) { + !(thatShortName.isPresent()) + || (thatShortName.get().size() >= 1))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7913,8 +8161,8 @@ public Stream transformDataSpecificationIec61360( } if (!( - !(that.getShortName().isPresent()) - || langStringsHaveUniqueLanguages(that.getShortName().orElse(null)))) { + !(thatShortName.isPresent()) + || langStringsHaveUniqueLanguages(thatShortName.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -7955,9 +8203,9 @@ public Stream transformDataSpecificationIec61360( return error; })); - if (that.getShortName().isPresent()) { + if (thatShortName.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getShortName().get()) + Stream.of(thatShortName.get()) .flatMap(Verification::verifyListOf_ILangStringShortNameTypeIec61360) .map(error -> { error.prependSegment( @@ -7966,9 +8214,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getUnit().isPresent()) { + if (thatUnit.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getUnit().get()) + Stream.of(thatUnit.get()) .flatMap(Verification::verifyNonEmptyXmlSerializableString) .map(error -> { error.prependSegment( @@ -7977,9 +8225,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getUnitId().isPresent()) { + if (thatUnitId.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getUnitId().get()) + Stream.of(thatUnitId.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -7988,9 +8236,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getSourceOfDefinition().isPresent()) { + if (thatSourceOfDefinition.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSourceOfDefinition().get()) + Stream.of(thatSourceOfDefinition.get()) .flatMap(Verification::verifyNonEmptyXmlSerializableString) .map(error -> { error.prependSegment( @@ -7999,9 +8247,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getSymbol().isPresent()) { + if (thatSymbol.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSymbol().get()) + Stream.of(thatSymbol.get()) .flatMap(Verification::verifyNonEmptyXmlSerializableString) .map(error -> { error.prependSegment( @@ -8010,9 +8258,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getDataType().isPresent()) { + if (thatDataType.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDataType().get()) + Stream.of(thatDataType.get()) .flatMap(Verification::verifyDataTypeIec61360) .map(error -> { error.prependSegment( @@ -8021,9 +8269,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getDefinition().isPresent()) { + if (thatDefinition.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDefinition().get()) + Stream.of(thatDefinition.get()) .flatMap(Verification::verifyListOf_ILangStringDefinitionTypeIec61360) .map(error -> { error.prependSegment( @@ -8032,9 +8280,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getValueFormat().isPresent()) { + if (thatValueFormat.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueFormat().get()) + Stream.of(thatValueFormat.get()) .flatMap(Verification::verifyNonEmptyXmlSerializableString) .map(error -> { error.prependSegment( @@ -8043,9 +8291,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getValueList().isPresent()) { + if (thatValueList.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValueList().get()) + Stream.of(thatValueList.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -8054,9 +8302,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getValue().isPresent()) { + if (thatValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getValue().get()) + Stream.of(thatValue.get()) .flatMap(Verification::verifyValueTypeIec61360) .map(error -> { error.prependSegment( @@ -8065,9 +8313,9 @@ public Stream transformDataSpecificationIec61360( })); } - if (that.getLevelType().isPresent()) { + if (thatLevelType.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getLevelType().get()) + Stream.of(thatLevelType.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/xmlcommon/XmlCommon.java index 2864a0ab8..294556b3d 100644 --- a/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/aas_core_meta.v3/expected_output/src/main/java/aas_core/aas3_0/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import aas_core.aas3_0.types.model.*; import aas_core.aas3_0.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 78f96ed9d..42cca1750 100644 --- a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -100,13 +100,13 @@ public IClass transformSomething( that.setParents(wrapListOf_IParent(that.getParents())); - if (that.getOptionalParent().isPresent()) { - that.setOptionalParent(wrap(that.getOptionalParent().get())); - } + that.getOptionalParent().ifPresent(value -> { + that.setOptionalParent(wrap(value)); + }); - if (that.getOptionalMember().isPresent()) { - that.setOptionalMember(wrap(that.getOptionalMember().get())); - } + that.getOptionalMember().ifPresent(value -> { + that.setOptionalMember(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/verification/Verification.java index f6e6aca67..fba44e854 100644 --- a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/verification/Verification.java @@ -511,6 +511,13 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalText = that.getOptionalText(); + final Optional thatOptionalMember = that.getOptionalMember(); + final Optional thatOptionalParent = that.getOptionalParent(); + final Optional> thatOptionalTexts = that.getOptionalTexts(); + final Optional thatOptionalData = that.getOptionalData(); + final Optional thatOptionalKind = that.getOptionalKind(); + if (!that.firstChildBIsNotFortyTwo()) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -559,7 +566,7 @@ public Stream transformSomething( that.getText(), that.getNumber(), that.getTexts(), - that.getOptionalText(), + thatOptionalText, that.getParent()))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -569,7 +576,7 @@ public Stream transformSomething( "must not be 17"))); } - if (!memberIsLucky(that.getOptionalMember())) { + if (!memberIsLucky(thatOptionalMember)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -589,7 +596,7 @@ public Stream transformSomething( tuplesAreConsistent( that.getText(), that.getNumber(), - that.getOptionalParent()))) { + thatOptionalParent))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -597,15 +604,14 @@ public Stream transformSomething( "must be small"))); } - if (!( - textsAreFew(that.getTexts(), that.getOptionalTexts()))) { + if (!textsAreFew(that.getTexts(), thatOptionalTexts)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Texts must be few"))); } - if (!dataIsSmall(that.getOptionalData())) { + if (!dataIsSmall(thatOptionalData)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -620,7 +626,7 @@ public Stream transformSomething( } if (!( - kindsAreConsistent(that.getKind(), that.getOptionalKind()))) { + kindsAreConsistent(that.getKind(), thatOptionalKind))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -637,7 +643,7 @@ public Stream transformSomething( } if (!( - optionalsFromValuesAreSmall(that.getNumber(), that.getOptionalText()))) { + optionalsFromValuesAreSmall(that.getNumber(), thatOptionalText))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -659,7 +665,7 @@ public Stream transformSomething( "The last parent as Child_b must have a non-zero b_only"))); } - if (!textIsAllowedUnlessLong(that.getOptionalText())) { + if (!textIsAllowedUnlessLong(thatOptionalText)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -727,9 +733,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalKind().isPresent()) { + if (thatOptionalKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalKind().get()) + Stream.of(thatOptionalKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( @@ -738,9 +744,9 @@ public Stream transformSomething( })); } - if (that.getOptionalParent().isPresent()) { + if (thatOptionalParent.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalParent().get()) + Stream.of(thatOptionalParent.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -749,9 +755,9 @@ public Stream transformSomething( })); } - if (that.getOptionalMember().isPresent()) { + if (thatOptionalMember.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalMember().get()) + Stream.of(thatOptionalMember.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/annotated_assignments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/verification/Verification.java index b52ba2c72..a3b72eb9b 100644 --- a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/verification/Verification.java @@ -27,6 +27,7 @@ import dummy.types.enums.*; import dummy.types.model.*; import dummy.visitation.AbstractTransformer; +import java.util.Optional; public class Verification { /** @@ -164,6 +165,9 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalNumber = that.getOptionalNumber(); + final Optional thatOptionalRatio = that.getOptionalRatio(); + if (!((Math.floorMod(that.getOffset(), 7L)) == (3))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -239,10 +243,10 @@ public Stream transformSomething( } if (!( - !(that.getOptionalNumber().isPresent()) + !(thatOptionalNumber.isPresent()) || ( - (Math.floorMod(that.getOptionalNumber().get(), 5L)) == (4) - && Math.abs(that.getOptionalNumber().get()) < 100 + (Math.floorMod(thatOptionalNumber.get(), 5L)) == (4) + && Math.abs(thatOptionalNumber.get()) < 100 ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -252,10 +256,10 @@ public Stream transformSomething( } if (!( - !(that.getOptionalRatio().isPresent()) + !(thatOptionalRatio.isPresent()) || ( - (-that.getOptionalRatio().get()) < (0.5) - && Math.abs(that.getOptionalRatio().get()) < 2.0 + (-thatOptionalRatio.get()) < (0.5) + && Math.abs(thatOptionalRatio.get()) < 2.0 ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -327,9 +331,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalNumber().isPresent()) { + if (thatOptionalNumber.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalNumber().get()) + Stream.of(thatOptionalNumber.get()) .flatMap(Verification::verify_long) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/arithmetic/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/verification/Verification.java index 8beaf7e9c..81762e5ed 100644 --- a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/verification/Verification.java @@ -242,6 +242,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalText = that.getOptionalText(); + if (!(that.doubledNumber() != 666)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -274,8 +276,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalText().isPresent()) - || optionalTextIsShort(that.getOptionalText()))) { + !(thatOptionalText.isPresent()) + || optionalTextIsShort(thatOptionalText))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + diff --git a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/assert_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index a9cfaa675..ad2a6d682 100644 --- a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -56,9 +56,9 @@ public IClass transformSomething( that.setItems(wrapListOf_IItem(that.getItems())); - if (that.getMaybeItem().isPresent()) { - that.setMaybeItem(wrap(that.getMaybeItem().get())); - } + that.getMaybeItem().ifPresent(value -> { + that.setMaybeItem(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/verification/Verification.java index 7280b633c..306fddfe2 100644 --- a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -350,9 +351,11 @@ public Stream transformItem( IItem that) { Stream errorStream = Stream.empty(); - if (that.getMaybeKind().isPresent()) { + final Optional thatMaybeKind = that.getMaybeKind(); + + if (thatMaybeKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMaybeKind().get()) + Stream.of(thatMaybeKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( @@ -369,6 +372,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatMaybeItem = that.getMaybeItem(); + if (!textsAreNotEmpty(that.getItems())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -385,9 +390,9 @@ public Stream transformSomething( return error; })); - if (that.getMaybeItem().isPresent()) { + if (thatMaybeItem.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMaybeItem().get()) + Stream.of(thatMaybeItem.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/assignment_targets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/verification/Verification.java index 8d2f9b895..bb164c737 100644 --- a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/verification/Verification.java @@ -198,6 +198,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional> thatOptionalTexts = that.getOptionalTexts(); + if (!( that.getKinds().size() == 0 || that.uniqueKinds().contains(Kind.ALPHA))) { @@ -214,7 +216,7 @@ public Stream transformSomething( "Kinds must not contain gamma."))); } - if (!optionalTextsAreUnique(that.getOptionalTexts())) { + if (!optionalTextsAreUnique(thatOptionalTexts)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + diff --git a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/collections_in_returns/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/comparisons/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/constants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/verification/Verification.java index cd35bc7de..51bd985fe 100644 --- a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/verification/Verification.java @@ -27,6 +27,7 @@ import dummy.types.enums.*; import dummy.types.model.*; import dummy.visitation.AbstractTransformer; +import java.util.Optional; public class Verification { /** diff --git a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/custom_serialization_names/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/deep_class_hierarchy/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/empty_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/enum/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/verification/Verification.java index f59c858fa..57b678aa1 100644 --- a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/verification/Verification.java @@ -27,6 +27,7 @@ import dummy.types.enums.*; import dummy.types.model.*; import dummy.visitation.AbstractTransformer; +import java.util.Optional; public class Verification { /** diff --git a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/float_only/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/for_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 243a2eb04..51961f791 100644 --- a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -94,9 +94,9 @@ public IClass transformContainer( ); } - if (that.getChildren().isPresent()) { - that.setChildren(wrapListOf_IParent(that.getChildren().get())); - } + that.getChildren().ifPresent(value -> { + that.setChildren(wrapListOf_IParent(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -120,13 +120,13 @@ public IClass transformSomething( that.setItem(wrap(that.getItem())); - if (that.getOptionalParent().isPresent()) { - that.setOptionalParent(wrap(that.getOptionalParent().get())); - } + that.getOptionalParent().ifPresent(value -> { + that.setOptionalParent(wrap(value)); + }); - if (that.getParents().isPresent()) { - that.setParents(wrapListOf_IParent(that.getParents().get())); - } + that.getParents().ifPresent(value -> { + that.setParents(wrapListOf_IParent(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/verification/Verification.java index f1992bec7..693aa41e8 100644 --- a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/verification/Verification.java @@ -467,9 +467,11 @@ public Stream transformContainer( IContainer that) { Stream errorStream = Stream.empty(); - if (that.getChildren().isPresent()) { + final Optional> thatChildren = that.getChildren(); + + if (thatChildren.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getChildren().get()) + Stream.of(thatChildren.get()) .flatMap(Verification::verifyListOf_IParent) .map(error -> { error.prependSegment( @@ -486,6 +488,9 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalParent = that.getOptionalParent(); + final Optional> thatParents = that.getParents(); + if (!ifWithContinueInFor(that.getNumber())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -545,8 +550,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalParent().isPresent()) - || (!hasMarkerInTree(that.getOptionalParent().orElse(null))))) { + !(thatOptionalParent.isPresent()) + || (!hasMarkerInTree(thatOptionalParent.orElse(null))))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -555,12 +560,12 @@ public Stream transformSomething( if (!( !( - (that.getOptionalParent().isPresent()) - && (that.getParents().isPresent()) + (thatOptionalParent.isPresent()) + && (thatParents.isPresent()) ) || lastChildAIsSmall( - that.getOptionalParent().orElse(null), - that.getParents().orElse(null)))) { + thatOptionalParent.orElse(null), + thatParents.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -568,8 +573,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalParent().isPresent()) - || textOrDefaultIsShort(that.getOptionalParent().orElse(null)))) { + !(thatOptionalParent.isPresent()) + || textOrDefaultIsShort(thatOptionalParent.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -577,8 +582,8 @@ public Stream transformSomething( } if (!( - !(that.getParents().isPresent()) - || textsBeforeContainerAreShort(that.getParents().orElse(null)))) { + !(thatParents.isPresent()) + || textsBeforeContainerAreShort(thatParents.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -586,8 +591,8 @@ public Stream transformSomething( } if (!( - !(that.getParents().isPresent()) - || childAsHaveTexts(that.getParents().orElse(null)))) { + !(thatParents.isPresent()) + || childAsHaveTexts(thatParents.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -595,22 +600,21 @@ public Stream transformSomething( } if (!( - narrowingAfterTheOnlyCompletingBranch(that.getOptionalParent()))) { + narrowingAfterTheOnlyCompletingBranch(thatOptionalParent))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Optional parent as Child_a must have a_only above minus ten"))); } - if (!( - narrowingAfterEarlyReturn(that.getOptionalParent()))) { + if (!narrowingAfterEarlyReturn(thatOptionalParent)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Optional parent as Child_b must have a small b_only"))); } - if (!narrowingInElifAndElse(that.getOptionalParent())) { + if (!narrowingInElifAndElse(thatOptionalParent)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -618,7 +622,7 @@ public Stream transformSomething( "b_only"))); } - if (!narrowingInBody(that.getOptionalParent())) { + if (!narrowingInBody(thatOptionalParent)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -652,9 +656,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalParent().isPresent()) { + if (thatOptionalParent.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalParent().get()) + Stream.of(thatOptionalParent.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -663,9 +667,9 @@ public Stream transformSomething( })); } - if (that.getParents().isPresent()) { + if (thatParents.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getParents().get()) + Stream.of(thatParents.get()) .flatMap(Verification::verifyListOf_IParent) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/if_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/verification/Verification.java index 03c940853..b7aab0dc4 100644 --- a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -113,6 +114,8 @@ public Stream transformBox( IBox that) { Stream errorStream = Stream.empty(); + final Optional thatColor = that.getColor(); + if (!hasBalancedBrackets(that.getLabel())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -120,9 +123,9 @@ public Stream transformBox( "The square brackets in the label must be balanced."))); } - if (that.getColor().isPresent()) { + if (thatColor.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getColor().get()) + Stream.of(thatColor.get()) .flatMap(Verification::verifyColor) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/implementation_specific/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/verification/Verification.java index 791f35b7d..14dcf0b34 100644 --- a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -235,6 +236,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatMaybeCount = that.getMaybeCount(); + if (!( !(that.getTexts().size() > 0) || (!Objects.equals(that.textAt((long) (that.getTexts().size() - 1)), "")))) { @@ -323,9 +326,9 @@ public Stream transformSomething( return error; })); - if (that.getMaybeCount().isPresent()) { + if (thatMaybeCount.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getMaybeCount().get()) + Stream.of(thatMaybeCount.get()) .flatMap(Verification::verify_long) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/int_length_interplay/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/verification/Verification.java index 1c5d858f7..b8df71938 100644 --- a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/verification/Verification.java @@ -27,6 +27,7 @@ import dummy.types.enums.*; import dummy.types.model.*; import dummy.visitation.AbstractTransformer; +import java.util.Optional; public class Verification { private static Pattern constructMatchesDecimal() { @@ -177,6 +178,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatMaybeNumber = that.getMaybeNumber(); + if (!isSafeInteger(that.getNumber())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -235,8 +238,8 @@ public Stream transformSomething( } if (!( - !(that.getMaybeNumber().isPresent()) - || isSafeInteger(that.getMaybeNumber().orElse(null)))) { + !(thatMaybeNumber.isPresent()) + || isSafeInteger(thatMaybeNumber.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + diff --git a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/int_parsing/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index b30f92299..2f9b6767b 100644 --- a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -202,9 +202,9 @@ public IClass transformSomething( that.setRoot(wrap(that.getRoot())); - if (that.getOptionalElement().isPresent()) { - that.setOptionalElement(wrap(that.getOptionalElement().get())); - } + that.getOptionalElement().ifPresent(value -> { + that.setOptionalElement(wrap(value)); + }); that.setValue(wrap(that.getValue())); diff --git a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/verification/Verification.java index fe28a3188..9c6c809be 100644 --- a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -254,6 +255,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalElement = that.getOptionalElement(); + if (!hasLeafInTree(that.getRoot())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -300,10 +303,10 @@ public Stream transformSomething( if (!( !( - (that.getOptionalElement().isPresent()) - && that.getOptionalElement().get() instanceof ILeaf + (thatOptionalElement.isPresent()) + && thatOptionalElement.get() instanceof ILeaf ) - || (StringHelpers.len(((ILeaf) that.getOptionalElement().get()).getText()) > 0))) { + || (StringHelpers.len(((ILeaf) thatOptionalElement.get()).getText()) > 0))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -319,9 +322,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalElement().isPresent()) { + if (thatOptionalElement.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalElement().get()) + Stream.of(thatOptionalElement.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/is_instance/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/verification/Verification.java index 5d20ad66e..e25875df9 100644 --- a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/verification/Verification.java @@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -253,6 +254,10 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalValue = that.getOptionalValue(); + final Optional thatOptionalValues = that.getOptionalValues(); + final Optional thatOptionalMapping = that.getOptionalMapping(); + errorStream = Stream.concat(errorStream, Stream.of(that.getValue()) .flatMap(Verification::verifyJsonValue) @@ -289,9 +294,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalValue().isPresent()) { + if (thatOptionalValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalValue().get()) + Stream.of(thatOptionalValue.get()) .flatMap(Verification::verifyJsonValue) .map(error -> { error.prependSegment( @@ -300,9 +305,9 @@ public Stream transformSomething( })); } - if (that.getOptionalValues().isPresent()) { + if (thatOptionalValues.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalValues().get()) + Stream.of(thatOptionalValues.get()) .flatMap(Verification::verifyJsonArray) .map(error -> { error.prependSegment( @@ -311,9 +316,9 @@ public Stream transformSomething( })); } - if (that.getOptionalMapping().isPresent()) { + if (thatOptionalMapping.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalMapping().get()) + Stream.of(thatOptionalMapping.get()) .flatMap(Verification::verifyJsonObject) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index f841cef4c..e43bec2a6 100644 --- a/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/json_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -596,7 +597,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/verification/Verification.java index 5908b3eac..37f65ca70 100644 --- a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/verification/Verification.java @@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -253,6 +254,9 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional> thatOptionalObjects = that.getOptionalObjects(); + final Optional thatOptionalObject = that.getOptionalObject(); + errorStream = Stream.concat(errorStream, Stream.of(that.getValues()) .flatMap(Verification::verifyListOf_jsonValue) @@ -271,9 +275,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalObjects().isPresent()) { + if (thatOptionalObjects.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalObjects().get()) + Stream.of(thatOptionalObjects.get()) .flatMap(Verification::verifyListOf_jsonObject) .map(error -> { error.prependSegment( @@ -282,9 +286,9 @@ public Stream transformSomething( })); } - if (that.getOptionalObject().isPresent()) { + if (thatOptionalObject.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalObject().get()) + Stream.of(thatOptionalObject.get()) .flatMap(Verification::verifyJsonObject) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index f841cef4c..e43bec2a6 100644 --- a/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/json_types_in_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -596,7 +597,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/verification/Verification.java index bd51e4557..d8515c0a3 100644 --- a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/verification/Verification.java @@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -273,9 +274,12 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalValue = that.getOptionalValue(); + final Optional thatOptionalMapping = that.getOptionalMapping(); + if (!( - !(that.getOptionalValue().isPresent()) - || isAcceptable(that.getOptionalValue().orElse(null)))) { + !(thatOptionalValue.isPresent()) + || isAcceptable(thatOptionalValue.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -292,10 +296,10 @@ public Stream transformSomething( } if (!( - !(that.getOptionalMapping().isPresent()) + !(thatOptionalMapping.isPresent()) || ( - !that.getOptionalMapping().get().has("type") - || (!that.getOptionalMapping().get().get("type").isNull()) + !thatOptionalMapping.get().has("type") + || (!thatOptionalMapping.get().get("type").isNull()) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -353,8 +357,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalMapping().isPresent()) - || that.getOptionalMapping().get().has("type"))) { + !(thatOptionalMapping.isPresent()) + || thatOptionalMapping.get().has("type"))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -386,9 +390,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalMapping().isPresent()) { + if (thatOptionalMapping.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalMapping().get()) + Stream.of(thatOptionalMapping.get()) .flatMap(Verification::verifyJsonObject) .map(error -> { error.prependSegment( @@ -397,9 +401,9 @@ public Stream transformSomething( })); } - if (that.getOptionalValue().isPresent()) { + if (thatOptionalValue.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalValue().get()) + Stream.of(thatOptionalValue.get()) .flatMap(Verification::verifyJsonValue) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index f841cef4c..e43bec2a6 100644 --- a/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/json_types_in_invariants/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -596,7 +597,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/list_of_classes/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/list_of_constrained_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/list_of_enums/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/list_of_primitives/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/method_references/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index a29b8537c..a2a96e4f8 100644 --- a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -76,10 +76,9 @@ public IClass transformIecContent( ); } - if (that.getDefinition().isPresent()) { - that.setDefinition( - wrapListOf_ILangString(that.getDefinition().get())); - } + that.getDefinition().ifPresent(value -> { + that.setDefinition(wrapListOf_ILangString(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -146,10 +145,9 @@ public IClass transformSomething( that.setLangStringSets( wrapListOf_ILangStringSet(that.getLangStringSets())); - if (that.getSpecifications().isPresent()) { - that.setSpecifications( - wrapListOf_ISpecification(that.getSpecifications().get())); - } + that.getSpecifications().ifPresent(value -> { + that.setSpecifications(wrapListOf_ISpecification(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/verification/Verification.java index 8dd674883..c68d3bdcc 100644 --- a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -113,9 +114,11 @@ public Stream transformIecContent( IIecContent that) { Stream errorStream = Stream.empty(); - if (that.getDefinition().isPresent()) { + final Optional> thatDefinition = that.getDefinition(); + + if (thatDefinition.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getDefinition().get()) + Stream.of(thatDefinition.get()) .flatMap(Verification::verifyListOf_ILangString) .map(error -> { error.prependSegment( @@ -159,9 +162,11 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional> thatSpecifications = that.getSpecifications(); + if (!( - !(that.getSpecifications().isPresent()) - || iecContentsHaveDefinitionInEnglish(that.getSpecifications().orElse(null)))) { + !(thatSpecifications.isPresent()) + || iecContentsHaveDefinitionInEnglish(thatSpecifications.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -197,9 +202,9 @@ public Stream transformSomething( return error; })); - if (that.getSpecifications().isPresent()) { + if (thatSpecifications.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSpecifications().get()) + Stream.of(thatSpecifications.get()) .flatMap(Verification::verifyListOf_ISpecification) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/nested_any_in_all/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 893146b39..1640ae1a7 100644 --- a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -81,10 +81,9 @@ public IClass transformSomething( that.setGridOfUnions( wrapListOf_ListOf_SomeUnion(that.getGridOfUnions())); - if (that.getOptionalGridOfItems().isPresent()) { - that.setOptionalGridOfItems( - wrapListOf_ListOf_IAbstractItem(that.getOptionalGridOfItems().get())); - } + that.getOptionalGridOfItems().ifPresent(value -> { + that.setOptionalGridOfItems(wrapListOf_ListOf_IAbstractItem(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/verification/Verification.java index ee33b7e44..bf55cb00d 100644 --- a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -214,10 +215,12 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional>> thatOptionalGridOfItems = that.getOptionalGridOfItems(); + if (!( - !(that.getOptionalGridOfItems().isPresent()) + !(thatOptionalGridOfItems.isPresent()) || ( - that.getOptionalGridOfItems().get().stream().allMatch( + thatOptionalGridOfItems.get().stream().allMatch( row -> row.size() > 0) ))) { errorStream = Stream.concat(errorStream, @@ -332,9 +335,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalGridOfItems().isPresent()) { + if (thatOptionalGridOfItems.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalGridOfItems().get()) + Stream.of(thatOptionalGridOfItems.get()) .flatMap(Verification::verifyListOf_ListOf_IAbstractItem) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/nested_collections/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 249e29daf..206a484aa 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -54,10 +54,9 @@ public IClass transformBranch( ); } - if (that.getOptionalChildren().isPresent()) { - that.setOptionalChildren( - wrapListOf_INode(that.getOptionalChildren().get())); - } + that.getOptionalChildren().ifPresent(value -> { + that.setOptionalChildren(wrapListOf_INode(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -79,9 +78,9 @@ public IClass transformLeaf( ); } - if (that.getOptionalItem().isPresent()) { - that.setOptionalItem(wrap(that.getOptionalItem().get())); - } + that.getOptionalItem().ifPresent(value -> { + that.setOptionalItem(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() @@ -105,9 +104,9 @@ public IClass transformSomething( that.setItem(wrap(that.getItem())); - if (that.getOptionalItem().isPresent()) { - that.setOptionalItem(wrap(that.getOptionalItem().get())); - } + that.getOptionalItem().ifPresent(value -> { + that.setOptionalItem(wrap(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/verification/Verification.java index 126c3d946..ba84c27c3 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/verification/Verification.java @@ -258,9 +258,11 @@ public Stream transformBranch( IBranch that) { Stream errorStream = Stream.empty(); - if (that.getOptionalChildren().isPresent()) { + final Optional> thatOptionalChildren = that.getOptionalChildren(); + + if (thatOptionalChildren.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalChildren().get()) + Stream.of(thatOptionalChildren.get()) .flatMap(Verification::verifyListOf_INode) .map(error -> { error.prependSegment( @@ -277,9 +279,11 @@ public Stream transformLeaf( ILeaf that) { Stream errorStream = Stream.empty(); - if (that.getOptionalItem().isPresent()) { + final Optional thatOptionalItem = that.getOptionalItem(); + + if (thatOptionalItem.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalItem().get()) + Stream.of(thatOptionalItem.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -296,6 +300,12 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalKind = that.getOptionalKind(); + final Optional> thatOptionalTexts = that.getOptionalTexts(); + final Optional thatOptionalItem = that.getOptionalItem(); + final Optional thatOptionalNumber = that.getOptionalNumber(); + final Optional thatOptionalText = that.getOptionalText(); + if (!noteIsShort(that.getItem())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -303,42 +313,42 @@ public Stream transformSomething( "Note of the item must be short"))); } - if (!kindIsNotGamma(that.getOptionalKind())) { + if (!kindIsNotGamma(thatOptionalKind)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Kind must not be gamma"))); } - if (!textsAreFew(that.getOptionalTexts())) { + if (!textsAreFew(thatOptionalTexts)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Texts must be few"))); } - if (!itemHasName(that.getOptionalItem())) { + if (!itemHasName(thatOptionalItem)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Optional item must have a name"))); } - if (!numberIsSmall(that.getOptionalNumber())) { + if (!numberIsSmall(thatOptionalNumber)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Number must be small"))); } - if (!forwardsText(that.getOptionalText())) { + if (!forwardsText(thatOptionalText)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + "Text must not be banned"))); } - if (!textIsShort(that.getOptionalText())) { + if (!textIsShort(thatOptionalText)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -346,8 +356,8 @@ public Stream transformSomething( } if (!( - (!that.getOptionalItem().isPresent()) - || itemIsNamed(that.getOptionalItem().orElse(null)))) { + (!thatOptionalItem.isPresent()) + || itemIsNamed(thatOptionalItem.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -355,8 +365,8 @@ public Stream transformSomething( } if (!( - (!that.getOptionalNumber().isPresent()) - || numberIsPositive(that.getOptionalNumber().orElse(null)))) { + (!thatOptionalNumber.isPresent()) + || numberIsPositive(thatOptionalNumber.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -364,8 +374,8 @@ public Stream transformSomething( } if (!( - (!that.getOptionalKind().isPresent()) - || kindIsKnown(that.getOptionalKind().orElse(null)))) { + (!thatOptionalKind.isPresent()) + || kindIsKnown(thatOptionalKind.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -381,9 +391,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalNumber().isPresent()) { + if (thatOptionalNumber.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalNumber().get()) + Stream.of(thatOptionalNumber.get()) .flatMap(Verification::verify_long) .map(error -> { error.prependSegment( @@ -392,9 +402,9 @@ public Stream transformSomething( })); } - if (that.getOptionalItem().isPresent()) { + if (thatOptionalItem.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalItem().get()) + Stream.of(thatOptionalItem.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -403,9 +413,9 @@ public Stream transformSomething( })); } - if (that.getOptionalKind().isPresent()) { + if (thatOptionalKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalKind().get()) + Stream.of(thatOptionalKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/optional_arguments/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/primitive_types/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/problematic_keywords/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/property_named_like_class/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/verification/Verification.java index 297e13952..c033ffe9d 100644 --- a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/verification/Verification.java @@ -391,6 +391,9 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional> thatOptionalTexts = that.getOptionalTexts(); + final Optional thatOptionalKind = that.getOptionalKind(); + if (!( that.optionalTextsAreUniqueIgnoring(Constants.reservedTexts))) { errorStream = Stream.concat(errorStream, @@ -400,7 +403,7 @@ public Stream transformSomething( } if (!( - textsAreDisjoint(that.getTexts(), that.getOptionalTexts()))) { + textsAreDisjoint(that.getTexts(), thatOptionalTexts))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -472,8 +475,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalKind().isPresent()) - || (!Constants.specialKinds.contains(that.getOptionalKind().get())))) { + !(thatOptionalKind.isPresent()) + || (!Constants.specialKinds.contains(thatOptionalKind.get())))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -481,7 +484,7 @@ public Stream transformSomething( } if (!( - someKindIsNotSpecial(that.getKinds(), that.getOptionalKind()))) { + someKindIsNotSpecial(that.getKinds(), thatOptionalKind))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -562,9 +565,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalKind().isPresent()) { + if (thatOptionalKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalKind().get()) + Stream.of(thatOptionalKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( @@ -581,6 +584,9 @@ public Stream transformCollection( ICollection that) { Stream errorStream = Stream.empty(); + final Optional> thatOptionalTexts = that.getOptionalTexts(); + final Optional> thatOptionalDirections = that.getOptionalDirections(); + if (!that.textsAreNotAllIn(Constants.reservedTexts)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -589,8 +595,8 @@ public Stream transformCollection( } if (!( - !(that.getOptionalTexts().isPresent()) - || (SetHelpers.intersection(that.getOptionalTexts().get(), that.getTexts()).size() == 0))) { + !(thatOptionalTexts.isPresent()) + || (SetHelpers.intersection(thatOptionalTexts.get(), that.getTexts()).size() == 0))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -656,9 +662,9 @@ public Stream transformCollection( return error; })); - if (that.getOptionalDirections().isPresent()) { + if (thatOptionalDirections.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalDirections().get()) + Stream.of(thatOptionalDirections.get()) .flatMap(Verification::verifySetOf_Direction) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/sets/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/string_operations/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/switch_statements/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/verification/Verification.java index 7da25f4c2..3449e6bac 100644 --- a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -136,6 +137,8 @@ public Stream transformFirst( IFirst that) { Stream errorStream = Stream.empty(); + final Optional thatKind = that.getKind(); + if (!that.isCountWithin((long) that.getTexts().size())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -173,9 +176,9 @@ public Stream transformFirst( return error; })); - if (that.getKind().isPresent()) { + if (thatKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getKind().get()) + Stream.of(thatKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( @@ -192,6 +195,8 @@ public Stream transformSecond( ISecond that) { Stream errorStream = Stream.empty(); + final Optional thatKind = that.getKind(); + if (!that.isCountWithin((long) that.getTexts().size())) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -236,9 +241,9 @@ public Stream transformSecond( return error; })); - if (that.getKind().isPresent()) { + if (thatKind.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getKind().get()) + Stream.of(thatKind.get()) .flatMap(Verification::verifyKind) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/transpiled_methods/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 5004cbda3..874c82f18 100644 --- a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -80,10 +80,9 @@ public IClass transformSomething( that.setTricky( wrapTupleOf6_long_ISomeItem_IAbstractItem_ISomeItem_long_Result(that.getTricky())); - if (that.getOptionalPair().isPresent()) { - that.setOptionalPair( - wrapTupleOf2_string_IAbstractItem(that.getOptionalPair().get())); - } + that.getOptionalPair().ifPresent(value -> { + that.setOptionalPair(wrapTupleOf2_string_IAbstractItem(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/verification/Verification.java index ddf6c32b5..1229cf062 100644 --- a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/verification/Verification.java @@ -175,6 +175,8 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional> thatOptionalPair = that.getOptionalPair(); + if (!(that.getPair().item2() > 0)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -190,8 +192,8 @@ public Stream transformSomething( } if (!( - !(that.getOptionalPair().isPresent()) - || (that.getOptionalPair().get().size() == 2))) { + !(thatOptionalPair.isPresent()) + || (thatOptionalPair.get().size() == 2))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -225,9 +227,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalPair().isPresent()) { + if (thatOptionalPair.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalPair().get()) + Stream.of(thatOptionalPair.get()) .flatMap(Verification::verifyTupleOf2_string_IAbstractItem) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/tuples/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index 6da8ed19b..351ab7e64 100644 --- a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -232,25 +232,22 @@ public IClass transformSomething( that.setTupleProperty( wrapTupleOf3_StructuralUnion_MixedUnion_ModelTypedUnion(that.getTupleProperty())); - if (that.getOptionalStructuralProperty().isPresent()) { - that.setOptionalStructuralProperty( - wrap(that.getOptionalStructuralProperty().get())); - } + that.getOptionalStructuralProperty().ifPresent(value -> { + that.setOptionalStructuralProperty(wrap(value)); + }); - if (that.getOptionalMixedProperty().isPresent()) { - that.setOptionalMixedProperty( - wrap(that.getOptionalMixedProperty().get())); - } + that.getOptionalMixedProperty().ifPresent(value -> { + that.setOptionalMixedProperty(wrap(value)); + }); - if (that.getOptionalModelTypedProperty().isPresent()) { - that.setOptionalModelTypedProperty( - wrap(that.getOptionalModelTypedProperty().get())); - } + that.getOptionalModelTypedProperty().ifPresent(value -> { + that.setOptionalModelTypedProperty(wrap(value)); + }); - if (that.getOptionalListOverlappingProperty().isPresent()) { + that.getOptionalListOverlappingProperty().ifPresent(value -> { that.setOptionalListOverlappingProperty( - wrapListOf_OverlappingUnion(that.getOptionalListOverlappingProperty().get())); - } + wrapListOf_OverlappingUnion(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/verification/Verification.java index ca763bbd0..c448cef19 100644 --- a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/verification/Verification.java @@ -28,6 +28,7 @@ import dummy.types.model.*; import dummy.visitation.AbstractTransformer; import java.util.List; +import java.util.Optional; public class Verification { /** @@ -190,6 +191,11 @@ public Stream transformSomething( ISomething that) { Stream errorStream = Stream.empty(); + final Optional thatOptionalStructuralProperty = that.getOptionalStructuralProperty(); + final Optional thatOptionalMixedProperty = that.getOptionalMixedProperty(); + final Optional thatOptionalModelTypedProperty = that.getOptionalModelTypedProperty(); + final Optional> thatOptionalListOverlappingProperty = that.getOptionalListOverlappingProperty(); + errorStream = Stream.concat(errorStream, Stream.of(that.getStructuralProperty()) .flatMap(Verification::verifyToErrorStream) @@ -253,9 +259,9 @@ public Stream transformSomething( return error; })); - if (that.getOptionalStructuralProperty().isPresent()) { + if (thatOptionalStructuralProperty.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalStructuralProperty().get()) + Stream.of(thatOptionalStructuralProperty.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -264,9 +270,9 @@ public Stream transformSomething( })); } - if (that.getOptionalMixedProperty().isPresent()) { + if (thatOptionalMixedProperty.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalMixedProperty().get()) + Stream.of(thatOptionalMixedProperty.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -275,9 +281,9 @@ public Stream transformSomething( })); } - if (that.getOptionalModelTypedProperty().isPresent()) { + if (thatOptionalModelTypedProperty.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalModelTypedProperty().get()) + Stream.of(thatOptionalModelTypedProperty.get()) .flatMap(Verification::verifyToErrorStream) .map(error -> { error.prependSegment( @@ -286,9 +292,9 @@ public Stream transformSomething( })); } - if (that.getOptionalListOverlappingProperty().isPresent()) { + if (thatOptionalListOverlappingProperty.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getOptionalListOverlappingProperty().get()) + Stream.of(thatOptionalListOverlappingProperty.get()) .flatMap(Verification::verifyListOf_OverlappingUnion) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/unions/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/enhancing/_Wrapper.java b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/enhancing/_Wrapper.java index f3441fe87..ad6f33ee7 100644 --- a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/enhancing/_Wrapper.java +++ b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/enhancing/_Wrapper.java @@ -78,10 +78,9 @@ public IClass transformContainer( that.setSomeItems(wrapListOf_ISomeItem(that.getSomeItems())); - if (that.getSpecialItems().isPresent()) { - that.setSpecialItems( - wrapListOf_ISpecialItem(that.getSpecialItems().get())); - } + that.getSpecialItems().ifPresent(value -> { + that.setSpecialItems(wrapListOf_ISpecialItem(value)); + }); Optional enhancement = enhancementFactory.apply(that); return !enhancement.isPresent() diff --git a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/verification/Verification.java b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/verification/Verification.java index f1f3bbd1f..b8b27609c 100644 --- a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/verification/Verification.java +++ b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/verification/Verification.java @@ -432,11 +432,13 @@ public Stream transformContainer( IContainer that) { Stream errorStream = Stream.empty(); + final Optional> thatSpecialItems = that.getSpecialItems(); + if (!( - !(that.getSpecialItems().isPresent()) + !(thatSpecialItems.isPresent()) || ( - that.getSpecialItems().get().stream().allMatch( - specialItem -> containsSpecialItem(specialItem, that.getSpecialItems().orElse(null))) + thatSpecialItems.get().stream().allMatch( + specialItem -> containsSpecialItem(specialItem, thatSpecialItems.orElse(null))) ))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( @@ -463,7 +465,7 @@ public Stream transformContainer( } if (!( - aliasedNamesAreUnique(that.getSomeItems(), that.getSpecialItems()))) { + aliasedNamesAreUnique(that.getSomeItems(), thatSpecialItems))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -512,7 +514,7 @@ public Stream transformContainer( "Count of the items must match the number of the items."))); } - if (!optionalNamesAreUnique(that.getSpecialItems())) { + if (!optionalNamesAreUnique(thatSpecialItems)) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -520,8 +522,8 @@ public Stream transformContainer( } if (!( - !(that.getSpecialItems().isPresent()) - || firstIsSpecial(that.getSpecialItems().orElse(null)))) { + !(thatSpecialItems.isPresent()) + || firstIsSpecial(thatSpecialItems.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -529,8 +531,8 @@ public Stream transformContainer( } if (!( - !(that.getSpecialItems().isPresent()) - || levelsArePositive(that.getSpecialItems().orElse(null)))) { + !(thatSpecialItems.isPresent()) + || levelsArePositive(thatSpecialItems.orElse(null)))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -555,7 +557,7 @@ public Stream transformContainer( } if (!( - someNamesAreUnique(that.getSomeItems(), that.getSpecialItems()))) { + someNamesAreUnique(that.getSomeItems(), thatSpecialItems))) { errorStream = Stream.concat(errorStream, Stream.of(new Reporting.Error( "Invariant violated:\n" + @@ -587,9 +589,9 @@ public Stream transformContainer( return error; })); - if (that.getSpecialItems().isPresent()) { + if (thatSpecialItems.isPresent()) { errorStream = Stream.concat(errorStream, - Stream.of(that.getSpecialItems().get()) + Stream.of(thatSpecialItems.get()) .flatMap(Verification::verifyListOf_ISpecialItem) .map(error -> { error.prependSegment( diff --git a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/variance_of_containers/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name, diff --git a/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java b/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java index 4bbabc16b..9bca52f8d 100644 --- a/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java +++ b/dev/test_data/main/java/expected/visibility/expected_output/src/main/java/dummy/xmlcommon/XmlCommon.java @@ -12,6 +12,7 @@ import javax.xml.stream.XMLStreamWriter; import java.util.Optional; import java.util.regex.Pattern; +import dummy.types.model.*; import dummy.reporting.Reporting; /** @@ -569,7 +570,7 @@ public static void writeElement( *

This is what an item of a list or of a tuple is written with. It * contributes no segment to the error path: its container has already * contributed the item's index, and the index selects this very element - * (see {@link #writeListOf} in the generated writers). + * (see {@code writeListOf} in the generated writers). */ public static void writeElement( String name,