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

rearrange how map, array, model are checked in body request (#277)

Browse Source
This commit is contained in:
William Cheng 2018-05-01 12:39:56 +08:00 committed by GitHub
parent d3401396f5
commit 23fc7a8cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 95 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/openapi3/haskell-http-client-petstore.sh Executable file
View File

@ -0,0 +1,34 @@
#!/bin/sh
SCRIPT="$0"
echo "# START SCRIPT: $SCRIPT"
while [ -h "$SCRIPT" ] ; do
ls=`ls -ld "$SCRIPT"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
SCRIPT="$link"
else
SCRIPT=`dirname "$SCRIPT"`/"$link"
fi
done
if [ ! -d "${APP_DIR}" ]; then
APP_DIR=`dirname "$SCRIPT"`/..
APP_DIR=`cd "${APP_DIR}"; pwd`
fi
executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
if [ ! -f "$executable" ]
then
mvn clean package
fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
args="$@ generate -t modules/openapi-generator/src/main/resources/haskell-http-client -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -l haskell-http-client -o samples/client/petstore/haskell-http-client"
echo "java ${JAVA_OPTS} -jar ${executable} ${args}"
java $JAVA_OPTS -jar $executable $args

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

@ -4207,49 +4207,29 @@ public class DefaultCodegen implements CodegenConfig {
schema = schemas.get(name); schema = schemas.get(name);
} }
if (ModelUtils.isObjectSchema(schema)) { if (ModelUtils.isMapSchema(schema)) {
CodegenModel codegenModel = null; Schema inner = (Schema) schema.getAdditionalProperties();
if (StringUtils.isNotBlank(name)) { if (inner == null) {
schema.setName(name); inner = new StringSchema().description("//TODO automatically added by openapi-generator");
codegenModel = fromModel(name, schema, schemas); schema.setAdditionalProperties(inner);
} }
CodegenProperty codegenProperty = fromProperty("property", schema);
// only support 1-dimension map only
imports.add(codegenProperty.baseType);
if (codegenModel != null && !codegenModel.emptyVars) {
if (StringUtils.isEmpty(bodyParameterName)) { if (StringUtils.isEmpty(bodyParameterName)) {
codegenParameter.baseName = codegenModel.classname; codegenParameter.baseName = "request_body";
} else { } else {
codegenParameter.baseName = bodyParameterName; codegenParameter.baseName = bodyParameterName;
} }
codegenParameter.paramName = toParamName(codegenParameter.baseName); codegenParameter.paramName = toParamName(codegenParameter.baseName);
codegenParameter.baseType = codegenModel.classname; codegenParameter.items = codegenProperty.items;
codegenParameter.dataType = getTypeDeclaration(codegenModel.classname); codegenParameter.dataType = getTypeDeclaration(inner);
codegenParameter.description = codegenModel.description; codegenParameter.baseType = getSchemaType(inner);
imports.add(codegenParameter.baseType); codegenParameter.isContainer = Boolean.TRUE;
} else { codegenParameter.isMapContainer = Boolean.TRUE;
CodegenProperty codegenProperty = fromProperty("property", schema);
if (schema.getAdditionalProperties() != null) {// http body is map
LOGGER.info("Map not supported in HTTP request body");
} else if (codegenProperty != null) {
LOGGER.warn("The folowing schema has undefined (null) baseType. " +
"It could be due to form parameter defined in OpenAPI v2 spec with incorrect consumes. " +
"A correct 'consumes' for form parameters should be " +
"'application/x-www-form-urlencoded' or 'multipart/form-data'");
LOGGER.warn("schema: " + schema);
LOGGER.warn("Defaulting baseType to UNKNOWN_BASE_TYPE");
codegenProperty.baseType = "UNKNOWN_BASE_TYPE";
codegenParameter.baseName = codegenProperty.baseType;
codegenParameter.baseType = codegenProperty.baseType;
codegenParameter.dataType = codegenProperty.datatype;
codegenParameter.description = codegenProperty.description;
codegenParameter.paramName = toParamName(codegenProperty.baseType);
if (codegenProperty.complexType != null) {
imports.add(codegenProperty.complexType);
}
}
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty); setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
}
} else if (ModelUtils.isArraySchema(schema)) { } else if (ModelUtils.isArraySchema(schema)) {
final ArraySchema arraySchema = (ArraySchema) schema; final ArraySchema arraySchema = (ArraySchema) schema;
Schema inner = arraySchema.getItems(); Schema inner = arraySchema.getItems();
@ -4289,29 +4269,51 @@ public class DefaultCodegen implements CodegenConfig {
imports.add(codegenProperty.baseType); imports.add(codegenProperty.baseType);
codegenProperty = codegenProperty.items; codegenProperty = codegenProperty.items;
} }
} else if (ModelUtils.isMapSchema(schema)) {
Schema inner = (Schema) schema.getAdditionalProperties();
if (inner == null) {
inner = new StringSchema().description("//TODO automatically added by openapi-generator");
schema.setAdditionalProperties(inner);
}
CodegenProperty codegenProperty = fromProperty("property", schema);
// only support 1-dimension map only
imports.add(codegenProperty.baseType);
} else if (ModelUtils.isObjectSchema(schema)) {
CodegenModel codegenModel = null;
if (StringUtils.isNotBlank(name)) {
schema.setName(name);
codegenModel = fromModel(name, schema, schemas);
}
if (codegenModel != null && !codegenModel.emptyVars) {
if (StringUtils.isEmpty(bodyParameterName)) { if (StringUtils.isEmpty(bodyParameterName)) {
codegenParameter.baseName = "request_body"; codegenParameter.baseName = codegenModel.classname;
} else { } else {
codegenParameter.baseName = bodyParameterName; codegenParameter.baseName = bodyParameterName;
} }
codegenParameter.paramName = toParamName(codegenParameter.baseName); codegenParameter.paramName = toParamName(codegenParameter.baseName);
codegenParameter.items = codegenProperty.items; codegenParameter.baseType = codegenModel.classname;
codegenParameter.dataType = getTypeDeclaration(inner); codegenParameter.dataType = getTypeDeclaration(codegenModel.classname);
codegenParameter.baseType = getSchemaType(inner); codegenParameter.description = codegenModel.description;
codegenParameter.isContainer = Boolean.TRUE; imports.add(codegenParameter.baseType);
codegenParameter.isMapContainer = Boolean.TRUE; } else {
CodegenProperty codegenProperty = fromProperty("property", schema);
if (schema.getAdditionalProperties() != null) {// http body is map
LOGGER.error("Map should be supported. Please report to openapi-generator github repo about the issue.");
} else if (codegenProperty != null) {
LOGGER.warn("The folowing schema has undefined (null) baseType. " +
"It could be due to form parameter defined in OpenAPI v2 spec with incorrect consumes. " +
"A correct 'consumes' for form parameters should be " +
"'application/x-www-form-urlencoded' or 'multipart/form-data'");
LOGGER.warn("schema: " + schema);
LOGGER.warn("Defaulting baseType to UNKNOWN_BASE_TYPE");
codegenProperty.baseType = "UNKNOWN_BASE_TYPE";
codegenParameter.baseName = codegenProperty.baseType;
codegenParameter.baseType = codegenProperty.baseType;
codegenParameter.dataType = codegenProperty.datatype;
codegenParameter.description = codegenProperty.description;
codegenParameter.paramName = toParamName(codegenProperty.baseType);
if (codegenProperty.complexType != null) {
imports.add(codegenProperty.complexType);
}
}
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty); setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
}
} else { } else {
// HTTP request body is primitive type (e.g. integer, string, etc) // HTTP request body is primitive type (e.g. integer, string, etc)
CodegenProperty codegenProperty = fromProperty("PRIMITIVE_REQUEST_BODY", schema); CodegenProperty codegenProperty = fromProperty("PRIMITIVE_REQUEST_BODY", schema);