From 33138c139f3195065b62e348d94a80b45f44c658 Mon Sep 17 00:00:00 2001 From: Fake Bob Dobbs Date: Fri, 15 May 2015 16:55:49 -0400 Subject: [PATCH] A parameter's default value is not flowing from the swagger definition to the actual API implementation. This change makes the property from the swagger def json available to the templates. --- .../java/com/wordnik/swagger/codegen/CodegenParameter.java | 5 +++-- .../java/com/wordnik/swagger/codegen/DefaultCodegen.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java index 04cecabad90..8dc9991daed 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java @@ -3,7 +3,7 @@ package com.wordnik.swagger.codegen; public class CodegenParameter { public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam; - public String baseName, paramName, dataType, collectionFormat, description, baseType; + public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue; public String jsonSchema; /** @@ -34,7 +34,8 @@ public class CodegenParameter { output.isBodyParam = this.isBodyParam; output.required = this.required; output.jsonSchema = this.jsonSchema; + output.defaultValue = this.defaultValue; return output; } -} \ No newline at end of file +} 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 6f51374c536..966cc817863 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 @@ -904,6 +904,10 @@ public class DefaultCodegen { p.required = param.getRequired(); p.jsonSchema = Json.pretty(param); + if(param instanceof QueryParameter) { + p.defaultValue = ((QueryParameter)param).getDefaultValue(); + } + if(param instanceof SerializableParameter) { SerializableParameter qp = (SerializableParameter) param; Property property = null;