Skip to content

Commit 5a66699

Browse files
antoineatstariongroupantoineatstariongroup
committed
Serializes redefined properties
1 parent 0b1622b commit 5a66699

File tree

158 files changed

+9815
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+9815
-2
lines changed

‎SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenSerializer/AssociationSerializer.cs‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,18 @@ private static void SerializeAsJsonWithDerivedProperties(IAssociation iAssociati
156156
writer.WritePropertyName("elementId"u8);
157157
writer.WriteStringValue(iAssociation.ElementId);
158158

159+
writer.WriteStartArray("endFeature"u8);
160+
161+
foreach (var item in iAssociation.endFeature)
162+
{
163+
writer.WriteStartObject();
164+
writer.WritePropertyName("@id"u8);
165+
writer.WriteStringValue(item);
166+
writer.WriteEndObject();
167+
}
168+
169+
writer.WriteEndArray();
170+
159171
writer.WriteStartArray("feature"u8);
160172

161173
foreach (var item in iAssociation.feature)
@@ -590,6 +602,18 @@ private static void SerializeAsJsonWithDerivedProperties(IAssociation iAssociati
590602
writer.WritePropertyName("qualifiedName"u8);
591603
writer.WriteStringValue(iAssociation.qualifiedName);
592604

605+
writer.WriteStartArray("relatedElement"u8);
606+
607+
foreach (var item in iAssociation.relatedElement)
608+
{
609+
writer.WriteStartObject();
610+
writer.WritePropertyName("@id"u8);
611+
writer.WriteStringValue(item);
612+
writer.WriteEndObject();
613+
}
614+
615+
writer.WriteEndArray();
616+
593617
writer.WriteStartArray("relatedType"u8);
594618

595619
foreach (var item in iAssociation.relatedType)
@@ -605,6 +629,18 @@ private static void SerializeAsJsonWithDerivedProperties(IAssociation iAssociati
605629
writer.WritePropertyName("shortName"u8);
606630
writer.WriteStringValue(iAssociation.shortName);
607631

632+
writer.WriteStartArray("source"u8);
633+
634+
foreach (var item in iAssociation.Source)
635+
{
636+
writer.WriteStartObject();
637+
writer.WritePropertyName("@id"u8);
638+
writer.WriteStringValue(item);
639+
writer.WriteEndObject();
640+
}
641+
642+
writer.WriteEndArray();
643+
608644
writer.WritePropertyName("sourceType"u8);
609645

610646
if (iAssociation.sourceType.HasValue)
@@ -619,6 +655,18 @@ private static void SerializeAsJsonWithDerivedProperties(IAssociation iAssociati
619655
writer.WriteNullValue();
620656
}
621657

658+
writer.WriteStartArray("target"u8);
659+
660+
foreach (var item in iAssociation.Target)
661+
{
662+
writer.WriteStartObject();
663+
writer.WritePropertyName("@id"u8);
664+
writer.WriteStringValue(item);
665+
writer.WriteEndObject();
666+
}
667+
668+
writer.WriteEndArray();
669+
622670
writer.WriteStartArray("targetType"u8);
623671

624672
foreach (var item in iAssociation.targetType)
@@ -750,6 +798,30 @@ private static void SerializeAsJsonWithoutDerivedProperties(IAssociation iAssoci
750798
writer.WriteNullValue();
751799
}
752800

801+
writer.WriteStartArray("source"u8);
802+
803+
foreach (var item in iAssociation.Source)
804+
{
805+
writer.WriteStartObject();
806+
writer.WritePropertyName("@id"u8);
807+
writer.WriteStringValue(item);
808+
writer.WriteEndObject();
809+
}
810+
811+
writer.WriteEndArray();
812+
813+
writer.WriteStartArray("target"u8);
814+
815+
foreach (var item in iAssociation.Target)
816+
{
817+
writer.WriteStartObject();
818+
writer.WritePropertyName("@id"u8);
819+
writer.WriteStringValue(item);
820+
writer.WriteEndObject();
821+
}
822+
823+
writer.WriteEndArray();
824+
753825
}
754826
}
755827
}

‎SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenSerializer/DependencySerializer.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,18 @@ private static void SerializeAsJsonWithDerivedProperties(IDependency iDependency
280280
writer.WritePropertyName("shortName"u8);
281281
writer.WriteStringValue(iDependency.shortName);
282282

283+
writer.WriteStartArray("source"u8);
284+
285+
foreach (var item in iDependency.Source)
286+
{
287+
writer.WriteStartObject();
288+
writer.WritePropertyName("@id"u8);
289+
writer.WriteStringValue(item);
290+
writer.WriteEndObject();
291+
}
292+
293+
writer.WriteEndArray();
294+
283295
writer.WriteStartArray("supplier"u8);
284296

285297
foreach (var item in iDependency.Supplier)
@@ -292,6 +304,18 @@ private static void SerializeAsJsonWithDerivedProperties(IDependency iDependency
292304

293305
writer.WriteEndArray();
294306

307+
writer.WriteStartArray("target"u8);
308+
309+
foreach (var item in iDependency.Target)
310+
{
311+
writer.WriteStartObject();
312+
writer.WritePropertyName("@id"u8);
313+
writer.WriteStringValue(item);
314+
writer.WriteEndObject();
315+
}
316+
317+
writer.WriteEndArray();
318+
295319
writer.WriteStartArray("textualRepresentation"u8);
296320

297321
foreach (var item in iDependency.textualRepresentation)
@@ -405,6 +429,18 @@ private static void SerializeAsJsonWithoutDerivedProperties(IDependency iDepende
405429
writer.WriteNullValue();
406430
}
407431

432+
writer.WriteStartArray("source"u8);
433+
434+
foreach (var item in iDependency.Source)
435+
{
436+
writer.WriteStartObject();
437+
writer.WritePropertyName("@id"u8);
438+
writer.WriteStringValue(item);
439+
writer.WriteEndObject();
440+
}
441+
442+
writer.WriteEndArray();
443+
408444
writer.WriteStartArray("supplier"u8);
409445

410446
foreach (var item in iDependency.Supplier)
@@ -417,6 +453,18 @@ private static void SerializeAsJsonWithoutDerivedProperties(IDependency iDepende
417453

418454
writer.WriteEndArray();
419455

456+
writer.WriteStartArray("target"u8);
457+
458+
foreach (var item in iDependency.Target)
459+
{
460+
writer.WriteStartObject();
461+
writer.WritePropertyName("@id"u8);
462+
writer.WriteStringValue(item);
463+
writer.WriteEndObject();
464+
}
465+
466+
writer.WriteEndArray();
467+
420468
}
421469
}
422470
}

‎SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenSerializer/EnumerationDefinitionSerializer.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,18 @@ private static void SerializeAsJsonWithDerivedProperties(IEnumerationDefinition
951951

952952
writer.WriteEndArray();
953953

954+
writer.WriteStartArray("variant"u8);
955+
956+
foreach (var item in iEnumerationDefinition.variant)
957+
{
958+
writer.WriteStartObject();
959+
writer.WritePropertyName("@id"u8);
960+
writer.WriteStringValue(item);
961+
writer.WriteEndObject();
962+
}
963+
964+
writer.WriteEndArray();
965+
954966
writer.WriteStartArray("variantMembership"u8);
955967

956968
foreach (var item in iEnumerationDefinition.variantMembership)

‎SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenSerializer/FeatureTypingSerializer.cs‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ private static void SerializeAsJsonWithDerivedProperties(IFeatureTyping iFeature
120120
writer.WritePropertyName("elementId"u8);
121121
writer.WriteStringValue(iFeatureTyping.ElementId);
122122

123+
writer.WritePropertyName("general"u8);
124+
writer.WriteStartObject();
125+
writer.WritePropertyName("@id"u8);
126+
writer.WriteStringValue(iFeatureTyping.General);
127+
writer.WriteEndObject();
128+
123129
writer.WritePropertyName("isImplied"u8);
124130
writer.WriteBooleanValue(iFeatureTyping.IsImplied);
125131

@@ -264,6 +270,20 @@ private static void SerializeAsJsonWithDerivedProperties(IFeatureTyping iFeature
264270
writer.WriteNullValue();
265271
}
266272

273+
writer.WritePropertyName("owningType"u8);
274+
275+
if (iFeatureTyping.owningType.HasValue)
276+
{
277+
writer.WriteStartObject();
278+
writer.WritePropertyName("@id"u8);
279+
writer.WriteStringValue(iFeatureTyping.owningType.Value);
280+
writer.WriteEndObject();
281+
}
282+
else
283+
{
284+
writer.WriteNullValue();
285+
}
286+
267287
writer.WritePropertyName("qualifiedName"u8);
268288
writer.WriteStringValue(iFeatureTyping.qualifiedName);
269289

@@ -282,6 +302,36 @@ private static void SerializeAsJsonWithDerivedProperties(IFeatureTyping iFeature
282302
writer.WritePropertyName("shortName"u8);
283303
writer.WriteStringValue(iFeatureTyping.shortName);
284304

305+
writer.WriteStartArray("source"u8);
306+
307+
foreach (var item in iFeatureTyping.Source)
308+
{
309+
writer.WriteStartObject();
310+
writer.WritePropertyName("@id"u8);
311+
writer.WriteStringValue(item);
312+
writer.WriteEndObject();
313+
}
314+
315+
writer.WriteEndArray();
316+
317+
writer.WritePropertyName("specific"u8);
318+
writer.WriteStartObject();
319+
writer.WritePropertyName("@id"u8);
320+
writer.WriteStringValue(iFeatureTyping.Specific);
321+
writer.WriteEndObject();
322+
323+
writer.WriteStartArray("target"u8);
324+
325+
foreach (var item in iFeatureTyping.Target)
326+
{
327+
writer.WriteStartObject();
328+
writer.WritePropertyName("@id"u8);
329+
writer.WriteStringValue(item);
330+
writer.WriteEndObject();
331+
}
332+
333+
writer.WriteEndArray();
334+
285335
writer.WriteStartArray("textualRepresentation"u8);
286336

287337
foreach (var item in iFeatureTyping.textualRepresentation)
@@ -337,6 +387,12 @@ private static void SerializeAsJsonWithoutDerivedProperties(IFeatureTyping iFeat
337387
writer.WritePropertyName("elementId"u8);
338388
writer.WriteStringValue(iFeatureTyping.ElementId);
339389

390+
writer.WritePropertyName("general"u8);
391+
writer.WriteStartObject();
392+
writer.WritePropertyName("@id"u8);
393+
writer.WriteStringValue(iFeatureTyping.General);
394+
writer.WriteEndObject();
395+
340396
writer.WritePropertyName("isImplied"u8);
341397
writer.WriteBooleanValue(iFeatureTyping.IsImplied);
342398

@@ -395,6 +451,36 @@ private static void SerializeAsJsonWithoutDerivedProperties(IFeatureTyping iFeat
395451
writer.WriteNullValue();
396452
}
397453

454+
writer.WriteStartArray("source"u8);
455+
456+
foreach (var item in iFeatureTyping.Source)
457+
{
458+
writer.WriteStartObject();
459+
writer.WritePropertyName("@id"u8);
460+
writer.WriteStringValue(item);
461+
writer.WriteEndObject();
462+
}
463+
464+
writer.WriteEndArray();
465+
466+
writer.WritePropertyName("specific"u8);
467+
writer.WriteStartObject();
468+
writer.WritePropertyName("@id"u8);
469+
writer.WriteStringValue(iFeatureTyping.Specific);
470+
writer.WriteEndObject();
471+
472+
writer.WriteStartArray("target"u8);
473+
474+
foreach (var item in iFeatureTyping.Target)
475+
{
476+
writer.WriteStartObject();
477+
writer.WritePropertyName("@id"u8);
478+
writer.WriteStringValue(item);
479+
writer.WriteEndObject();
480+
}
481+
482+
writer.WriteEndArray();
483+
398484
writer.WritePropertyName("type"u8);
399485
writer.WriteStartObject();
400486
writer.WritePropertyName("@id"u8);

0 commit comments

Comments
 (0)