Skip to content

Commit

Permalink
Explicitly check for null in JSON de-serialization (#43)
Browse files Browse the repository at this point in the history 
We explicitly check that both optional and required properties can not
be set to ``null``. The optional properties should be explicitly absent
from the object by specification, and thus ``null`` is not an acceptable
value for optional properties.

Fixes #41.

Generated with [aas-core-codegen 0ec5c403].

[aas-core-codegen 0ec5c403]: aas-core-works/aas-core-codegen@0ec5c403
  • Loading branch information
@mristin
mristin authored Sep 4, 2024
1 parent 6e224b9 commit 6080bc6
Show file tree
Hide file tree
Showing 55 changed files with 1,948 additions and 344 deletions.
2,184 changes: 1,894 additions & 290 deletions src/AasCore.Aas3_0/jsonization.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...Unexpected/Unserializable/NullViolation/AnnotatedRelationshipElement/first.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "first" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].first
2 changes: 1 addition & 1 deletion ...nexpected/Unserializable/NullViolation/AnnotatedRelationshipElement/second.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "second" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].second
2 changes: 1 addition & 1 deletion ...ted/Unserializable/NullViolation/AssetAdministrationShell/assetInformation.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "assetInformation" is missing at: assetAdministrationShells[0]
Unexpected null for a required property at: assetAdministrationShells[0].assetInformation
2 changes: 1 addition & 1 deletion ...onment/Unexpected/Unserializable/NullViolation/AssetAdministrationShell/id.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "id" is missing at: assetAdministrationShells[0]
Unexpected null for a required property at: assetAdministrationShells[0].id
2 changes: 1 addition & 1 deletion ...ronment/Unexpected/Unserializable/NullViolation/AssetInformation/assetKind.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "assetKind" is missing at: assetAdministrationShells[0].assetInformation
Unexpected null for a required property at: assetAdministrationShells[0].assetInformation.assetKind
2 changes: 1 addition & 1 deletion ...onment/Unexpected/Unserializable/NullViolation/BasicEventElement/direction.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "direction" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].direction
2 changes: 1 addition & 1 deletion ...ronment/Unexpected/Unserializable/NullViolation/BasicEventElement/observed.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "observed" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].observed
2 changes: 1 addition & 1 deletion ...nvironment/Unexpected/Unserializable/NullViolation/BasicEventElement/state.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "state" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].state
2 changes: 1 addition & 1 deletion ...inedInEnvironment/Unexpected/Unserializable/NullViolation/Blob/contentType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "contentType" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].contentType
2 changes: 1 addition & 1 deletion ...nEnvironment/Unexpected/Unserializable/NullViolation/ConceptDescription/id.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "id" is missing at: conceptDescriptions[0]
Unexpected null for a required property at: conceptDescriptions[0].id
2 changes: 1 addition & 1 deletion ...ected/Unserializable/NullViolation/DataSpecificationIec61360/preferredName.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "preferredName" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.preferredName
2 changes: 1 addition & 1 deletion ...d/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "dataSpecification" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecification
2 changes: 1 addition & 1 deletion ...ializable/NullViolation/EmbeddedDataSpecification/dataSpecificationContent.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "dataSpecificationContent" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent
2 changes: 1 addition & 1 deletion ...nedInEnvironment/Unexpected/Unserializable/NullViolation/Entity/entityType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "entityType" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].entityType
2 changes: 1 addition & 1 deletion ...tainedInEnvironment/Unexpected/Unserializable/NullViolation/Extension/name.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "name" is missing at: assetAdministrationShells[0].extensions[0]
Unexpected null for a required property at: assetAdministrationShells[0].extensions[0].name
2 changes: 1 addition & 1 deletion ...inedInEnvironment/Unexpected/Unserializable/NullViolation/File/contentType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "contentType" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].contentType
2 changes: 1 addition & 1 deletion ...on/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/Key/type.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "type" is missing at: assetAdministrationShells[0].derivedFrom.keys[0]
Unexpected null for a required property at: assetAdministrationShells[0].derivedFrom.keys[0].type
2 changes: 1 addition & 1 deletion ...n/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/Key/value.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "value" is missing at: assetAdministrationShells[0].derivedFrom.keys[0]
Unexpected null for a required property at: assetAdministrationShells[0].derivedFrom.keys[0].value
2 changes: 1 addition & 1 deletion ...ted/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/language.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "language" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.definition[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.definition[0].language
2 changes: 1 addition & 1 deletion ...xpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/text.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "text" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.definition[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.definition[0].text
2 changes: 1 addition & 1 deletion ...onment/Unexpected/Unserializable/NullViolation/LangStringNameType/language.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "language" is missing at: assetAdministrationShells[0].displayName[0]
Unexpected null for a required property at: assetAdministrationShells[0].displayName[0].language
2 changes: 1 addition & 1 deletion ...nvironment/Unexpected/Unserializable/NullViolation/LangStringNameType/text.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "text" is missing at: assetAdministrationShells[0].displayName[0]
Unexpected null for a required property at: assetAdministrationShells[0].displayName[0].text
2 changes: 1 addition & 1 deletion .../Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/language.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "language" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.preferredName[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.preferredName[0].language
2 changes: 1 addition & 1 deletion ...cted/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/text.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "text" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.preferredName[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.preferredName[0].text
2 changes: 1 addition & 1 deletion ...cted/Unserializable/NullViolation/LangStringShortNameTypeIec61360/language.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "language" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.shortName[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.shortName[0].language
2 changes: 1 addition & 1 deletion ...expected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/text.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "text" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.shortName[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.shortName[0].text
2 changes: 1 addition & 1 deletion ...onment/Unexpected/Unserializable/NullViolation/LangStringTextType/language.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "language" is missing at: assetAdministrationShells[0].description[0]
Unexpected null for a required property at: assetAdministrationShells[0].description[0].language
2 changes: 1 addition & 1 deletion ...nvironment/Unexpected/Unserializable/NullViolation/LangStringTextType/text.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "text" is missing at: assetAdministrationShells[0].description[0]
Unexpected null for a required property at: assetAdministrationShells[0].description[0].text
2 changes: 1 addition & 1 deletion ...ntainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/max.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "max" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType.max
2 changes: 1 addition & 1 deletion ...ntainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/min.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "min" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType.min
2 changes: 1 addition & 1 deletion ...ntainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/nom.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "nom" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType.nom
2 changes: 1 addition & 1 deletion ...ntainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/typ.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "typ" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.levelType.typ
2 changes: 1 addition & 1 deletion ...nvironment/Unexpected/Unserializable/NullViolation/OperationVariable/value.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "value" is missing at: submodels[0].submodelElements[0].inputVariables[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].inputVariables[0].value
2 changes: 1 addition & 1 deletion ...edInEnvironment/Unexpected/Unserializable/NullViolation/Property/valueType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "valueType" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].valueType
2 changes: 1 addition & 1 deletion ...tainedInEnvironment/Unexpected/Unserializable/NullViolation/Qualifier/type.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "type" is missing at: submodels[0].qualifiers[0]
Unexpected null for a required property at: submodels[0].qualifiers[0].type
2 changes: 1 addition & 1 deletion ...dInEnvironment/Unexpected/Unserializable/NullViolation/Qualifier/valueType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "valueType" is missing at: submodels[0].qualifiers[0]
Unexpected null for a required property at: submodels[0].qualifiers[0].valueType
2 changes: 1 addition & 1 deletion ...ainedInEnvironment/Unexpected/Unserializable/NullViolation/Range/valueType.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "valueType" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].valueType
2 changes: 1 addition & 1 deletion ...tainedInEnvironment/Unexpected/Unserializable/NullViolation/Reference/keys.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "keys" is missing at: assetAdministrationShells[0].derivedFrom
Unexpected null for a required property at: assetAdministrationShells[0].derivedFrom.keys
2 changes: 1 addition & 1 deletion ...tainedInEnvironment/Unexpected/Unserializable/NullViolation/Reference/type.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "type" is missing at: assetAdministrationShells[0].derivedFrom
Unexpected null for a required property at: assetAdministrationShells[0].derivedFrom.type
2 changes: 1 addition & 1 deletion ...ironment/Unexpected/Unserializable/NullViolation/RelationshipElement/first.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "first" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].first
2 changes: 1 addition & 1 deletion ...ronment/Unexpected/Unserializable/NullViolation/RelationshipElement/second.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "second" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].second
2 changes: 1 addition & 1 deletion ...ntainedInEnvironment/Unexpected/Unserializable/NullViolation/Resource/path.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "path" is missing at: assetAdministrationShells[0].assetInformation.defaultThumbnail
Unexpected null for a required property at: assetAdministrationShells[0].assetInformation.defaultThumbnail.path
2 changes: 1 addition & 1 deletion ...InEnvironment/Unexpected/Unserializable/NullViolation/SpecificAssetId/name.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "name" is missing at: assetAdministrationShells[0].assetInformation.specificAssetIds[0]
Unexpected null for a required property at: assetAdministrationShells[0].assetInformation.specificAssetIds[0].name
2 changes: 1 addition & 1 deletion ...nEnvironment/Unexpected/Unserializable/NullViolation/SpecificAssetId/value.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "value" is missing at: assetAdministrationShells[0].assetInformation.specificAssetIds[0]
Unexpected null for a required property at: assetAdministrationShells[0].assetInformation.specificAssetIds[0].value
2 changes: 1 addition & 1 deletion ...ContainedInEnvironment/Unexpected/Unserializable/NullViolation/Submodel/id.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "id" is missing at: submodels[0]
Unexpected null for a required property at: submodels[0].id
2 changes: 1 addition & 1 deletion ...cted/Unserializable/NullViolation/SubmodelElementList/typeValueListElement.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "typeValueListElement" is missing at: submodels[0].submodelElements[0]
Unexpected null for a required property at: submodels[0].submodelElements[0].typeValueListElement
2 changes: 1 addition & 1 deletion ...ment/Unexpected/Unserializable/NullViolation/ValueList/valueReferencePairs.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "valueReferencePairs" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList.valueReferencePairs
2 changes: 1 addition & 1 deletion ...vironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/value.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "value" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList.valueReferencePairs[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList.valueReferencePairs[0].value
2 changes: 1 addition & 1 deletion ...ronment/Unexpected/Unserializable/NullViolation/ValueReferencePair/valueId.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "valueId" is missing at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList.valueReferencePairs[0]
Unexpected null for a required property at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent.valueList.valueReferencePairs[0].valueId
2 changes: 1 addition & 1 deletion ...ializable/TypeViolation/EmbeddedDataSpecification/dataSpecificationContent.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Expected Nodes.JsonObject, but got {node.GetType()} at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent
Expected Nodes.JsonObject, but got System.Text.Json.Nodes.JsonValueTrimmable`1[System.Text.Json.JsonElement] at: assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecificationContent
2 changes: 1 addition & 1 deletion ...nvironment/Unexpected/Unserializable/TypeViolation/OperationVariable/value.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Expected Nodes.JsonObject, but got {node.GetType()} at: submodels[0].submodelElements[0].inputVariables[0].value
Expected Nodes.JsonObject, but got System.Text.Json.Nodes.JsonValueTrimmable`1[System.Text.Json.JsonElement] at: submodels[0].submodelElements[0].inputVariables[0].value
2 changes: 1 addition & 1 deletion ...d/Unexpected/Unserializable/NullViolation/EventPayload/observableReference.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "observableReference" is missing at:
Unexpected null for a required property at: observableReference
2 changes: 1 addition & 1 deletion .../SelfContained/Unexpected/Unserializable/NullViolation/EventPayload/source.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "source" is missing at:
Unexpected null for a required property at: source
2 changes: 1 addition & 1 deletion ...lfContained/Unexpected/Unserializable/NullViolation/EventPayload/timeStamp.json.exception
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Required property "timeStamp" is missing at:
Unexpected null for a required property at: timeStamp

0 comments on commit 6080bc6

Please sign in to comment.