From 4dbfada06b8fd902e0ec096f7f50d36fb564d2fe Mon Sep 17 00:00:00 2001 From: juileetikekar Date: Thu, 12 Oct 2023 08:39:31 +0200 Subject: [PATCH] Supporting empty data specifications while conversion --- src/AasCore.Aas3_0/xmlization.cs | 7 +++++-- src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs | 7 ++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AasCore.Aas3_0/xmlization.cs b/src/AasCore.Aas3_0/xmlization.cs index 5139a0287..a4a15cc34 100644 --- a/src/AasCore.Aas3_0/xmlization.cs +++ b/src/AasCore.Aas3_0/xmlization.cs @@ -3,12 +3,11 @@ * Do NOT edit or append. */ +using System.Collections.Generic; // can't alias using Aas = AasCore.Aas3_0; // renamed using CodeAnalysis = System.Diagnostics.CodeAnalysis; using Xml = System.Xml; -using System.Collections.Generic; // can't alias - namespace AasCore.Aas3_0 { /// @@ -24657,6 +24656,10 @@ private void ReferenceToSequence( Aas.IReference that, Xml.XmlWriter writer) { + if (that == null) + { + return; + } writer.WriteStartElement( "type", NS); diff --git a/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs b/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs index c39d392b9..6bdde1cd1 100644 --- a/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs +++ b/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs @@ -359,13 +359,10 @@ private static void BasicConversionFromV10(this ISubmodelElement submodelElement } } - if (sourceSubmodelElement.hasDataSpecification != null) + if (sourceSubmodelElement.hasDataSpecification != null && !sourceSubmodelElement.hasDataSpecification.reference.IsNullOrEmpty()) { //TODO (jtikekar, 0000-00-00): EmbeddedDataSpecification?? (as per old implementation) - if (submodelElement.EmbeddedDataSpecifications == null) - { - submodelElement.EmbeddedDataSpecifications = new List(); - } + submodelElement.EmbeddedDataSpecifications ??= new List(); foreach (var dataSpecification in sourceSubmodelElement.hasDataSpecification.reference) { if (!dataSpecification.IsEmpty)