Skip to content

Commit a20d791

Browse files
antoineatstariongroupantoineatstariongroup
committed
Fix missing serialized elements
1 parent 4500c0c commit a20d791

59 files changed

Lines changed: 621 additions & 0 deletions

File tree

Some content is hidden

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

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
7373

7474
writer.WriteEndArray();
7575

76+
writer.WriteStartArray("client"u8);
77+
78+
foreach (var item in iDependency.Client)
79+
{
80+
writer.WriteStartObject();
81+
writer.WritePropertyName("@id"u8);
82+
writer.WriteStringValue(item);
83+
writer.WriteEndObject();
84+
}
85+
86+
writer.WriteEndArray();
87+
7688
writer.WritePropertyName("declaredName"u8);
7789
writer.WriteStringValue(iDependency.DeclaredName);
7890

@@ -152,6 +164,18 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
152164

153165
writer.WriteEndArray();
154166

167+
writer.WriteStartArray("supplier"u8);
168+
169+
foreach (var item in iDependency.Supplier)
170+
{
171+
writer.WriteStartObject();
172+
writer.WritePropertyName("@id"u8);
173+
writer.WriteStringValue(item);
174+
writer.WriteEndObject();
175+
}
176+
177+
writer.WriteEndArray();
178+
155179
writer.WriteStartArray("target"u8);
156180

157181
foreach (var item in iDependency.Target)

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8282
writer.WritePropertyName("elementId"u8);
8383
writer.WriteStringValue(iFeatureTyping.ElementId);
8484

85+
writer.WritePropertyName("general"u8);
86+
writer.WriteStartObject();
87+
writer.WritePropertyName("@id"u8);
88+
writer.WriteStringValue(iFeatureTyping.General);
89+
writer.WriteEndObject();
90+
8591
writer.WritePropertyName("isImplied"u8);
8692
writer.WriteBooleanValue(iFeatureTyping.IsImplied);
8793

@@ -152,6 +158,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
152158

153159
writer.WriteEndArray();
154160

161+
writer.WritePropertyName("specific"u8);
162+
writer.WriteStartObject();
163+
writer.WritePropertyName("@id"u8);
164+
writer.WriteStringValue(iFeatureTyping.Specific);
165+
writer.WriteEndObject();
166+
155167
writer.WriteStartArray("target"u8);
156168

157169
foreach (var item in iFeatureTyping.Target)
@@ -164,6 +176,18 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
164176

165177
writer.WriteEndArray();
166178

179+
writer.WritePropertyName("type"u8);
180+
writer.WriteStartObject();
181+
writer.WritePropertyName("@id"u8);
182+
writer.WriteStringValue(iFeatureTyping.Type);
183+
writer.WriteEndObject();
184+
185+
writer.WritePropertyName("typedFeature"u8);
186+
writer.WriteStartObject();
187+
writer.WritePropertyName("@id"u8);
188+
writer.WriteStringValue(iFeatureTyping.TypedFeature);
189+
writer.WriteEndObject();
190+
167191
writer.WriteEndObject();
168192
}
169193
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
9191
writer.WritePropertyName("kind"u8);
9292
writer.WriteStringValue(iFramedConcernMembership.Kind.ToString().ToLower());
9393

94+
writer.WritePropertyName("memberElement"u8);
95+
writer.WriteStartObject();
96+
writer.WritePropertyName("@id"u8);
97+
writer.WriteStringValue(iFramedConcernMembership.MemberElement);
98+
writer.WriteEndObject();
99+
94100
writer.WritePropertyName("memberName"u8);
95101
writer.WriteStringValue(iFramedConcernMembership.MemberName);
96102

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8888
writer.WritePropertyName("isImpliedIncluded"u8);
8989
writer.WriteBooleanValue(iMembership.IsImpliedIncluded);
9090

91+
writer.WritePropertyName("memberElement"u8);
92+
writer.WriteStartObject();
93+
writer.WritePropertyName("@id"u8);
94+
writer.WriteStringValue(iMembership.MemberElement);
95+
writer.WriteEndObject();
96+
9197
writer.WritePropertyName("memberName"u8);
9298
writer.WriteStringValue(iMembership.MemberName);
9399

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8888
writer.WritePropertyName("isImpliedIncluded"u8);
8989
writer.WriteBooleanValue(iOwningMembership.IsImpliedIncluded);
9090

91+
writer.WritePropertyName("memberElement"u8);
92+
writer.WriteStartObject();
93+
writer.WritePropertyName("@id"u8);
94+
writer.WriteStringValue(iOwningMembership.MemberElement);
95+
writer.WriteEndObject();
96+
9197
writer.WritePropertyName("memberName"u8);
9298
writer.WriteStringValue(iOwningMembership.MemberName);
9399

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8282
writer.WritePropertyName("elementId"u8);
8383
writer.WriteStringValue(iReferenceSubsetting.ElementId);
8484

85+
writer.WritePropertyName("general"u8);
86+
writer.WriteStartObject();
87+
writer.WritePropertyName("@id"u8);
88+
writer.WriteStringValue(iReferenceSubsetting.General);
89+
writer.WriteEndObject();
90+
8591
writer.WritePropertyName("isImplied"u8);
8692
writer.WriteBooleanValue(iReferenceSubsetting.IsImplied);
8793

@@ -140,6 +146,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
140146
writer.WriteNullValue();
141147
}
142148

149+
writer.WritePropertyName("referencedFeature"u8);
150+
writer.WriteStartObject();
151+
writer.WritePropertyName("@id"u8);
152+
writer.WriteStringValue(iReferenceSubsetting.ReferencedFeature);
153+
writer.WriteEndObject();
154+
143155
writer.WriteStartArray("source"u8);
144156

145157
foreach (var item in iReferenceSubsetting.Source)
@@ -152,6 +164,24 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
152164

153165
writer.WriteEndArray();
154166

167+
writer.WritePropertyName("specific"u8);
168+
writer.WriteStartObject();
169+
writer.WritePropertyName("@id"u8);
170+
writer.WriteStringValue(iReferenceSubsetting.Specific);
171+
writer.WriteEndObject();
172+
173+
writer.WritePropertyName("subsettedFeature"u8);
174+
writer.WriteStartObject();
175+
writer.WritePropertyName("@id"u8);
176+
writer.WriteStringValue(iReferenceSubsetting.SubsettedFeature);
177+
writer.WriteEndObject();
178+
179+
writer.WritePropertyName("subsettingFeature"u8);
180+
writer.WriteStartObject();
181+
writer.WritePropertyName("@id"u8);
182+
writer.WriteStringValue(iReferenceSubsetting.SubsettingFeature);
183+
writer.WriteEndObject();
184+
155185
writer.WriteStartArray("target"u8);
156186

157187
foreach (var item in iReferenceSubsetting.Target)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
169169
writer.WriteNullValue();
170170
}
171171

172+
writer.WritePropertyName("reqId"u8);
173+
writer.WriteStringValue(iRequirementUsage.ReqId);
174+
172175
writer.WriteEndObject();
173176
}
174177
}

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8282
writer.WritePropertyName("elementId"u8);
8383
writer.WriteStringValue(iSubclassification.ElementId);
8484

85+
writer.WritePropertyName("general"u8);
86+
writer.WriteStartObject();
87+
writer.WritePropertyName("@id"u8);
88+
writer.WriteStringValue(iSubclassification.General);
89+
writer.WriteEndObject();
90+
8591
writer.WritePropertyName("isImplied"u8);
8692
writer.WriteBooleanValue(iSubclassification.IsImplied);
8793

@@ -152,6 +158,24 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
152158

153159
writer.WriteEndArray();
154160

161+
writer.WritePropertyName("specific"u8);
162+
writer.WriteStartObject();
163+
writer.WritePropertyName("@id"u8);
164+
writer.WriteStringValue(iSubclassification.Specific);
165+
writer.WriteEndObject();
166+
167+
writer.WritePropertyName("subclassifier"u8);
168+
writer.WriteStartObject();
169+
writer.WritePropertyName("@id"u8);
170+
writer.WriteStringValue(iSubclassification.Subclassifier);
171+
writer.WriteEndObject();
172+
173+
writer.WritePropertyName("superclassifier"u8);
174+
writer.WriteStartObject();
175+
writer.WritePropertyName("@id"u8);
176+
writer.WriteStringValue(iSubclassification.Superclassifier);
177+
writer.WriteEndObject();
178+
155179
writer.WriteStartArray("target"u8);
156180

157181
foreach (var item in iSubclassification.Target)

‎SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@
227227
<None Update="Templates\Uml\core-dal-element-uml-extensions.hbs">
228228
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229229
</None>
230+
<None Update="Templates\Uml\core-dal-poco-uml-extensions.hbs">
231+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232+
</None>
230233
</ItemGroup>
231234

232235
<ItemGroup>

‎SysML2.NET.Serializer.Json/Core/AutoGenSerializer/ActorMembershipSerializer.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ internal static void Serialize(object obj, Utf8JsonWriter writer, SerializationM
8888
writer.WritePropertyName("isImpliedIncluded"u8);
8989
writer.WriteBooleanValue(iActorMembership.IsImpliedIncluded);
9090

91+
writer.WritePropertyName("memberElement"u8);
92+
writer.WriteStartObject();
93+
writer.WritePropertyName("@id"u8);
94+
writer.WriteStringValue(iActorMembership.MemberElement);
95+
writer.WriteEndObject();
96+
9197
writer.WritePropertyName("memberName"u8);
9298
writer.WriteStringValue(iActorMembership.MemberName);
9399

0 commit comments

Comments
 (0)