loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

#3285 Check for typeMapper types inside getSwaggerType instead of toModelName

Browse Source
This commit is contained in:
christian 2016-07-06 23:11:08 +02:00
parent ceffa84cdf
commit 41df857573
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -1129,11 +1129,6 @@ public class DefaultCodegen {
* @return capitalized model name * @return capitalized model name
*/ */
public String toModelName(final String name) { public String toModelName(final String name) {
// Don't do any kind of renaming to language specific types
if(typeMapping.values().contains(name)) {
return name;
}
return initialCaps(modelNamePrefix + name + modelNameSuffix); return initialCaps(modelNamePrefix + name + modelNameSuffix);
} }

26
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
View File

@ -343,11 +343,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
@Override @Override
public String toModelName(final String name) { public String toModelName(final String name) {
// Don't do any kind of sanitizing to Java types (e.g. BigDecimal)
if(typeMapping.values().contains(name)) {
return name;
}
final String sanitizedName = sanitizeName(modelNamePrefix + name + modelNameSuffix); final String sanitizedName = sanitizeName(modelNamePrefix + name + modelNameSuffix);
// camelize the model name // camelize the model name
@ -525,21 +520,16 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
@Override @Override
public String getSwaggerType(Property p) { public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p); String swaggerType = super.getSwaggerType(p);
String type;
// don't apply renaming on types from the typeMapping
if (typeMapping.containsKey(swaggerType)) { if (typeMapping.containsKey(swaggerType)) {
type = typeMapping.get(swaggerType); return typeMapping.get(swaggerType);
if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 ||
type.equals("Map") || type.equals("List") ||
type.equals("File") || type.equals("Date")) {
return type;
}
} else {
type = swaggerType;
} }
if (null == type) {
if (null == swaggerType) {
LOGGER.error("No Type defined for Property " + p); LOGGER.error("No Type defined for Property " + p);
} }
return toModelName(type); return toModelName(swaggerType);
} }
@Override @Override
@ -733,10 +723,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger); CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
op.path = sanitizePath(op.path); op.path = sanitizePath(op.path);
return op; return op;
} }
private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
// This generator uses inline classes to define enums, which breaks when // This generator uses inline classes to define enums, which breaks when
// dealing with models that have subTypes. To clean this up, we will analyze // dealing with models that have subTypes. To clean this up, we will analyze