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

CDP4-SDK.sln

@@ -78,6 +78,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4ServicesMessaging.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4DalCommon", "CDP4DalCommon\CDP4DalCommon.csproj", "{E7CDB217-8442-4FD4-8E87-F4A8BFE9622A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4DalJsonSerializer", "CDP4DalJsonSerializer\CDP4DalJsonSerializer.csproj", "{36C38A02-C1CF-4F4F-AB40-F0A231256B30}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -208,6 +210,10 @@ Global
 		{E7CDB217-8442-4FD4-8E87-F4A8BFE9622A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E7CDB217-8442-4FD4-8E87-F4A8BFE9622A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7CDB217-8442-4FD4-8E87-F4A8BFE9622A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C38A02-C1CF-4F4F-AB40-F0A231256B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C38A02-C1CF-4F4F-AB40-F0A231256B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C38A02-C1CF-4F4F-AB40-F0A231256B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C38A02-C1CF-4F4F-AB40-F0A231256B30}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CDP4-SDK.sln.DotSettings

@@ -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
 


CDP4Common/CDP4Common.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
     <Company>Starion Group S.A.</Company>
     <Title>CDP4Common Community Edition</Title>
-    <VersionPrefix>27.4.0</VersionPrefix>
+    <VersionPrefix>28.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>

CDP4Dal.NetCore.Tests/DAL/DalTestFixture.cs

@@ -10,17 +10,17 @@
 //    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
 {
@@ -36,11 +36,12 @@ namespace CDP4Dal.Tests.DAL
     using CDP4Common.Helpers;
 
     using CDP4Dal.Composition;
+    using CDP4Dal.DAL;
     using CDP4Dal.Exceptions;
     using CDP4Dal.Operations;
-    using CDP4Dal.DAL;
 
-    using CDP4DalCommon.Tasks;
+    using CDP4DalCommon.Protocol.Operations;
+    using CDP4DalCommon.Protocol.Tasks;
 
     using NUnit.Framework;
 
@@ -140,6 +141,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,
@@ -303,7 +305,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()
@@ -451,6 +456,7 @@ public override Task<IEnumerable<Thing>> CherryPick(Guid engineeringModelId, Gui
     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();
@@ -566,4 +572,4 @@ public override Task<IEnumerable<Thing>> CherryPick(Guid engineeringModelId, Gui
             throw new NotSupportedException();
         }
     }
-}
+}

CDP4Dal.NetCore.Tests/Operations/OperationContainerTestFixture.cs

@@ -10,28 +10,32 @@
 //    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
     {
@@ -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";
         }
 
@@ -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);
 

CDP4Dal.NetCore.Tests/Operations/OperationTestFixture.cs

@@ -10,12 +10,12 @@
 //    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.
@@ -26,7 +26,7 @@ namespace CDP4Dal.Tests
 {
     using CDP4Common.DTO;
 
-    using CDP4Dal.Operations;
+    using CDP4DalCommon.Protocol.Operations;
 
     using NUnit.Framework;
 

CDP4Dal.NetCore.Tests/Operations/PostOperationTestFixture.cs

@@ -10,17 +10,17 @@
 //    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
 {
@@ -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]
@@ -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();
-        }
     }
 }

CDP4Dal.NetCore.Tests/Operations/ThingTransactionTestFixture.cs

@@ -10,17 +10,17 @@
 //    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
 {
@@ -34,9 +34,11 @@ namespace CDP4Dal.Tests
     using CDP4Common.EngineeringModelData;
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Types;
-    
+
     using CDP4Dal.Operations;
-
+
+    using CDP4DalCommon.Protocol.Operations;
+
     using NUnit.Framework;
 
     /// <summary>
@@ -131,6 +133,7 @@ public void VerifyThatCreateThingWorksWithAbstractContainer()
             {
                 Container = this.siteDirectory
             };
+
             this.cache.TryAdd(new CacheKey(siteRdl.Iid, null), new Lazy<Thing>(() => siteRdl));
 
             var cloneRdl = siteRdl.Clone(false);
@@ -183,7 +186,7 @@ public void VerifyThatCreateThingTwiceDoesntThrowException()
             var transaction = new ThingTransaction(transactionContext, this.siteDirectory.Clone(false));
             var phone = new TelephoneNumber(Guid.NewGuid(), this.cache, this.uri);
 
-            Assert.That(() => 
+            Assert.That(() =>
             {
                 transaction.Create(phone);
                 transaction.Create(phone);
@@ -246,7 +249,6 @@ public void VerifyThatDeleteThingAlreadyDeletedWorks()
         [Test]
         public void VerifyThatUpdateContainerWorks()
         {
-
             var iterationClone = this.iteration.Clone(false);
             var option1 = new Option(Guid.NewGuid(), this.cache, this.uri);
 
@@ -328,6 +330,7 @@ public void FunctionalTestCase1()
             emailTrans.Create(email);
 
             emailTrans.FinalizeSubTransaction(email, person1_1);
+
             // end add email, verify that email is added to person1_1, (the clone of person1)
 
             Assert.That(2, Is.EqualTo(person1_1Tr.AddedThing.Count()));
@@ -339,6 +342,7 @@ public void FunctionalTestCase1()
             var phone_1Trans = new ThingTransaction(phone_1, person1_1Tr, person1_1);
             phone_1Trans.CreateOrUpdate(phone_1);
             phone_1Trans.FinalizeSubTransaction(phone_1, person1_1);
+
             // end update phone
 
             // verify that the new reference is used
@@ -354,7 +358,6 @@ public void FunctionalTestCase1()
             Assert.That(rootTransaction.AddedThing.Contains(phone_1), Is.True);
             Assert.That(1, Is.EqualTo(cloneSiteDir.Person.Count));
 
-
             // Create new person
             var person2 = new Person();
             var person2Trans = new ThingTransaction(person2, rootTransaction, cloneSiteDir);
@@ -828,6 +831,7 @@ public void VerifyThatCascadeDeleteWorksOnAddedThing()
             transaction.Delete(person.Clone(false));
 
             var operationContainer = transaction.FinalizeTransaction();
+
             // Update sitedir
             Assert.That(1, Is.EqualTo(operationContainer.Operations.Count()));
         }