loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code clean-up: remove DefaultCodegen#getSimpleRef(String) (#19)

Browse Source 
Use ModelUtils#getSimpleRef(String) instead
This commit is contained in:
Jérémie Bresson 2018-05-13 09:25:45 +02:00 committed by William Cheng
parent 737e63976f
commit 41b0ff351b
7 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1472,7 +1472,7 @@ public class DefaultCodegen implements CodegenConfig {
continue; continue;
} }
Schema refSchema = null; Schema refSchema = null;
String ref = getSimpleRef(interfaceSchema.get$ref()); String ref = ModelUtils.getSimpleRef(interfaceSchema.get$ref());
if (allDefinitions != null) { if (allDefinitions != null) {
refSchema = allDefinitions.get(ref); refSchema = allDefinitions.get(ref);
} }
@ -1593,7 +1593,7 @@ public class DefaultCodegen implements CodegenConfig {
} }
if (StringUtils.isNotBlank(schema.get$ref())) { if (StringUtils.isNotBlank(schema.get$ref())) {
Schema interfaceSchema = allSchemas.get(getSimpleRef(schema.get$ref())); Schema interfaceSchema = allSchemas.get(ModelUtils.getSimpleRef(schema.get$ref()));
addProperties(properties, required, interfaceSchema, allSchemas); addProperties(properties, required, interfaceSchema, allSchemas);
return; return;
} }
@ -2225,9 +2225,7 @@ public class DefaultCodegen implements CodegenConfig {
} }
} else { } else {
// process body parameter // process body parameter
if (StringUtils.isNotBlank(requestBody.get$ref())) { requestBody = ModelUtils.getReferencedRequestBody(openAPI, requestBody);
requestBody = openAPI.getComponents().getRequestBodies().get(getSimpleRef(requestBody.get$ref()));
}
String bodyParameterName = ""; String bodyParameterName = "";
if (op.vendorExtensions != null && op.vendorExtensions.containsKey("x-codegen-request-body-name")) { if (op.vendorExtensions != null && op.vendorExtensions.containsKey("x-codegen-request-body-name")) {
@ -4001,7 +3999,7 @@ public class DefaultCodegen implements CodegenConfig {
if (StringUtils.isBlank(ref)) { if (StringUtils.isBlank(ref)) {
return null; return null;
} }
ref = getSimpleRef(ref); ref = ModelUtils.getSimpleRef(ref);
return allSchemas.get(ref); return allSchemas.get(ref);
} }
return null; return null;
@ -4014,16 +4012,11 @@ public class DefaultCodegen implements CodegenConfig {
if (StringUtils.isBlank(ref)) { if (StringUtils.isBlank(ref)) {
return null; return null;
} }
return getSimpleRef(ref); return ModelUtils.getSimpleRef(ref);
} }
return null; return null;
} }
// TODO decommission this function and replace it with ModelUtils.getSimpleRef() directly
protected String getSimpleRef(String ref) {
return ModelUtils.getSimpleRef(ref);
}
protected String getCollectionFormat(Parameter parameter) { protected String getCollectionFormat(Parameter parameter) {
if (Parameter.StyleEnum.FORM.equals(parameter.getStyle())) { if (Parameter.StyleEnum.FORM.equals(parameter.getStyle())) {
// Ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#style-values // Ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#style-values
@ -4066,7 +4059,7 @@ public class DefaultCodegen implements CodegenConfig {
LOGGER.debug("debugging fromRequestBodyToFormParameters= " + body); LOGGER.debug("debugging fromRequestBodyToFormParameters= " + body);
Schema schema = ModelUtils.getSchemaFromRequestBody(body); Schema schema = ModelUtils.getSchemaFromRequestBody(body);
if (StringUtils.isNotBlank(schema.get$ref())) { if (StringUtils.isNotBlank(schema.get$ref())) {
schema = schemas.get(getSimpleRef(schema.get$ref())); schema = schemas.get(ModelUtils.getSimpleRef(schema.get$ref()));
} }
if (schema.getProperties() != null && !schema.getProperties().isEmpty()) { if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
Map<String, Schema> properties = schema.getProperties(); Map<String, Schema> properties = schema.getProperties();
@ -4221,7 +4214,7 @@ public class DefaultCodegen implements CodegenConfig {
LOGGER.debug("Request body = " + body); LOGGER.debug("Request body = " + body);
Schema schema = ModelUtils.getSchemaFromRequestBody(body); Schema schema = ModelUtils.getSchemaFromRequestBody(body);
if (StringUtils.isNotBlank(schema.get$ref())) { if (StringUtils.isNotBlank(schema.get$ref())) {
name = getSimpleRef(schema.get$ref()); name = ModelUtils.getSimpleRef(schema.get$ref());
schema = schemas.get(name); schema = schemas.get(name);
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
View File

@ -331,7 +331,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
} }
return "std::vector<" + inner + ">()"; return "std::vector<" + inner + ">()";
} else if (!StringUtils.isEmpty(p.get$ref())) { // model } else if (!StringUtils.isEmpty(p.get$ref())) { // model
return "new " + toModelName(getSimpleRef(p.get$ref())) + "()"; return "new " + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()";
} else if (ModelUtils.isStringSchema(p)) { } else if (ModelUtils.isStringSchema(p)) {
return "\"\""; return "\"\"";
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java
View File

@ -344,7 +344,7 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo
} else if (ModelUtils.isStringSchema(p)) { } else if (ModelUtils.isStringSchema(p)) {
return "new QString(\"\")"; return "new QString(\"\")";
} else if (!StringUtils.isEmpty(p.get$ref())) { } else if (!StringUtils.isEmpty(p.get$ref())) {
return "new " + toModelName(getSimpleRef(p.get$ref())) + "()"; return "new " + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()";
} }
return "NULL"; return "NULL";
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java
View File

@ -337,7 +337,7 @@ public class CppRestClientCodegen extends AbstractCppCodegen {
} }
return "std::vector<" + inner + ">()"; return "std::vector<" + inner + ">()";
} else if (!StringUtils.isEmpty(p.get$ref())) { } else if (!StringUtils.isEmpty(p.get$ref())) {
return "new " + toModelName(getSimpleRef(p.get$ref())) + "()"; return "new " + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()";
} else if (ModelUtils.isStringSchema(p)) { } else if (ModelUtils.isStringSchema(p)) {
return "utility::conversions::to_string_t(\"\")"; return "utility::conversions::to_string_t(\"\")";
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
View File

@ -324,7 +324,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
} }
return "std::vector<" + inner + ">()"; return "std::vector<" + inner + ">()";
} else if (!StringUtils.isEmpty(p.get$ref())) { } else if (!StringUtils.isEmpty(p.get$ref())) {
return "new " + toModelName(getSimpleRef(p.get$ref())) + "()"; return "new " + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()";
} }
return "nullptr"; return "nullptr";
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java
View File

@ -225,7 +225,7 @@ public class CppTizenClientCodegen extends DefaultCodegen implements CodegenConf
} else if (ModelUtils.isArraySchema(p)) { } else if (ModelUtils.isArraySchema(p)) {
return "new std::list()"; return "new std::list()";
} else if (!StringUtils.isEmpty(p.get$ref())) { } else if (!StringUtils.isEmpty(p.get$ref())) {
return "new " + toModelName(getSimpleRef(p.get$ref())) + "()"; return "new " + toModelName(ModelUtils.getSimpleRef(p.get$ref())) + "()";
} else if (ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p)) { } else if (ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p)) {
return "null"; return "null";
} else if (ModelUtils.isStringSchema(p)) { } else if (ModelUtils.isStringSchema(p)) {

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
View File

@ -688,7 +688,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
Schema response = (Schema) rsp.schema; Schema response = (Schema) rsp.schema;
// Check whether we're returning an object with a defined XML namespace. // Check whether we're returning an object with a defined XML namespace.
if (response != null && (!StringUtils.isEmpty(response.get$ref()))) { if (response != null && (!StringUtils.isEmpty(response.get$ref()))) {
Schema model = definitions.get(getSimpleRef(response.get$ref())); Schema model = definitions.get(ModelUtils.getSimpleRef(response.get$ref()));
if ((model != null)) { if ((model != null)) {
XML xml = model.getXml(); XML xml = model.getXml();
if ((xml != null) && (xml.getNamespace() != null)) { if ((xml != null) && (xml.getNamespace() != null)) {
@ -826,7 +826,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
CodegenModel mdl = super.fromModel(name, model, allDefinitions); CodegenModel mdl = super.fromModel(name, model, allDefinitions);
mdl.vendorExtensions.put("upperCaseName", name.toUpperCase()); mdl.vendorExtensions.put("upperCaseName", name.toUpperCase());
if (!StringUtils.isEmpty(model.get$ref())) { if (!StringUtils.isEmpty(model.get$ref())) {
Schema schema = allDefinitions.get(getSimpleRef(model.get$ref())); Schema schema = allDefinitions.get(ModelUtils.getSimpleRef(model.get$ref()));
mdl.dataType = typeMapping.get(schema.getType()); mdl.dataType = typeMapping.get(schema.getType());
} }
if (ModelUtils.isArraySchema(model)) { if (ModelUtils.isArraySchema(model)) {
@ -1051,7 +1051,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
if ((refName != null) && (refName instanceof String)) { if ((refName != null) && (refName instanceof String)) {
String name = (String) refName; String name = (String) refName;
Schema model = definitions.get(getSimpleRef(name)); Schema model = definitions.get(ModelUtils.getSimpleRef(name));
if (model != null) { if (model != null) {
XML xml = model.getXml(); XML xml = model.getXml();