From 6ca34e362def122e10d858e4c462508a987f21b2 Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Fri, 13 Mar 2015 09:21:13 -0700 Subject: [PATCH 1/6] PHP Models: updating the models generated for PHP to be array accessable and have a simple constructor --- .../src/main/resources/php/model.mustache | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache index 13a9356d5863..6de69cbafddf 100644 --- a/modules/swagger-codegen/src/main/resources/php/model.mustache +++ b/modules/swagger-codegen/src/main/resources/php/model.mustache @@ -24,7 +24,7 @@ {{#models}} {{#model}} -class {{classname}} { +class {{classname}} implements ArrayAccess { static $swaggerTypes = array( {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}}, {{/hasMore}}{{/vars}} @@ -35,6 +35,26 @@ class {{classname}} { * {{{description}}} */{{/description}} public ${{name}}; /* {{{datatype}}} */{{/vars}} + + public function __construct(array $data) { + {{#vars}}$this->{{name}} = $data["{{name}}"]{{/vars}} + } + + public function offsetExists($offset) { + return isset($this->$offset); + } + + public function offsetGet($offset) { + return $this->$offset; + } + + public function offsetSet($offset, $value) { + $this->$offset = $value; + } + + public function offsetUnset($offset) { + unset($this->$offset); + } } {{/model}} {{/models}} From 0854ca5ce53b159d92f1672d53a100a8c15e080d Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Fri, 13 Mar 2015 09:23:55 -0700 Subject: [PATCH 2/6] PHP Models: updating the models generated for PHP styling --- modules/swagger-codegen/src/main/resources/php/model.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache index 6de69cbafddf..606203f89403 100644 --- a/modules/swagger-codegen/src/main/resources/php/model.mustache +++ b/modules/swagger-codegen/src/main/resources/php/model.mustache @@ -37,7 +37,8 @@ class {{classname}} implements ArrayAccess { public ${{name}}; /* {{{datatype}}} */{{/vars}} public function __construct(array $data) { - {{#vars}}$this->{{name}} = $data["{{name}}"]{{/vars}} + {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}, + {{/hasMore}}{{/vars}} } public function offsetExists($offset) { From 24842d4a29213efe9b7f49c2581f546af7a252ef Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Fri, 13 Mar 2015 09:36:24 -0700 Subject: [PATCH 3/6] PHP Models: fixing an issue with commas being where they shouldn't --- modules/swagger-codegen/src/main/resources/php/model.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache index 606203f89403..f11a15471694 100644 --- a/modules/swagger-codegen/src/main/resources/php/model.mustache +++ b/modules/swagger-codegen/src/main/resources/php/model.mustache @@ -37,7 +37,7 @@ class {{classname}} implements ArrayAccess { public ${{name}}; /* {{{datatype}}} */{{/vars}} public function __construct(array $data) { - {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}, + {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}} {{/hasMore}}{{/vars}} } From d580d294b6ea638b0077da838332d0a496444fdd Mon Sep 17 00:00:00 2001 From: Camille Chafer Date: Mon, 16 Mar 2015 11:53:58 +0100 Subject: [PATCH 4/6] Adding defintion of security schemes in CodegenSecurity --- .../swagger/codegen/CodegenSecurity.java | 6 +++++- .../swagger/codegen/DefaultCodegen.java | 20 ++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java index 7323893106f5..889a9419c64b 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java @@ -3,5 +3,9 @@ package com.wordnik.swagger.codegen; public class CodegenSecurity { String name; String type; - Boolean hasMore; + Boolean hasMore, isBasic, isOAuth, isApiKey; + // ApiKey specific + String keyParamName; + Boolean isKeyInQuery, isKeyInHeader; + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java index 2abcfad31eac..c21d43bb1e9c 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java @@ -1,6 +1,9 @@ package com.wordnik.swagger.codegen; import com.wordnik.swagger.models.*; +import com.wordnik.swagger.models.auth.ApiKeyAuthDefinition; +import com.wordnik.swagger.models.auth.BasicAuthDefinition; +import com.wordnik.swagger.models.auth.In; import com.wordnik.swagger.models.auth.SecuritySchemeDefinition; import com.wordnik.swagger.models.parameters.*; import com.wordnik.swagger.models.properties.*; @@ -888,10 +891,25 @@ public class DefaultCodegen { List secs = new ArrayList(); for(Iterator entries = schemes.entrySet().iterator(); entries.hasNext(); ) { Map.Entry entry = (Map.Entry) entries.next(); + final SecuritySchemeDefinition schemeDefinition = entry.getValue(); CodegenSecurity sec = CodegenModelFactory.newInstance(CodegenModelType.SECURITY); sec.name = entry.getKey(); - sec.type = entry.getValue().getType(); + sec.type = schemeDefinition.getType(); + + if (schemeDefinition instanceof ApiKeyAuthDefinition) { + final ApiKeyAuthDefinition apiKeyDefinition = (ApiKeyAuthDefinition) schemeDefinition; + sec.isBasic = sec.isOAuth = false; + sec.isApiKey = true; + sec.keyParamName = apiKeyDefinition.getName(); + sec.isKeyInHeader = apiKeyDefinition.getIn() == In.HEADER; + sec.isKeyInQuery = !sec.isKeyInHeader; + } else { + sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = false; + sec.isBasic = schemeDefinition instanceof BasicAuthDefinition; + sec.isOAuth = !sec.isBasic; + } + sec.hasMore = entries.hasNext(); secs.add(sec); } From fc9d6325221f56998c8aa0c49b733715a25e959f Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 17 Mar 2015 05:24:43 +0800 Subject: [PATCH 5/6] update ruby client to support form parameters, add PATCH support, update ruby petstore client --- .../src/main/resources/ruby/api.mustache | 16 +++- .../resources/ruby/swagger/request.mustache | 24 ++++- samples/client/petstore/ruby/lib/PetApi.rb | 92 ++++++++++++++----- samples/client/petstore/ruby/lib/StoreApi.rb | 44 ++++++--- samples/client/petstore/ruby/lib/UserApi.rb | 88 +++++++++++++----- .../petstore/ruby/lib/swagger/request.rb | 24 ++++- 6 files changed, 215 insertions(+), 73 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache index b2c546b011e1..1448e52bdf2d 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache @@ -37,14 +37,15 @@ class {{classname}} queryopts = options.select do |key,value| query_param_keys.include? key end - + {{#headerParams}}headers = { {{{paramName}}}: {{{paramName}}}, } {{/headerParams}} {{^headerParams}}headers = nil {{/headerParams}} - + + # http body (model) post_body = nil {{#bodyParam}} if body != nil @@ -69,17 +70,22 @@ class {{classname}} end {{/bodyParam}} + # form parameters + form_parameter_hash = {} + {{#formParams}}{{#optional}}form_parameter_hash["{{baseName}}"] = options[:'{{paramName}}'] if options[:'{{paramName}}']{{/optional}} + {{^optional}}form_parameter_hash["{{baseName}}"] = {{paramName}}{{/optional}}{{/formParams}} + {{#returnType}} - response = Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + response = Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body {{#returnContainer}} response.map {|response|{{/returnContainer}} {{returnBaseType}}.new(response){{#returnContainer}} }{{/returnContainer}} {{/returnType}} {{^returnType}} - Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make {{/returnType}} {{newline}} end {{/operation}} end -{{/operations}} \ No newline at end of file +{{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache index 7836cb0bf039..92b5cba810a2 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache @@ -6,7 +6,7 @@ module Swagger require 'typhoeus' require "swagger/version" - attr_accessor :host, :path, :format, :params, :body, :http_method, :headers + attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params # All requests must have an HTTP method and a path @@ -115,9 +115,18 @@ module Swagger end # If body is an object, JSONify it before making the actual request. - # + # For form parameters, remove empty value def outgoing_body - body.is_a?(String) ? body : body.to_json + # http form + if @body.nil? && @form_params && !@form_params.empty? + data = form_params.dup + data.each do |key, value| + data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter + end + data + else # http body is JSON + @body.is_a?(String) ? @body : @body.to_json + end end # Construct a query string from the query-string-type params @@ -163,6 +172,13 @@ module Swagger :headers => self.headers.stringify_keys, ) + when :patch,:PATCH + Typhoeus::Request.patch( + self.url, + :body => self.outgoing_body, + :headers => self.headers.stringify_keys, + ) + when :put,:PUT Typhoeus::Request.put( self.url, @@ -196,4 +212,4 @@ module Swagger end end -end \ No newline at end of file +end diff --git a/samples/client/petstore/ruby/lib/PetApi.rb b/samples/client/petstore/ruby/lib/PetApi.rb index 41b4f4122c2d..d7d55a7c3230 100644 --- a/samples/client/petstore/ruby/lib/PetApi.rb +++ b/samples/client/petstore/ruby/lib/PetApi.rb @@ -28,11 +28,12 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -57,9 +58,13 @@ class PetApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -84,11 +89,12 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -113,9 +119,13 @@ class PetApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -140,16 +150,21 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body response.map {|response| Pet.new(response) } @@ -177,16 +192,21 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body response.map {|response| Pet.new(response) } @@ -215,16 +235,21 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body Pet.new(response) @@ -258,17 +283,24 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + form_parameter_hash["name"] = name + form_parameter_hash["status"] = status + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -297,19 +329,24 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = { api_key: api_key, } - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -341,17 +378,24 @@ class PetApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + form_parameter_hash["additionalMetadata"] = additionalMetadata + form_parameter_hash["file"] = file + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end diff --git a/samples/client/petstore/ruby/lib/StoreApi.rb b/samples/client/petstore/ruby/lib/StoreApi.rb index b5d33010cc99..31513cc832b2 100644 --- a/samples/client/petstore/ruby/lib/StoreApi.rb +++ b/samples/client/petstore/ruby/lib/StoreApi.rb @@ -26,16 +26,21 @@ class StoreApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body response.map {|response| map.new(response) } @@ -63,11 +68,12 @@ class StoreApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -92,8 +98,12 @@ class StoreApi end + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body Order.new(response) @@ -121,16 +131,21 @@ class StoreApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body Order.new(response) @@ -158,17 +173,22 @@ class StoreApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end diff --git a/samples/client/petstore/ruby/lib/UserApi.rb b/samples/client/petstore/ruby/lib/UserApi.rb index 40051e7c9fca..4b24bf1f487f 100644 --- a/samples/client/petstore/ruby/lib/UserApi.rb +++ b/samples/client/petstore/ruby/lib/UserApi.rb @@ -28,11 +28,12 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -57,9 +58,13 @@ class UserApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -84,11 +89,12 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -113,9 +119,13 @@ class UserApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -140,11 +150,12 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -169,9 +180,13 @@ class UserApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -199,16 +214,21 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body string.new(response) @@ -233,17 +253,22 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -269,16 +294,21 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} - response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body + + + response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body User.new(response) @@ -309,11 +339,12 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil if body != nil @@ -338,9 +369,13 @@ class UserApi end + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end @@ -366,17 +401,22 @@ class UserApi queryopts = options.select do |key,value| query_param_keys.include? key end - + headers = nil - + + # http body (model) post_body = nil + # form parameters + form_parameter_hash = {} + + - Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body}).make + Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make end diff --git a/samples/client/petstore/ruby/lib/swagger/request.rb b/samples/client/petstore/ruby/lib/swagger/request.rb index 7836cb0bf039..92b5cba810a2 100644 --- a/samples/client/petstore/ruby/lib/swagger/request.rb +++ b/samples/client/petstore/ruby/lib/swagger/request.rb @@ -6,7 +6,7 @@ module Swagger require 'typhoeus' require "swagger/version" - attr_accessor :host, :path, :format, :params, :body, :http_method, :headers + attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params # All requests must have an HTTP method and a path @@ -115,9 +115,18 @@ module Swagger end # If body is an object, JSONify it before making the actual request. - # + # For form parameters, remove empty value def outgoing_body - body.is_a?(String) ? body : body.to_json + # http form + if @body.nil? && @form_params && !@form_params.empty? + data = form_params.dup + data.each do |key, value| + data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter + end + data + else # http body is JSON + @body.is_a?(String) ? @body : @body.to_json + end end # Construct a query string from the query-string-type params @@ -163,6 +172,13 @@ module Swagger :headers => self.headers.stringify_keys, ) + when :patch,:PATCH + Typhoeus::Request.patch( + self.url, + :body => self.outgoing_body, + :headers => self.headers.stringify_keys, + ) + when :put,:PUT Typhoeus::Request.put( self.url, @@ -196,4 +212,4 @@ module Swagger end end -end \ No newline at end of file +end From b2da6dc8a2e157d340dba35e9038477fc1d2a9e3 Mon Sep 17 00:00:00 2001 From: Xu Hui Hui Date: Tue, 17 Mar 2015 16:34:01 +0800 Subject: [PATCH 6/6] update null comparison for query params in Java to make it clear and also allow a query parameter to be set with string value: "null" (4 characters string) --- modules/swagger-codegen/src/main/resources/Java/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache index c0a697e40b42..4a1ab1dc77b1 100644 --- a/modules/swagger-codegen/src/main/resources/Java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache @@ -58,7 +58,7 @@ public class {{classname}} { Map headerParams = new HashMap(); Map formParams = new HashMap(); - {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}}))) + {{#queryParams}}if ({{paramName}} != null) queryParams.put("{{baseName}}", String.valueOf({{paramName}})); {{/queryParams}} {{#headerParams}}headerParams.put("{{baseName}}", {{paramName}});