loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Set isModel property (#1275)

Browse Source 
* Set isModel property

* Replace tab characters
This commit is contained in:
john lilley 2018-10-23 02:52:36 -06:00 committed by William Cheng
parent bb056ccf3d
commit e06665f368
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
public class CodegenParameter {
public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
isCookieParam, isBodyParam, hasMore, isContainer,
secondaryParam, isCollectionFormatMulti, isPrimitiveType;
secondaryParam, isCollectionFormatMulti, isPrimitiveType, isModel;
public String baseName, paramName, dataType, datatypeWithEnum, dataFormat,
collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName;
@ -110,6 +110,7 @@ public class CodegenParameter {
output.collectionFormat = this.collectionFormat;
output.isCollectionFormatMulti = this.isCollectionFormatMulti;
output.isPrimitiveType = this.isPrimitiveType;
output.isModel = this.isModel;
output.description = this.description;
output.unescapedDescription = this.unescapedDescription;
output.baseType = this.baseType;
@ -201,6 +202,8 @@ public class CodegenParameter {
return false;
if (isPrimitiveType != that.isPrimitiveType)
return false;
if (isModel != that.isModel)
return false;
if (baseName != null ? !baseName.equals(that.baseName) : that.baseName != null)
return false;
if (paramName != null ? !paramName.equals(that.paramName) : that.paramName != null)
@ -312,6 +315,7 @@ public class CodegenParameter {
result = 31 * result + (secondaryParam ? 13:31);
result = 31 * result + (isCollectionFormatMulti ? 13:31);
result = 31 * result + (isPrimitiveType ? 13:31);
result = 31 * result + (isModel ? 13:31);
result = 31 * result + (baseName != null ? baseName.hashCode() : 0);
result = 31 * result + (paramName != null ? paramName.hashCode() : 0);
result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
@ -378,6 +382,7 @@ public class CodegenParameter {
", secondaryParam=" + secondaryParam +
", isCollectionFormatMulti=" + isCollectionFormatMulti +
", isPrimitiveType=" + isPrimitiveType +
", isModel=" + isModel +
", baseName='" + baseName + '\'' +
", paramName='" + paramName + '\'' +
", dataType='" + dataType + '\'' +

7
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
View File

@ -55,7 +55,7 @@ public class CodegenProperty implements Cloneable {
public boolean exclusiveMaximum;
public boolean hasMore, required, secondaryParam;
public boolean hasMoreNonReadOnly; // for model constructor, true if next property is not readonly
public boolean isPrimitiveType, isContainer, isNotContainer;
public boolean isPrimitiveType, isModel, isContainer, isNotContainer;
public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid;
public boolean isListContainer, isMapContainer;
public boolean isEnum;
@ -438,6 +438,7 @@ public class CodegenProperty implements Cloneable {
result = prime * result + (isEnum ? 1231 : 1237);
result = prime * result + ((isNotContainer ? 13:31));
result = prime * result + ((isPrimitiveType ? 13:31));
result = prime * result + ((isModel ? 13:31));
result = prime * result + ((isReadOnly ? 13:31));
result = prime * result + ((isWriteOnly ? 13:31));
result = prime * result + ((isNullable ? 13:31));
@ -579,6 +580,9 @@ public class CodegenProperty implements Cloneable {
if (this.isPrimitiveType != other.isPrimitiveType) {
return false;
}
if (this.isModel != other.isModel) {
return false;
}
if (this.isContainer != other.isContainer) {
return false;
}
@ -759,6 +763,7 @@ public class CodegenProperty implements Cloneable {
", secondaryParam=" + secondaryParam +
", hasMoreNonReadOnly=" + hasMoreNonReadOnly +
", isPrimitiveType=" + isPrimitiveType +
", isModel=" + isModel +
", isContainer=" + isContainer +
", isNotContainer=" + isNotContainer +
", isString=" + isString +

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -2175,6 +2175,7 @@ public class DefaultCodegen implements CodegenConfig {
property.isPrimitiveType = true;
} else {
property.complexType = property.baseType;
property.isModel = true;
}
}
@ -4515,6 +4516,9 @@ public class DefaultCodegen implements CodegenConfig {
schema.setName(name);
codegenModel = fromModel(name, schema, schemas);
}
if (codegenModel != null) {
codegenParameter.isModel = true;
}
if (codegenModel != null && !codegenModel.emptyVars) {
if (StringUtils.isEmpty(bodyParameterName)) {