add default timeout to calls (OpenAPITools#1596)

add properties to send or not null values
update deps

Author: jaumard

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java

@@ -16,6 +16,7 @@
 
 package org.openapitools.codegen.languages;
 
+import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
@@ -36,6 +37,7 @@
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 public class DartJaguarClientCodegen extends DartClientCodegen {
+    private static final String NULLABLE_FIELDS = "nullableFields";
     private static Set<String> modelToIgnore = new HashSet<>();
 
     static {
@@ -45,11 +47,15 @@ public class DartJaguarClientCodegen extends DartClientCodegen {
         modelToIgnore.add("file");
     }
 
+    private boolean nullableFields = true;
+
     public DartJaguarClientCodegen() {
         super();
         browserClient = false;
         outputFolder = "generated-code/dart-jaguar";
         embeddedTemplateDir = templateDir = "dart-jaguar";
+
+        cliOptions.add(new CliOption(NULLABLE_FIELDS, "Is the null fields should be in the JSON payload"));
     }
 
     @Override
@@ -74,6 +80,13 @@ public String toDefaultValue(Schema p) {
 
     @Override
     public void processOpts() {
+        if (additionalProperties.containsKey(NULLABLE_FIELDS)) {
+            nullableFields = convertPropertyToBooleanAndWriteBack(NULLABLE_FIELDS);
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put(NULLABLE_FIELDS, nullableFields);
+        }
+
         if (additionalProperties.containsKey(PUB_NAME)) {
             this.setPubName((String) additionalProperties.get(PUB_NAME));
         } else {

modules/openapi-generator/src/main/resources/dart-jaguar/api.mustache

@@ -15,8 +15,9 @@ part '{{classFilename}}.jretro.dart';
 class {{classname}} extends _${{classname}}Client implements ApiClient {
     final Route base;
     final SerializerRepo serializers;
+    final Duration timeout;
 
-    {{classname}}({this.base, this.serializers});
+    {{classname}}({this.base, this.serializers, this.timeout = const Duration(minutes: 2)});
 
     {{#operation}}
     /// {{summary}}
@@ -29,23 +30,46 @@ class {{classname}} extends _${{classname}}Client implements ApiClient {
     {{/pathParams}}
     {{#headerParams}}
         {{#-first}}{{#hasPathParams}},{{/hasPathParams}}{{/-first}}
-        @Header("{{baseName}}") {{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+            @Header("{{baseName}}") {{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
     {{/headerParams}}
     {{#queryParams}}
         {{#-first}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/-first}}
-        @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+            @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
     {{/queryParams}}
     {{#vendorExtensions}}
+        {{#formParams}}
+            {{#-first}}{{#hasQueryParams}},{{/hasQueryParams}}{{^hasQueryParams}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{/hasQueryParams}}{{^hasQueryParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/hasQueryParams}}{{/-first}}
+            {{#isJson}}@AsJson() {{/isJson}}{{#isForm}}@AsFormField() {{/isForm}}{{#isMultipart}}@AsMultipartField() {{/isMultipart}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+        {{/formParams}}
+        {{#bodyParam}}
+            {{#hasFormParams}},{{/hasFormParams}}{{^hasFormParams}}{{#hasQueryParams}},{{/hasQueryParams}}{{/hasFormParams}}{{^hasFormParams}}{{^hasQueryParams}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{/hasQueryParams}}{{/hasFormParams}}{{^hasFormParams}}{{^hasQueryParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/hasQueryParams}}{{/hasFormParams}}
+            {{^isJson}}{{^isForm}}{{^isMultipart}}@AsBody(){{/isMultipart}}{{/isForm}}{{/isJson}}  {{#isJson}}@AsJson() {{/isJson}}{{#isForm}}@AsForm() {{/isForm}}{{#isMultipart}}@AsMultipart() {{/isMultipart}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+        {{/bodyParam}}
+    {{/vendorExtensions}}
+        ) {
+        return super.{{nickname}}(
+    {{#pathParams}}
+        {{paramName}}{{#hasMore}}, {{/hasMore}}
+    {{/pathParams}}
+    {{#headerParams}}
+        {{#-first}}{{#hasPathParams}},{{/hasPathParams}}{{/-first}}
+        {{paramName}}{{#hasMore}}, {{/hasMore}}
+    {{/headerParams}}
+    {{#queryParams}}
+        {{#-first}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/-first}}
+        {{paramName}}{{#hasMore}}, {{/hasMore}}
+    {{/queryParams}}
+
     {{#formParams}}
         {{#-first}}{{#hasQueryParams}},{{/hasQueryParams}}{{^hasQueryParams}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{/hasQueryParams}}{{^hasQueryParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/hasQueryParams}}{{/-first}}
-        {{#isJson}}@AsJson() {{/isJson}}{{#isForm}}@AsFormField() {{/isForm}}{{#isMultipart}}@AsMultipartField() {{/isMultipart}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+        {{paramName}}{{#hasMore}}, {{/hasMore}}
     {{/formParams}}
     {{#bodyParam}}
         {{#hasFormParams}},{{/hasFormParams}}{{^hasFormParams}}{{#hasQueryParams}},{{/hasQueryParams}}{{/hasFormParams}}{{^hasFormParams}}{{^hasQueryParams}}{{#hasHeaderParams}},{{/hasHeaderParams}}{{/hasQueryParams}}{{/hasFormParams}}{{^hasFormParams}}{{^hasQueryParams}}{{^hasHeaderParams}}{{#hasPathParams}},{{/hasPathParams}}{{/hasHeaderParams}}{{/hasQueryParams}}{{/hasFormParams}}
-        {{#isJson}}@AsJson() {{/isJson}}{{#isForm}}@AsForm() {{/isForm}}{{#isMultipart}}@AsMultipart() {{/isMultipart}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}
+        {{paramName}}{{#hasMore}}, {{/hasMore}}
     {{/bodyParam}}
-    {{/vendorExtensions}}
-    );
+        ).timeout(timeout);
+    }
 
   {{/operation}}
 

modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache

@@ -1,6 +1,6 @@
 library {{pubName}}.api;
 
-import 'package:http/http.dart';
+import 'package:http/io_client.dart';
 import 'package:jaguar_serializer/jaguar_serializer.dart';
 import 'package:jaguar_retrofit/jaguar_retrofit.dart';
 import 'package:{{pubName}}/auth/api_key_auth.dart';
@@ -22,11 +22,12 @@ class JaguarApiGen {
     List<Interceptor> interceptors;
     String basePath = "{{basePath}}";
     Route _baseRoute;
+    final Duration timeout;
 
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl}) {
+    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
@@ -68,8 +69,8 @@ class JaguarApiGen {
         if(serializers == null) {
             serializers = jsonJaguarRepo;
         }
-        return {{classname}}(base: base, serializers: serializers);
+        return {{classname}}(base: base, serializers: serializers, timeout: timeout);
     }
 
     {{/apis}}{{/apiInfo}}
-}
+}

modules/openapi-generator/src/main/resources/dart-jaguar/class.mustache

@@ -2,12 +2,12 @@ part '{{classFilename}}.jser.dart';
 
 class {{classname}} {
   {{#vars}}{{#description}} /* {{{description}}} */{{/description}}
-  @Alias('{{{baseName}}}')
+  @Alias('{{baseName}}')
   final {{{datatype}}} {{name}};
   {{#allowableValues}}{{#min}} // range from {{min}} to {{max}}{{/min}}//{{^min}}enum {{name}}Enum { {{#values}} {{.}}, {{/values}} };{{/min}}{{/allowableValues}}{{/vars}}
 
   {{classname}}(
-    {{#vars}}{{^defaultValue}}{{#required}} this.{{name}}, {{/required}}{{/defaultValue}}{{/vars}}
+      {{#vars}}{{^defaultValue}}{{#required}} this.{{name}}, {{/required}}{{/defaultValue}}{{/vars}}
 
 {{#vendorExtensions}}{{#hasVars}}{
     {{#vars}}{{^required}} this.{{name}}{{#defaultValue}} = {{{defaultValue}}}{{#hasMore}}, {{/hasMore}} {{/defaultValue}}{{/required}}
@@ -21,7 +21,7 @@ class {{classname}} {
   }
 }
 
-@GenSerializer()
+@GenSerializer(nullableFields: {{nullableFields}})
 class {{classname}}Serializer extends Serializer<{{classname}}> with _${{classname}}Serializer {
 
 }

modules/openapi-generator/src/main/resources/dart-jaguar/pubspec.mustache

@@ -4,9 +4,9 @@ description: {{pubDescription}}
 environment:
     sdk: ">=2.0.0 <3.0.0"
 dependencies:
-    jaguar_retrofit: '^2.5.4'
-    jaguar_serializer: '^2.2.2'
+    jaguar_retrofit: '^2.5.12'
+    jaguar_serializer: '^2.2.4'
 dev_dependencies:
-    jaguar_retrofit_gen: '^2.5.2'
-    jaguar_serializer_cli: '^2.2.1'
-    build_runner: '^0.10.0'
+    jaguar_retrofit_gen: '^2.5.10'
+    jaguar_serializer_cli: '^2.2.4'
+    build_runner: '^1.1.1'

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2018-10-08T15:27:22.304+08:00[Asia/Hong_Kong]
+- Build date: 2018-12-02T16:16:44.701611+01:00[Europe/Paris]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart

@@ -1,6 +1,6 @@
 library openapi.api;
 
-import 'package:http/http.dart';
+import 'package:http/io_client.dart';
 import 'package:jaguar_serializer/jaguar_serializer.dart';
 import 'package:jaguar_retrofit/jaguar_retrofit.dart';
 import 'package:openapi/auth/api_key_auth.dart';
@@ -18,100 +18,101 @@ import 'package:openapi/model/pet.dart';
 import 'package:openapi/model/tag.dart';
 import 'package:openapi/model/user.dart';
 
+
 final jsonJaguarRepo = JsonRepo()
-  ..add(ApiResponseSerializer())
-  ..add(CategorySerializer())
-  ..add(OrderSerializer())
-  ..add(PetSerializer())
-  ..add(TagSerializer())
-  ..add(UserSerializer());
-
-final _defaultInterceptors = [
-  OAuthInterceptor(),
-  BasicAuthInterceptor(),
-  ApiKeyAuthInterceptor()
-];
+..add(ApiResponseSerializer())
+..add(CategorySerializer())
+..add(OrderSerializer())
+..add(PetSerializer())
+..add(TagSerializer())
+..add(UserSerializer())
+;
+
+final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
 class JaguarApiGen {
-  List<Interceptor> interceptors;
-  String basePath = "http://petstore.swagger.io/v2";
-  Route _baseRoute;
+    List<Interceptor> interceptors;
+    String basePath = "http://petstore.swagger.io/v2";
+    Route _baseRoute;
+    final Duration timeout;
 
-  /**
+    /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-  JaguarApiGen(
-      {List<Interceptor> interceptors,
-      bool overrideInterceptors = false,
-      String baseUrl}) {
-    _baseRoute =
-        Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
-    if (interceptors == null) {
-      this.interceptors = _defaultInterceptors;
-    } else if (overrideInterceptors) {
-      this.interceptors = interceptors;
-    } else {
-      this.interceptors = List.from(_defaultInterceptors)..addAll(interceptors);
-    }
+    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+        _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
+        if(interceptors == null) {
+            this.interceptors = _defaultInterceptors;
+        }
+        else if(overrideInterceptors){
+            this.interceptors = interceptors;
+        }
+        else {
+            this.interceptors = List.from(_defaultInterceptors)..addAll(interceptors);
+        }
 
-    this.interceptors.forEach((interceptor) {
-      _baseRoute.before(interceptor.before);
-      _baseRoute.after(interceptor.after);
-    });
-  }
+        this.interceptors.forEach((interceptor) {
+            _baseRoute.before(interceptor.before);
+            _baseRoute.after(interceptor.after);
+        });
+    }
 
-  void setOAuthToken(String name, String token) {
-    (_defaultInterceptors[0] as OAuthInterceptor).tokens[name] = token;
-  }
+    void setOAuthToken(String name, String token) {
+        (_defaultInterceptors[0] as OAuthInterceptor).tokens[name] = token;
+    }
 
-  void setBasicAuth(String name, String username, String password) {
-    (_defaultInterceptors[1] as BasicAuthInterceptor).authInfo[name] =
-        BasicAuthInfo(username, password);
-  }
+    void setBasicAuth(String name, String username, String password) {
+        (_defaultInterceptors[1] as BasicAuthInterceptor).authInfo[name] = BasicAuthInfo(username, password);
+    }
 
-  void setApiKey(String name, String apiKey) {
-    (_defaultInterceptors[2] as ApiKeyAuthInterceptor).apiKeys[name] = apiKey;
-  }
+    void setApiKey(String name, String apiKey) {
+        (_defaultInterceptors[2] as ApiKeyAuthInterceptor).apiKeys[name] = apiKey;
+    }
 
-  /**
+    
+    /**
     * Get PetApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-  PetApi getPetApi({Route base, SerializerRepo serializers}) {
-    if (base == null) {
-      base = _baseRoute;
-    }
-    if (serializers == null) {
-      serializers = jsonJaguarRepo;
+    PetApi getPetApi({Route base, SerializerRepo serializers}) {
+        if(base == null) {
+            base = _baseRoute;
+        }
+        if(serializers == null) {
+            serializers = jsonJaguarRepo;
+        }
+        return PetApi(base: base, serializers: serializers, timeout: timeout);
     }
-    return PetApi(base: base, serializers: serializers);
-  }
 
-  /**
+    
+    /**
     * Get StoreApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-  StoreApi getStoreApi({Route base, SerializerRepo serializers}) {
-    if (base == null) {
-      base = _baseRoute;
-    }
-    if (serializers == null) {
-      serializers = jsonJaguarRepo;
+    StoreApi getStoreApi({Route base, SerializerRepo serializers}) {
+        if(base == null) {
+            base = _baseRoute;
+        }
+        if(serializers == null) {
+            serializers = jsonJaguarRepo;
+        }
+        return StoreApi(base: base, serializers: serializers, timeout: timeout);
     }
-    return StoreApi(base: base, serializers: serializers);
-  }
 
-  /**
+    
+    /**
     * Get UserApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-  UserApi getUserApi({Route base, SerializerRepo serializers}) {
-    if (base == null) {
-      base = _baseRoute;
+    UserApi getUserApi({Route base, SerializerRepo serializers}) {
+        if(base == null) {
+            base = _baseRoute;
+        }
+        if(serializers == null) {
+            serializers = jsonJaguarRepo;
+        }
+        return UserApi(base: base, serializers: serializers, timeout: timeout);
     }
-    if (serializers == null) {
-      serializers = jsonJaguarRepo;
-    }
-    return UserApi(base: base, serializers: serializers);
-  }
-}
+
+    
+}