Remove child elements from MetadataDTOs (3.0.2)

src/DataTransferObjects/MetadataDTOs/AnnotatedRelationshipElementMetadata.cs

@@ -25,6 +25,5 @@ public record class AnnotatedRelationshipElementMetadata(
             List<ReferenceDTO>? SupplementalSemanticIds = null,
             List<QualifierDTO>? Qualifiers = null,
             List<EmbeddedDataSpecificationDTO>? EmbeddedDataSpecifications = null,
-            List<ISubmodelElementMetadata>? Annotations = null,
             string ModelType = "AnnotatedRelationshipElement") : ISubmodelElementMetadata;
 }

src/DataTransferObjects/MetadataDTOs/EntityMetadata.cs

@@ -27,6 +27,5 @@ public record class EntityMetadata(
             List<ReferenceDTO>? SupplementalSemanticIds = null,
             List<QualifierDTO>? Qualifiers = null,
             List<EmbeddedDataSpecificationDTO>? EmbeddedDataSpecifications = null,
-            List<ISubmodelElementMetadata>? Statements = null,
             string ModelType = "Entity") : ISubmodelElementMetadata;
 }

src/DataTransferObjects/MetadataDTOs/SubmodelElementCollectionMetadata.cs

@@ -25,6 +25,5 @@ public record class SubmodelElementCollectionMetadata(
             List<ReferenceDTO>? SupplementalSemanticIds = null,
             List<QualifierDTO>? Qualifiers = null,
             List<EmbeddedDataSpecificationDTO>? EmbeddedDataSpecifications = null,
-            List<ISubmodelElementMetadata>? Value = null,
             string ModelType = "SubmodelElementCollection") : ISubmodelElementMetadata;
 }

src/DataTransferObjects/MetadataDTOs/SubmodelElementListMetadata.cs

@@ -30,6 +30,5 @@ public record class SubmodelElementListMetadata(
             bool? OrderRelevant = null,
             ReferenceDTO? SemanticIdListElement = null,
             DataTypeDefXsd? ValueTypeListElement = null,
-            List<ISubmodelElementMetadata>? Value = null,
             string ModelType = "SubmodelElementList") : ISubmodelElementMetadata;
 }

src/DataTransferObjects/MetadataDTOs/SubmodelMetadata.cs

@@ -29,6 +29,5 @@ public record class SubmodelMetadata(
             List<ReferenceDTO>? SupplementalSemanticIds = null,
             List<QualifierDTO>? Qualifiers = null,
             List<EmbeddedDataSpecificationDTO>? EmbeddedDataSpecifications = null,
-            List<ISubmodelElementMetadata>? SubmodelElements = null,
             string ModelType = "Submodel") : IMetadataDTO;
 }

src/IO.Swagger.Lib.V3/Formatters/AasRequestFormatter.cs

@@ -189,9 +189,6 @@ private void GetSerializationMidifiersFromRequest(HttpRequest request, out Level
                 return output;
             }
 
-            // Deserialize submodelElements
-            var valueMetadata = ISubmodelElementMetadatListFrom(obj["submodelElements"]);
-
             var jsonString = obj.ToString();
 
             // Deserialize using System.Text.Json
@@ -216,8 +213,7 @@ private void GetSerializationMidifiersFromRequest(HttpRequest request, out Level
                                               submodelMetadata.SemanticId,
                                               submodelMetadata.SupplementalSemanticIds,
                                               submodelMetadata.Qualifiers,
-                                              submodelMetadata.EmbeddedDataSpecifications,
-                                              valueMetadata);
+                                              submodelMetadata.EmbeddedDataSpecifications);
             }
 
             return output;
@@ -273,15 +269,13 @@ private void GetSerializationMidifiersFromRequest(HttpRequest request, out Level
                 }
                 case "annotatedrelationshipelement":
                 {
-                    var valueMetadata = ISubmodelElementMetadatListFrom(obj["annotations"]);
-
                     node["annotations"] = null;
                     var annotatedRelElement = JsonSerializer.Deserialize<AnnotatedRelationshipElementMetadata>(node.ToJsonString(), serializerOptions);
 
                     output = new AnnotatedRelationshipElementMetadata(annotatedRelElement.Extensions, annotatedRelElement.Category, annotatedRelElement.IdShort,
                                                                       annotatedRelElement.DisplayName, annotatedRelElement.Description, annotatedRelElement.SemanticId,
                                                                       annotatedRelElement.SupplementalSemanticIds, annotatedRelElement.Qualifiers,
-                                                                      annotatedRelElement.EmbeddedDataSpecifications, valueMetadata);
+                                                                      annotatedRelElement.EmbeddedDataSpecifications);
                     break;
                 }
                 case "basiceventelement":
@@ -292,13 +286,10 @@ private void GetSerializationMidifiersFromRequest(HttpRequest request, out Level
                     break;
                 case "entity":
                 {
-                    var valueMetadata = ISubmodelElementMetadatListFrom(obj["statements"]);
-
-                    node["statements"] = null;
                     var entity = JsonSerializer.Deserialize<EntityMetadata>(node.ToJsonString(), serializerOptions);
 
                     output = new EntityMetadata(entity.EntityType, entity.Extensions, entity.Category, entity.IdShort, entity.DisplayName, entity.Description,
-                                                entity.SemanticId, entity.SupplementalSemanticIds, entity.Qualifiers, entity.EmbeddedDataSpecifications, valueMetadata);
+                                                entity.SemanticId, entity.SupplementalSemanticIds, entity.Qualifiers, entity.EmbeddedDataSpecifications);
                     break;
                 }
                 case "file":
@@ -321,28 +312,21 @@ private void GetSerializationMidifiersFromRequest(HttpRequest request, out Level
                     break;
                 case "submodelelementcollection":
                 {
-                    var valueMetadata = ISubmodelElementMetadatListFrom(obj["value"]);
-
-                    node["value"] = null;
                     var smeColl = JsonSerializer.Deserialize<SubmodelElementCollectionMetadata>(node.ToJsonString(), serializerOptions);
 
                     output = new SubmodelElementCollectionMetadata(smeColl.Extensions, smeColl.Category, smeColl.IdShort, smeColl.DisplayName, smeColl.Description,
-                                                                   smeColl.SemanticId, smeColl.SupplementalSemanticIds, smeColl.Qualifiers, smeColl.EmbeddedDataSpecifications,
-                                                                   valueMetadata);
+                                                                   smeColl.SemanticId, smeColl.SupplementalSemanticIds, smeColl.Qualifiers, smeColl.EmbeddedDataSpecifications);
 
                     break;
                 }
                 case "submodelelementlist":
                 {
-                    var valueMetadata = ISubmodelElementMetadatListFrom(obj["value"]);
-
-                    node["value"] = null;
                     var smeList = JsonSerializer.Deserialize<SubmodelElementListMetadata>(node.ToJsonString(), serializerOptions);
 
                     output = new SubmodelElementListMetadata(smeList.TypeValueListElement, smeList.Extensions, smeList.Category, smeList.IdShort, smeList.DisplayName,
                                                              smeList.Description, smeList.SemanticId, smeList.SupplementalSemanticIds, smeList.Qualifiers,
                                                              smeList.EmbeddedDataSpecifications, smeList.OrderRelevant, smeList.SemanticIdListElement,
-                                                             smeList.ValueTypeListElement, valueMetadata);
+                                                             smeList.ValueTypeListElement);
                     break;
                 }
             }

src/IO.Swagger.Lib.V3/SerializationModifiers/Mappers/MetadataMappers/MetadataJsonSerializer.cs

@@ -7,6 +7,8 @@ namespace IO.Swagger.Lib.V3.SerializationModifiers.Mappers.MetadataMappers;
 using AasCore.Aas3_0;
 using DataTransferObjects.CommonDTOs;
 using System.Collections.Generic;
+using IO.Swagger.Lib.V3.Exceptions;
+using static AasxServerStandardBib.TimeSeriesPlotting.PlotArguments;
 
 public class MetadataJsonSerializer
 {
@@ -18,7 +20,7 @@ public class MetadataJsonSerializer
         {
             return TransformRelationshipElement(relationshipElementMetadata);
         }
-        else if (that is IAnnotatedRelationshipElement annotatedRelationshipElementMetadata)
+        else if (that is AnnotatedRelationshipElementMetadata annotatedRelationshipElementMetadata)
         {
             return TransformAnnotatedRelationshipElement(annotatedRelationshipElementMetadata);
         }
@@ -44,7 +46,7 @@ private static JsonNode Serialize(IMetadataDTO that)
         }
         else
         {
-            throw new InvalidOperationException($"The Metadata serialization of type {that.GetType()} is not supported.");
+            throw new InvalidSerializationModifierException("metadata", that.GetType().Name);
         }
     }
 
@@ -138,7 +140,61 @@ private static JsonNode Serialize(IMetadataDTO that)
 
         return result;
     }
-    private static JsonNode? TransformAnnotatedRelationshipElement(IAnnotatedRelationshipElement annotatedRelationshipElementMetadata) => throw new NotImplementedException();
+    private static JsonNode? TransformAnnotatedRelationshipElement(AnnotatedRelationshipElementMetadata that)
+    {
+        var result = new JsonObject();
+
+        if (that.Extensions != null)
+        {
+            result["extensions"] = TransformExtensions(that.Extensions);
+        }
+
+        if (that.Category != null)
+        {
+            result["category"] = JsonValue.Create(
+                that.Category);
+        }
+
+        if (that.IdShort != null)
+        {
+            result["idShort"] = JsonValue.Create(
+                that.IdShort);
+        }
+
+        if (that.DisplayName != null)
+        {
+            result["displayName"] = TransformDisplayName(that.DisplayName);
+        }
+
+        if (that.Description != null)
+        {
+            result["description"] = TransformDescription(that.Description);
+        }
+
+        if (that.SemanticId != null)
+        {
+            result["semanticId"] = TransformReference(that.SemanticId);
+        }
+
+        if (that.SupplementalSemanticIds != null)
+        {
+            result["supplementalSemanticIds"] = TransformReferenceList(that.SupplementalSemanticIds);
+        }
+
+        if (that.Qualifiers != null)
+        {
+            result["qualifiers"] = TransformQualifiers(that.Qualifiers);
+        }
+
+        if (that.EmbeddedDataSpecifications != null)
+        {
+            result["embeddedDataSpecifications"] = TransformEmbeddedDataSpecifications(that.EmbeddedDataSpecifications);
+        }
+
+        result["modelType"] = "AnnotatedRelationshipElement";
+
+        return result;
+    }
 
     private static JsonNode? TransformRelationshipElement(RelationshipElementMetadata that)
     {

src/IO.Swagger.Lib.V3/SerializationModifiers/Mappers/MetadataMappers/RequestMetadataMapper.cs

@@ -13,6 +13,7 @@
 
 using DataTransferObjects.CommonDTOs;
 using DataTransferObjects.MetadataDTOs;
+using IO.Swagger.Lib.V3.Exceptions;
 using System.Collections.Generic;
 
 namespace IO.Swagger.Lib.V3.SerializationModifiers.Mappers.MetadataMappers
@@ -48,79 +49,34 @@ public static IClass Map(IMetadataDTO source)
             if (source is SubmodelMetadata submodelMetadata)
                 return Transform(submodelMetadata);
 
-            return null;
+            throw new InvalidSerializationModifierException("metadata", source.GetType().Name);
         }
 
         private static ISubmodel Transform(SubmodelMetadata metadata)
         {
-            List<ISubmodelElement> submodelElements = null;
-            if (metadata.SubmodelElements != null)
-            {
-                submodelElements = new List<ISubmodelElement>();
-                foreach (var element in metadata.SubmodelElements)
-                {
-                    submodelElements.Add((ISubmodelElement)Map(element));
-                }
-            }
-            return new Submodel(metadata.Id, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformAdministrationInformation(metadata.Administration), metadata.Kind, TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), submodelElements);
+            return new Submodel(metadata.Id, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformAdministrationInformation(metadata.Administration), metadata.Kind, TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications));
         }
 
 
 
         private static IEntity Transform(EntityMetadata metadata)
         {
-            List<ISubmodelElement> statements = null;
-            if (metadata.Statements != null)
-            {
-                statements = new List<ISubmodelElement>();
-                foreach (var element in metadata.Statements)
-                {
-                    statements.Add((ISubmodelElement)Map(element));
-                }
-            }
-            return new Entity(metadata.EntityType, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), statements);
+            return new Entity(metadata.EntityType, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications));
         }
 
         private static IAnnotatedRelationshipElement Transform(AnnotatedRelationshipElementMetadata metadata)
         {
-            List<IDataElement> annotations = null;
-            if (metadata.Annotations != null)
-            {
-                annotations = new List<IDataElement>();
-                foreach (var element in metadata.Annotations)
-                {
-                    annotations.Add((IDataElement)Map(element));
-                }
-            }
-            return new AnnotatedRelationshipElement(null, null, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), annotations);
+            return new AnnotatedRelationshipElement(null, null, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications));
         }
 
         private static ISubmodelElementList Transform(SubmodelElementListMetadata metadata)
         {
-            List<ISubmodelElement> value = null;
-            if (metadata.Value != null)
-            {
-                value = new List<ISubmodelElement>();
-                foreach (var element in metadata.Value)
-                {
-                    value.Add((ISubmodelElement)Map(element));
-                }
-            }
-            return new SubmodelElementList(metadata.TypeValueListElement, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), metadata.OrderRelevant, TransformReference(metadata.SemanticIdListElement), metadata.ValueTypeListElement, value);
+            return new SubmodelElementList(metadata.TypeValueListElement, TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), metadata.OrderRelevant, TransformReference(metadata.SemanticIdListElement), metadata.ValueTypeListElement);
         }
 
         private static ISubmodelElementCollection Transform(SubmodelElementCollectionMetadata metadata)
         {
-            List<ISubmodelElement> value = null;
-            if (metadata.Value != null)
-            {
-                value = new List<ISubmodelElement>();
-                foreach (var element in metadata.Value)
-                {
-                    value.Add((ISubmodelElement)Map(element));
-                }
-            }
-            return new SubmodelElementCollection(TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications), value);
+            return new SubmodelElementCollection(TransformExtensions(metadata.Extensions), metadata.Category, metadata.IdShort, TransformLangStringNameTypeList(metadata.DisplayName), TransformLangStringTextTypeList(metadata.Description), TransformReference(metadata.SemanticId), TransformReferenceList(metadata.SupplementalSemanticIds), TransformQualifierList(metadata.Qualifiers), TransformEmbeddedDataSpecList(metadata.EmbeddedDataSpecifications));
         }
 
         private static IRelationshipElement Transform(RelationshipElementMetadata metadata)