Merge pull request #14 from kuzzleio/fix-optional-parameters-design

Fix optional parameters design

Author: jenow

Kuzzle.Tests/API/Controllers/CollectionControllerTest.cs

@@ -17,6 +17,13 @@ public CollectionControllerTest() {
       _collectionController = new CollectionController(_api.MockedObject);
     }
 
+    public static IEnumerable<object[]> GenerateListOptions() {
+      yield return new object[] { null, null, null };
+      yield return new object[] { null, null, "stored" };
+      yield return new object[] { -10, 42, "realtime" };
+      yield return new object[] { 12, null, null };
+    }
+
     [Theory]
     [
       MemberData(nameof(MockGenerators.GenerateMappings),
@@ -128,24 +135,23 @@ public async void GetSpecificationsAsyncTest() {
     }
 
     [Theory]
-    [
-      MemberData(nameof(MockGenerators.GenerateListOptions),
-      MemberType = typeof(MockGenerators))
-    ]
-    public async void ListAsyncTest(ListOptions opts) {
+    [MemberData(nameof(GenerateListOptions))]
+    public async void ListAsyncTest(int? from, int? size, string type) {
       _api.SetResult(@"{result: {foo: 123}}");
 
-      JObject result = await _collectionController.ListAsync("foo", opts);
+      JObject result = await _collectionController.ListAsync(
+        "foo", from, size, type
+      );
 
       var expected = new JObject {
         { "controller", "collection" },
         { "action", "list" },
         { "index", "foo" }
       };
 
-      if (opts != null) {
-        expected.Merge(JObject.FromObject(opts));
-      }
+      if (from != null) expected.Add("from", from);
+      if (size != null) expected.Add("size", size);
+      if (type != null) expected.Add("type", type);
 
       _api.Verify(expected);
 

Kuzzle.Tests/API/MockGenerators.cs

@@ -10,31 +10,6 @@ public static IEnumerable<object[]> GenerateMappings() {
       yield return new object[] { new JObject { { "foo", "bar" } } };
     }
 
-    public static IEnumerable<object[]> GenerateListOptions() {
-      yield return new object[] { null };
-      yield return new object[] {
-        JsonConvert.DeserializeObject<ListOptions>(@"{
-          from: null,
-          size: null,
-          type: 'stored'
-        }")
-      };
-      yield return new object[] {
-        JsonConvert.DeserializeObject<ListOptions>(@"{
-          from: -10,
-          size: 42,
-          type: 'realtime'
-        }")
-      };
-      yield return new object[] {
-        JsonConvert.DeserializeObject<ListOptions>(@"{
-          from: 12,
-          size: null,
-          type: null
-        }")
-      };
-    }
-
     public static IEnumerable<object[]> GenerateSearchOptions() {
       yield return new object[] { null };
       yield return new object[] {

Kuzzle/API/Controllers/CollectionController.cs

@@ -93,17 +93,17 @@ public async Task<JObject> GetSpecificationsAsync(
     /// The returned list is sorted in alphanumerical order.
     /// </summary>
     public async Task<JObject> ListAsync(
-        string index,
-        Options.ListOptions options = null) {
+      string index, int? from = null, int? size = null, string type = null
+    ) {
       var request = new JObject {
         { "controller", "collection" },
         { "action", "list" },
         { "index", index }
       };
 
-      if (options != null) {
-        request.Merge(JObject.FromObject(options));
-      }
+      if (from != null) request.Add("from", from);
+      if (size != null) request.Add("size", size);
+      if (type != null) request.Add("type", type);
 
       Response response = await api.QueryAsync(request);