From a51d71e72860ff70e84f54ce6be3c9d667a9e19c Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 9 Jul 2015 10:48:16 +0800 Subject: [PATCH] Fix syntax error when there are no authMethods --- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 6 +++++- .../src/main/resources/ruby/swagger/request.mustache | 5 ++++- .../client/petstore/ruby/lib/petstore/swagger/request.rb | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 0ad05b0762b..1e23e3b9858 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -218,7 +218,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { bundle.put("models", allModels); bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar)); bundle.put("modelPackage", config.modelPackage()); - bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions())); + List authMethods = config.fromSecurity(swagger.getSecurityDefinitions()); + if (!authMethods.isEmpty()) { + bundle.put("authMethods", authMethods); + bundle.put("hasAuthMethods", true); + } if (swagger.getExternalDocs() != null) { bundle.put("externalDocs", swagger.getExternalDocs()); } 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 8f07e5ab66c..5878888a21f 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache @@ -30,10 +30,12 @@ module {{moduleName}} self.path = path attributes.each { |name, value| send "#{name}=", value } - + {{#hasAuthMethods}} update_params_for_auth! + {{/hasAuthMethods}} end + {{#hasAuthMethods}} # Update hearder and query params based on authentication settings. def update_params_for_auth! (@auth_names || []).each do |auth_name| @@ -48,6 +50,7 @@ module {{moduleName}} end end end + {{/hasAuthMethods}} # Get API key (with prefix if set). # @param [String] param_name the parameter name of API key auth diff --git a/samples/client/petstore/ruby/lib/petstore/swagger/request.rb b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb index 049c6c15cb1..630b7a27d2e 100644 --- a/samples/client/petstore/ruby/lib/petstore/swagger/request.rb +++ b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb @@ -30,10 +30,12 @@ module Petstore self.path = path attributes.each { |name, value| send "#{name}=", value } - + update_params_for_auth! + end + # Update hearder and query params based on authentication settings. def update_params_for_auth! (@auth_names || []).each do |auth_name| @@ -47,6 +49,7 @@ module Petstore end end end + # Get API key (with prefix if set). # @param [String] param_name the parameter name of API key auth