Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
var shortNameSeen = false;
var textualRepresentationSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -475,10 +476,12 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down Expand Up @@ -596,6 +599,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
var ownedRelationshipSeen = false;
var owningRelationshipSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -720,10 +724,12 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,13 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
var textualRepresentationSeen = false;
var unioningTypeSeen = false;

var targetRedefinitionSeen = false;
System.Collections.Generic.List<Guid> targetRedefinitionValue = [];

var sourceRedefinitionSeen = false;
System.Collections.Generic.List<Guid> sourceRedefinitionValue = [];


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -1079,10 +1086,66 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
}


if (reader.ValueTextEquals("target"u8))
{
targetRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
targetRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}

if (reader.ValueTextEquals("source"u8))
{
sourceRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
sourceRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}


reader.Read();
reader.Skip();
}

if (targetRedefinitionSeen)
{
if (!targetTypeSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target = targetRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target, targetRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The target Json property of the Association {Id} disagrees with targetType; the targetType value is kept", dtoInstance.Id);
}
}

if (sourceRedefinitionSeen)
{
if (!sourceTypeSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source = sourceRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source, sourceRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The source Json property of the Association {Id} disagrees with sourceType; the sourceType value is kept", dtoInstance.Id);
}
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down Expand Up @@ -1337,6 +1400,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
var owningRelatedElementSeen = false;
var owningRelationshipSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -1535,10 +1599,12 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
var supplierSeen = false;
var textualRepresentationSeen = false;

var targetRedefinitionSeen = false;
System.Collections.Generic.List<Guid> targetRedefinitionValue = [];

var sourceRedefinitionSeen = false;
System.Collections.Generic.List<Guid> sourceRedefinitionValue = [];


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -508,10 +515,66 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
}


if (reader.ValueTextEquals("target"u8))
{
targetRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
targetRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}

if (reader.ValueTextEquals("source"u8))
{
sourceRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
sourceRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}


reader.Read();
reader.Skip();
}

if (targetRedefinitionSeen)
{
if (!supplierSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target = targetRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target, targetRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The target Json property of the Dependency {Id} disagrees with supplier; the supplier value is kept", dtoInstance.Id);
}
}

if (sourceRedefinitionSeen)
{
if (!clientSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source = sourceRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source, sourceRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The source Json property of the Dependency {Id} disagrees with client; the client value is kept", dtoInstance.Id);
}
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down Expand Up @@ -642,6 +705,13 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
var owningRelationshipSeen = false;
var supplierSeen = false;

var targetRedefinitionSeen = false;
System.Collections.Generic.List<Guid> targetRedefinitionValue = [];

var sourceRedefinitionSeen = false;
System.Collections.Generic.List<Guid> sourceRedefinitionValue = [];


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -850,10 +920,66 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
}


if (reader.ValueTextEquals("target"u8))
{
targetRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
targetRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}

if (reader.ValueTextEquals("source"u8))
{
sourceRedefinitionSeen = true;
reader.Read();
Utf8JsonReaderHelper.ExpectArrayStart(ref reader);
while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
{
if (Utf8JsonReaderHelper.TryReadReferenceIdentifier(ref reader, out var redefinitionItem))
{
sourceRedefinitionValue.Add(redefinitionItem);
}
}
continue;
}


reader.Read();
reader.Skip();
}

if (targetRedefinitionSeen)
{
if (!supplierSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target = targetRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Target, targetRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The target Json property of the Dependency {Id} disagrees with supplier; the supplier value is kept", dtoInstance.Id);
}
}

if (sourceRedefinitionSeen)
{
if (!clientSeen)
{
((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source = sourceRedefinitionValue;
}
else if (!System.Linq.Enumerable.SequenceEqual(((SysML2.NET.Core.DTO.Root.Elements.IRelationship)dtoInstance).Source, sourceRedefinitionValue) && logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("The source Json property of the Dependency {Id} disagrees with client; the client value is kept", dtoInstance.Id);
}
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
var usageSeen = false;
var variantMembershipSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -1575,10 +1576,12 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down Expand Up @@ -1935,6 +1938,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
var ownedRelationshipSeen = false;
var owningRelationshipSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -2098,10 +2102,12 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
var typeSeen = false;
var unioningTypeSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -1378,10 +1379,12 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down Expand Up @@ -1714,6 +1717,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
var ownedRelationshipSeen = false;
var owningRelationshipSeen = false;


while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
{
if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down Expand Up @@ -1978,10 +1982,12 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
}



reader.Read();
reader.Skip();
}


if (logger.IsEnabled(LogLevel.Debug))
{
if (!aliasIdsSeen)
Expand Down
Loading
Loading