Skip to content

Fix #349 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoineatstariongroup merged 1 commit into from
Aug 26, 2026
Merged

Fix #349 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/AnnotatingElementExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsImpliedIncluded = dto.IsImpliedIncluded;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
18 changes: 10 additions & 8 deletions ...2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/AssociationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,25 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsSufficient = dto.IsSufficient;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
32 changes: 18 additions & 14 deletions ...L2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/DependencyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.AliasIds = dto.AliasIds;

var clientToDelete = poco.Client.Select(x => x.Id).Except(dto.Client);
var clientRetained = new HashSet<Guid>(dto.Client);
var clientToDelete = poco.Client.Where(x => !clientRetained.Contains(x.Id)).ToList();

foreach (var identifier in clientToDelete)
foreach (var client in clientToDelete)
{
poco.Client.Remove(poco.Client.Single(x => x.Id == identifier));
poco.Client.Remove(client);
}


Expand All @@ -88,29 +89,32 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsImpliedIncluded = dto.IsImpliedIncluded;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));

var supplierToDelete = poco.Supplier.Select(x => x.Id).Except(dto.Supplier);
var supplierRetained = new HashSet<Guid>(dto.Supplier);
var supplierToDelete = poco.Supplier.Where(x => !supplierRetained.Contains(x.Id)).ToList();

foreach (var identifier in supplierToDelete)
foreach (var supplier in supplierToDelete)
{
poco.Supplier.Remove(poco.Supplier.Single(x => x.Id == identifier));
poco.Supplier.Remove(supplier);
}


Expand Down
9 changes: 5 additions & 4 deletions ...Generator.Tests/Expected/UML/Core/AutoGenPocoExtension/EnumerationDefinitionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariation = dto.IsVariation;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
9 changes: 5 additions & 4 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariable = dto.IsVariable;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
18 changes: 10 additions & 8 deletions ...NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,25 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsImpliedIncluded = dto.IsImpliedIncluded;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
18 changes: 10 additions & 8 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FlowExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,25 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariable = dto.IsVariable;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
18 changes: 10 additions & 8 deletions ...nerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FramedConcernMembershipExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,25 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.Kind = dto.Kind;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));

poco.Visibility = dto.Visibility;

Expand Down
9 changes: 5 additions & 4 deletions ...ET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/LiteralIntegerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariable = dto.IsVariable;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));

poco.Value = dto.Value;

Expand Down
9 changes: 5 additions & 4 deletions ...T.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/LiteralRationalExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariable = dto.IsVariable;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));

poco.Value = dto.Value;

Expand Down
18 changes: 10 additions & 8 deletions ...L2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/MembershipExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,25 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.MemberShortName = dto.MemberShortName;

var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Select(x => x.Id).Except(dto.OwnedRelatedElement);
var ownedRelatedElementRetained = new HashSet<Guid>(dto.OwnedRelatedElement);
var ownedRelatedElementToDelete = poco.OwnedRelatedElement.Where(x => !ownedRelatedElementRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelatedElementToDelete)
foreach (var ownedRelatedElement in ownedRelatedElementToDelete)
{
((IContainedRelationship)poco).OwnedRelatedElement.Remove(poco.OwnedRelatedElement.Single(x => x.Id == identifier));
((IContainedRelationship)poco).OwnedRelatedElement.Remove(ownedRelatedElement);
}

identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelatedElementToDelete.Select(x => x.Id));

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));

poco.Visibility = dto.Visibility;

Expand Down
9 changes: 5 additions & 4 deletions ...CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/MultiplicityRangeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ public static IEnumerable<Guid> UpdateValueAndRemoveDeletedReferenceProperties(t

poco.IsVariable = dto.IsVariable;

var ownedRelationshipToDelete = poco.OwnedRelationship.Select(x => x.Id).Except(dto.OwnedRelationship);
var ownedRelationshipRetained = new HashSet<Guid>(dto.OwnedRelationship);
var ownedRelationshipToDelete = poco.OwnedRelationship.Where(x => !ownedRelationshipRetained.Contains(x.Id)).ToList();

foreach (var identifier in ownedRelationshipToDelete)
foreach (var ownedRelationship in ownedRelationshipToDelete)
{
((IContainedElement)poco).OwnedRelationship.Remove(poco.OwnedRelationship.Single(x => x.Id == identifier));
((IContainedElement)poco).OwnedRelationship.Remove(ownedRelationship);
}

identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete);
identifiersOfObjectsToDelete.AddRange(ownedRelationshipToDelete.Select(x => x.Id));


return identifiersOfObjectsToDelete;
Expand Down
Loading
Loading