Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into kotlin-visibility
# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
  • Loading branch information
4brunu committed Oct 9, 2019
commit 2a38b36c9475983ccd4ad7906c4518dbaa8bc456
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ public void processOpts() {
additionalProperties.put(CodegenConstants.NON_PUBLIC_API, nonPublicApi);
}

additionalProperties.put(CodegenConstants.NEEDS_DATACLASS_BODY, this.hasEnums || serializableModel);
additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage());
additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage());

Expand Down Expand Up @@ -497,6 +498,14 @@ public void setNonPublicApi(boolean nonPublicApi) {
this.nonPublicApi = nonPublicApi;
}

public boolean isNeedsDataClassBody() {
return needsDataClassBody;
}

public void setNeedsDataClassBody(boolean needsDataClassBody) {
this.needsDataClassBody = needsDataClassBody;
}

/**
* Return the sanitized variable name for enum
*
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.