Services filter fixed. And service operations now throws dockerapiexc…

src/Docker.DotNet/Endpoints/DockerSwarmException.cs

@@ -0,0 +1,14 @@
+using System.Net;
+
+namespace Docker.DotNet
+{
+    public class DockerSwarmException : DockerApiException 
+    {
+        public string DeserializedMessage { get; private set; }
+
+        public DockerSwarmException(HttpStatusCode statusCode, string responseBody, string deserializedMessage) : base(statusCode, responseBody)
+        {
+            DeserializedMessage = deserializedMessage;
+        }
+    }
+}

src/Docker.DotNet/Endpoints/SwarmOperations.cs

@@ -15,7 +15,8 @@ internal class SwarmOperations : ISwarmOperations
         {
             if (statusCode < HttpStatusCode.OK || statusCode >= HttpStatusCode.BadRequest)
             {
-                throw new DockerApiException(statusCode, responseBody);
+                var deserializedBody = new JsonSerializer().DeserializeObject<JSONError>(responseBody);
+                throw new DockerSwarmException(statusCode, responseBody, deserializedBody.Message);
             }
         };
 

src/Docker.DotNet/Models/ServiceFilter.cs

@@ -26,19 +26,12 @@ public ServiceCreationMode[] Mode
         {
             get
             {
-                if (this["mode"].Length == 0)
+                var lst = new ServiceCreationMode[this["mode"].Length];
+                for(int i = 0; i< this["mode"].Length; i++)
                 {
-                    return new ServiceCreationMode[] { ServiceCreationMode.Replicated };
-                }
-                else
-                {
-                    var lst = new ServiceCreationMode[this["mode"].Length];
-                    for(int i = 0; i< this["mode"].Length; i++)
-                    {
-                        lst[i] = (ServiceCreationMode)Enum.Parse(typeof(ServiceCreationMode), this["mode"][i]);
-                    }
-                    return lst;
+                    lst[i] = (ServiceCreationMode)Enum.Parse(typeof(ServiceCreationMode), this["mode"][i]);
                 }
+                return lst;   
             }
             set => this["mode"] = value.Select(m => m.ToString()).ToArray();
         }

test/Docker.DotNet.Tests/ISwarmOperationsTests.cs

@@ -20,7 +20,6 @@ public ISwarmOperationsTests()
 
             _testServiceId = _client.Swarm.CreateServiceAsync(new ServiceCreateParameters()
             {
-
                 Service = new ServiceSpec
                 {
                     Name = _testServiceName,
@@ -50,9 +49,8 @@ public async Task GetFilteredServicesAsync_Succeeds()
         [Fact]
         public async Task CreateServiceAsync_FaultyNetwork_Throws()
         {
-            await Assert.ThrowsAsync<DockerApiException>(() => _client.Swarm.CreateServiceAsync(new ServiceCreateParameters()
+            await Assert.ThrowsAsync<DockerSwarmException>(() => _client.Swarm.CreateServiceAsync(new ServiceCreateParameters()
             {
-
                 Service = new ServiceSpec
                 {
                     Name = $"{_testServiceName}2",

test/Docker.DotNet.Tests/QueryStringTests.cs

@@ -22,5 +22,23 @@ public void ServicesListParameters_GenerateCompositeFilters()
 
             Assert.Equal("filters={\"id\":[\"service-id\"],\"label\":[\"label\"]}", Uri.UnescapeDataString(qs.GetQueryString()));
         }
+
+        [Fact]
+        public void ServicesListParameters_GenerateNullFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter() };
+            var qs = new QueryString<ServicesListParameters>(p);
+            Assert.Equal("filters={}", Uri.UnescapeDataString(qs.GetQueryString()));
+        }
+
+        [Fact]
+        public void ServicesListParameters_GenerateNullModeFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter() { Mode = new ServiceCreationMode[] { } } };
+            var qs = new QueryString<ServicesListParameters>(p);
+            var tmp = qs.GetQueryString();
+            var tmp2 = Uri.UnescapeDataString(tmp);
+            Assert.Equal("filters={\"mode\":[]}", tmp2);
+        }
     }
 }