Skip to content

Feat/merge in system text json branch; fixes #262 #354

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

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Feat/merge in system text json branch; fixes #262 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4701faa
[Replace] Newtonsoft.Json with System.Text.Json; fixes #262
Oct 24, 2024
57f6ddb
Rebase on 28.3.0 and create 29.0.0-rc1
Mar 25, 2025
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CDP4-SDK.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
<copyright file="${File.FileName}" company="Starion Group S.A.">
Copyright (c) 2015-${CurrentDate.Year} Starion Group S.A.

Author: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar
Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar

This file is part of CDP4-COMET SDK Community Edition

Expand Down
4 changes: 2 additions & 2 deletions CDP4Common/CDP4Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
<Company>Starion Group S.A.</Company>
<Title>CDP4Common Community Edition</Title>
<VersionPrefix>28.3.1</VersionPrefix>
<VersionPrefix>29.0.0</VersionPrefix>
<Description>CDP4 Common Class Library that contains DTOs, POCOs</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael, Ahmed</Authors>
Expand All @@ -20,7 +20,7 @@
<PackageTags>CDP COMET ECSS-E-TM-10-25</PackageTags>
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
<PackageReleaseNotes>
[REFACTOR] ValueSetConverter.ToValueSetString for TextParameterTypes
[Refactor] Newtonsoft to System.Text.Json
</PackageReleaseNotes>
<PackageReadmeFile>README.md</PackageReadmeFile>
<LangVersion>latest</LangVersion>
Expand Down
40 changes: 23 additions & 17 deletions CDP4Dal.NetCore.Tests/DAL/DalTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DalTestFixture.cs" company="Starion Group S.A.">
// Copyright (c) 2015-2024 Starion Group S.A.
//
// Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou, Alexander van Delft
//
// This file is part of CDP4-SDK Community Edition
//
// The CDP4-SDK Community Edition is free software; you can redistribute it and/or
// -------------------------------------------------------------------------------------------------------------------------------
// <copyright file="DalTestFixture.cs" company="RHEA System S.A.">
// Copyright (c) 2015-2024 RHEA System S.A.
//
// Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar
//
// This file is part of CDP4-COMET SDK Community Edition
//
// The CDP4-COMET SDK Community Edition is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 3 of the License, or (at your option) any later version.
//
// The CDP4-SDK Community Edition is distributed in the hope that it will be useful,
//
// The CDP4-COMET SDK Community Edition is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------

namespace CDP4Dal.Tests.DAL
{
Expand All @@ -36,12 +36,13 @@ namespace CDP4Dal.Tests.DAL
using CDP4Common.Helpers;

using CDP4Dal.Composition;
using CDP4Dal.DAL;
using CDP4Dal.Exceptions;
using CDP4Dal.Operations;
using CDP4Dal.DAL;

using CDP4DalCommon.Protocol.Operations;
using CDP4DalCommon.Protocol.Tasks;
using CDP4DalCommon.Authentication;
using CDP4DalCommon.Tasks;

using NUnit.Framework;

Expand Down Expand Up @@ -141,6 +142,7 @@ public void Verify_That_SetIterationId_Works_as_expected()
var iteration = new Iteration();
var elementDefinition = new ElementDefinition();
var parameter = new Parameter();

var list = new List<Thing>
{
model,
Expand Down Expand Up @@ -304,7 +306,10 @@ public void Verify_that_OperationContainerFileVerification_throws_no_exception_w
[CDPVersion("1.1.0")]
internal class TestDal : Dal
{
public override bool IsReadOnly { get { return false; } }
public override bool IsReadOnly
{
get { return false; }
}

public TestDal(Credentials credentials)
: base()
Expand Down Expand Up @@ -495,6 +500,7 @@ public override Task RequestAuthenticationTokenFromRefreshToken(CancellationToke
internal class DecoratedDal : Dal
{
public override bool IsReadOnly { get; }

public override Task<IEnumerable<Thing>> Write(IEnumerable<OperationContainer> operationContainer, IEnumerable<string> files = null)
{
throw new NotImplementedException();
Expand Down Expand Up @@ -653,4 +659,4 @@ public override Task RequestAuthenticationTokenFromRefreshToken(CancellationToke
throw new System.NotImplementedException();
}
}
}
}
40 changes: 22 additions & 18 deletions CDP4Dal.NetCore.Tests/Operations/OperationContainerTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="OperationContainerTestFixture.cs" company="Starion Group S.A.">
// Copyright (c) 2015-2024 Starion Group S.A.
//
// Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou
//
// This file is part of CDP4-SDK Community Edition
//
// The CDP4-SDK Community Edition is free software; you can redistribute it and/or
// -------------------------------------------------------------------------------------------------------------------------------
// <copyright file="OperationContainerTestFixture.cs" company="RHEA System S.A.">
// Copyright (c) 2015-2024 RHEA System S.A.
//
// Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar
//
// This file is part of CDP4-COMET SDK Community Edition
//
// The CDP4-COMET SDK Community Edition is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 3 of the License, or (at your option) any later version.
//
// The CDP4-SDK Community Edition is distributed in the hope that it will be useful,
//
// The CDP4-COMET SDK Community Edition is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------

namespace CDP4Dal.Tests
{
using System;
using System.Linq;

using CDP4Common.CommonData;
using CDP4Common.DTO;
using CDP4Common.DTO;

using CDP4Dal.Operations;

using CDP4DalCommon.Protocol.Operations;

using NUnit.Framework;

[TestFixture]
public class OperationContainerTestFixture
{
Expand All @@ -42,7 +46,7 @@ public class OperationContainerTestFixture
[SetUp]
public void SetUp()
{
this.siteDirectoryContext = "/SiteDirectory/47363f0d-eb6d-4a58-95f5-fa7854995650";
this.siteDirectoryContext = "/SiteDirectory/47363f0d-eb6d-4a58-95f5-fa7854995650";
this.iterationContext = "/EngineeringModel/5e5dc7f8-833d-4331-b421-eb2c64fcf64b/iteration/b58ea73d-350d-4520-b9d9-a52c75ac2b5d";
}

Expand Down Expand Up @@ -98,9 +102,9 @@ public void VerifyExecutionOfOperationAddAndRemove()
var elementDefinition = new ElementDefinition(Guid.NewGuid(), 0);
elementDefinition.PartialRoutes.Add("iteration/b58ea73d-350d-4520-b9d9-a52c75ac2b5d");
elementDefinition.PartialRoutes.Add("EngineeringModel/5e5dc7f8-833d-4331-b421-eb2c64fcf64b");

var clone = elementDefinition.DeepClone<ElementDefinition>();
var operation = new Operation(elementDefinition, clone, OperationKind.Update);
var operation = new Operation(elementDefinition, clone, OperationKind.Update);

var operationContainer = new OperationContainer(this.iterationContext);

Expand Down
28 changes: 14 additions & 14 deletions CDP4Dal.NetCore.Tests/Operations/OperationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="OperationTestFixture.cs" company="Starion Group S.A.">
// Copyright (c) 2015-2024 Starion Group S.A.
//
// Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou
//
// This file is part of CDP4-SDK Community Edition
//
// The CDP4-SDK Community Edition is free software; you can redistribute it and/or
// -------------------------------------------------------------------------------------------------------------------------------
// <copyright file="OperationTestFixture.cs" company="RHEA System S.A.">
// Copyright (c) 2015-2024 RHEA System S.A.
//
// Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar
//
// This file is part of CDP4-COMET SDK Community Edition
//
// The CDP4-COMET SDK Community Edition is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 3 of the License, or (at your option) any later version.
//
// The CDP4-SDK Community Edition is distributed in the hope that it will be useful,
//
// The CDP4-COMET SDK Community Edition is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------

namespace CDP4Dal.Tests
{
using CDP4Common.DTO;

using CDP4Dal.Operations;
using CDP4DalCommon.Protocol.Operations;

using NUnit.Framework;

Expand Down
40 changes: 16 additions & 24 deletions CDP4Dal.NetCore.Tests/Operations/PostOperationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PostOperationTestFixture.cs" company="Starion Group S.A.">
// Copyright (c) 2015-2024 Starion Group S.A.
//
// Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou
//
// This file is part of CDP4-SDK Community Edition
//
// The CDP4-SDK Community Edition is free software; you can redistribute it and/or
// -------------------------------------------------------------------------------------------------------------------------------
// <copyright file="PostOperationTestFixture.cs" company="RHEA System S.A.">
// Copyright (c) 2015-2024 RHEA System S.A.
//
// Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Nathanael Smiechowski, Antoine Théate, Omar Elebiary, Jaime Bernar
//
// This file is part of CDP4-COMET SDK Community Edition
//
// The CDP4-COMET SDK Community Edition is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 3 of the License, or (at your option) any later version.
//
// The CDP4-SDK Community Edition is distributed in the hope that it will be useful,
//
// The CDP4-COMET SDK Community Edition is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------

namespace CDP4Dal.Tests
{
Expand All @@ -29,9 +29,9 @@ namespace CDP4Dal.Tests
using CDP4Common;
using CDP4Common.Dto;
using CDP4Common.DTO;
using CDP4Dal.Operations;

using CDP4DalCommon.Protocol.Operations;

using NUnit.Framework;

[TestFixture]
Expand All @@ -50,13 +50,5 @@ public void VerifyThatConstructorSetsLists()

internal class TestPostOperation : PostOperation
{
public override List<ClasslessDTO> Delete { get; set; }
public override List<Thing> Create { get; set; }
public override List<ClasslessDTO> Update { get; set; }
public override List<CopyInfo> Copy { get; set; }
public override void ConstructFromOperation(Operation operation)
{
throw new System.NotImplementedException();
}
}
}
Loading
Loading