Always support MessagePack deserialization as a DefaultRequestHeader and fix unit tests accordingly

Author: Alexander van Delft

CDP4ServicesDal.NetCore.Tests/CdpServicesDalTestFixture.cs

@@ -255,12 +255,11 @@ public void VerifyThatDalThatIsNotOpenCannotBeClosed()
             Assert.Throws<InvalidOperationException>(() => this.dal.Close());
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
+        [Test]
         [Category("WebServicesDependent")]
-        public async Task VerifyThatReadReturnsCorrectDTO(bool isMessagePackSupported)
+        public async Task VerifyThatReadReturnsCorrectDTO()
         {
-            this.dal = new CdpServicesDal(isMessagePackSupported);
+            this.dal = new CdpServicesDal();
 
             var returned = (await this.dal.Open(this.credentials, this.cancelationTokenSource.Token)).ToList();
             Assert.That(returned, Is.Not.Null);

CDP4ServicesDal.Tests/CdpServicesDalTestFixture.cs

@@ -232,12 +232,11 @@ public void VerifyThatDalThatIsNotOpenCannotBeClosed()
             Assert.Throws<InvalidOperationException>(() => this.dal.Close());
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
+        [Test]
         [Category("WebServicesDependent")]
-        public async Task VerifyThatReadReturnsCorrectDTO(bool isMessagePackSupported)
+        public async Task VerifyThatReadReturnsCorrectDTO()
         {
-            this.dal = new CdpServicesDal(isMessagePackSupported);
+            this.dal = new CdpServicesDal();
 
             var returned = (await this.dal.Open(this.credentials, this.cancelationTokenSource.Token)).ToList();
             Assert.That(returned, Is.Not.Null);

CDP4ServicesDal/CdpServicesDal.cs

@@ -89,29 +89,13 @@ public class CdpServicesDal : Dal
         /// </summary>
         private HttpClient httpClient;
 
-        /// <summary>
-        /// Asserts that the MessagePack deserialization should be used or not
-        /// </summary>
-        private readonly bool isMessagePackSupported;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CdpServicesDal"/> class.
-        /// </summary>
-        public CdpServicesDal(): this(true)
-        {
-            // Default constructor
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="CdpServicesDal"/> class.
         /// </summary>
-        /// <param name="isMessagePackSupported">Asserts that the MessagePack deserialization should be used or not. Supported by default</param>
-        public CdpServicesDal(bool isMessagePackSupported)
+        public CdpServicesDal()
         {
             this.Cdp4DalJsonSerializer = new Cdp4DalJsonSerializer(this.MetaDataProvider, this.DalVersion, false);
             this.MessagePackSerializer = new MessagePackSerializer();
-
-            this.isMessagePackSupported = isMessagePackSupported;
         }
 
         /// <summary>
@@ -120,15 +104,9 @@ public CdpServicesDal(bool isMessagePackSupported)
         /// <param name="httpClient">
         /// The (injected) <see cref="HttpClient"/>
         /// </param>
-        /// <param name="isMessagePackSupported">Asserts that the MessagePack deserialization should be used or not. Supported by default</param>
-        public CdpServicesDal(HttpClient httpClient, bool isMessagePackSupported = true) : this(isMessagePackSupported)
+        public CdpServicesDal(HttpClient httpClient) : this()
         {
-            if (httpClient == null)
-            {
-                throw new ArgumentNullException(nameof(httpClient));
-            }
-
-            this.httpClient = httpClient;
+            this.httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
         }
 
         /// <summary>
@@ -1106,11 +1084,7 @@ private HttpClient CreateHttpClient(Credentials credentials, HttpClient injected
             result.BaseAddress = credentials.Uri;
             result.DefaultRequestHeaders.Accept.Clear();
             result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            if (this.isMessagePackSupported)
-            {
-                result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/msgpack"));
-            }
+            result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/msgpack"));
 
             result.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(ASCIIEncoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}")));
             result.DefaultRequestHeaders.Add(Headers.AcceptCdpVersion, Headers.AcceptCdpVersionValue);