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/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/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/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/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/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/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/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/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_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/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/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; } 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();