From 033b9871b3eda94128ee4fe6f0685f61a410225a Mon Sep 17 00:00:00 2001 From: Tommy Alander Date: Thu, 3 Mar 2016 10:27:42 +0100 Subject: [PATCH] fix the useage of the cli option for emitdefaultvalues and verify that it works --- .../swagger/codegen/languages/AbstractCSharpCodegen.java | 8 ++++++++ .../swagger/codegen/csharp/CSharpClientOptionsTest.java | 2 ++ .../codegen/options/CSharpClientOptionsProvider.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java index dc65edeb874..24bee9216b2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java @@ -121,6 +121,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co this.returnICollection = returnICollection; } + public void setOptionalEmitDefaultValue(boolean optionalEmitDefaultValue) { + this.optionalEmitDefaultValue = optionalEmitDefaultValue; + } + public void setUseCollection(boolean useCollection) { this.useCollection = useCollection; if (useCollection) { @@ -192,6 +196,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co if (additionalProperties.containsKey(CodegenConstants.RETURN_ICOLLECTION)) { setReturnICollection(Boolean.valueOf(additionalProperties.get(CodegenConstants.RETURN_ICOLLECTION).toString())); } + + if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES)) { + setOptionalEmitDefaultValue(Boolean.valueOf(additionalProperties.get(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES).toString())); + } } @Override diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java index da1b7ef7ea2..71975fcee66 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java @@ -46,6 +46,8 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest { times = 1; clientCodegen.setReturnICollection(false); times = 1; + clientCodegen.setOptionalEmitDefaultValue(true); + times = 1; }}; } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java index e8366aca008..5f43f5cf155 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java @@ -32,7 +32,7 @@ public class CSharpClientOptionsProvider implements OptionsProvider { .put(CodegenConstants.OPTIONAL_PROJECT_FILE, "true") .put(CodegenConstants.OPTIONAL_PROJECT_GUID, PACKAGE_GUID_VALUE) .put(CodegenConstants.DOTNET_FRAMEWORK, "4.x") - .put(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, "false") + .put(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, "true") .build(); }