Feature/remove null query parameter (#119)

* chore: remove unused demo * feat: remove query parameter which is null #50 * chore: minor changes
trevorwang · Feb 15, 2020 · 43103c0 · 43103c0
1 parent 6d45e0a
commit 43103c0
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 177 deletions.
diff --git a/example/lib/demo.dart b/example/lib/demo.dart
diff --git a/example/lib/demo.g.dart b/example/lib/demo.g.dart
diff --git a/example/lib/example.dart b/example/lib/example.dart
@@ -66,6 +66,14 @@ abstract class RestClient {
 
   @POST("https://httpbin.org/post")
   Future<String> postFormData4(@Part() List<Task> tasks, @Part() File file);
+
+  @GET('/demo')
+  Future<String> queries(@Queries() Map<String, dynamic> queries);
+
+  @GET("https://httpbin.org/get")
+  Future<String> namedExample(@Query("apikey") String apiKey,
+      @Query("scope") String scope, @Query("type") String type,
+      {@Query("from") int from});
 }
 
 @JsonSerializable()

diff --git a/example/lib/example.g.dart b/example/lib/example.g.dart
diff --git a/generator/CHANGELOG.md b/generator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3
+
+- remove query parameter which is null
+
 ## 1.2.2
 
 - stringify models in formdata  #111

diff --git a/generator/lib/src/generator.dart b/generator/lib/src/generator.dart
@@ -493,6 +493,12 @@ class RetrofitGenerator extends GeneratorForAnnotation<retrofit.RestApi> {
         [refer("${queryMap.keys.first.displayName} ?? <String,dynamic>{}")],
       ).statement);
     }
+
+    if (m.parameters
+        .where((p) => (p.isOptional && !p.isRequiredNamed))
+        .isNotEmpty) {
+      blocks.add(Code("$_queryParamsVar.removeWhere((k, v) => v == null);"));
+    }
   }
 
   void _generateRequestBody(
@@ -583,6 +589,7 @@ class RetrofitGenerator extends GeneratorForAnnotation<retrofit.RestApi> {
               .firstWhere((i) => i.displayName == "toJson", orElse: () => null);
           if (toJson == null) {
             log.severe("toJson() method have to add to ${p.type}");
+            throw Exception();
           } else {
             return MapEntry(literal(fieldName),
                 refer("jsonEncode(${p.displayName}).toString()"));
@@ -598,6 +605,7 @@ class RetrofitGenerator extends GeneratorForAnnotation<retrofit.RestApi> {
             .firstWhere((i) => i.displayName == "toJson", orElse: () => null);
         if (toJson == null) {
           log.severe("toJson() method have to add to ${p.type}");
+          throw Exception();
         } else {
           return MapEntry(
               literal(fieldName),

diff --git a/generator/pubspec.yaml b/generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: retrofit_generator
 description: retrofit generator is an dio client generator using source_gen and inspired by Chopper and Retrofit.
-version: 1.2.2+1
+version: 1.2.3
 
 homepage: https://mings.in/retrofit.dart/
 repository: https://github.com/trevorwang/retrofit.dart/

diff --git a/generator/test/demo_test.dart b/generator/test/demo_test.dart