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

Remove printlns

Browse Source
This commit is contained in:
Tino Fuhrmann
2023-04-20 17:34:24 +02:00
parent 7527911393
commit cd79f5eff9
4 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1648,9 +1648,7 @@ public class DefaultCodegen implements CodegenConfig {
*/
@SuppressWarnings("static-method")
public String toEnumName(CodegenProperty property) {
String enumName = StringUtils.capitalize(property.name) + "Enum";
System.out.println("Default CodeGen: " + enumName);
return enumName;
return StringUtils.capitalize(property.name) + "Enum";
}
/**
@@ -4142,8 +4140,6 @@ public class DefaultCodegen implements CodegenConfig {
}
if (baseItem != null) {
// set both datatype and datetypeWithEnum as only the inner type is enum
System.out.println("Marker: 1");
System.out.println("Replace: " + property.datatypeWithEnum + " from " + baseItem.baseType + " to " + toEnumName(baseItem));
property.datatypeWithEnum = property.datatypeWithEnum.replace(baseItem.baseType, toEnumName(baseItem));
// naming the enum with respect to the language enum naming convention

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
View File

@@ -604,7 +604,6 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
} else if (ModelUtils.isMapSchema(p)) {
Schema<?> inner = getSchemaAdditionalProperties(p);
String nullSafeSuffix = getNullSafeAdditionalProps() ? " | undefined" : "";
System.out.println("[getTypeDeclaration] Inner: "+ inner.toString());
return "{ [key: string]: " + getTypeDeclaration(unaliasSchema(inner)) + nullSafeSuffix + "; }";
} else if (ModelUtils.isFileSchema(p)) {
return "File";
@@ -886,11 +885,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
@Override
public String toEnumName(CodegenProperty property) {
String enumName = property.name;
System.out.println("enumName: " + enumName);
enumName = addSuffix(enumName, enumSuffix);
System.out.println("enumName with Suffix: " + enumName);
String tsName = toTypescriptTypeName(enumName, "_");
System.out.println("TS Name: " + tsName);
return tsName;
}
@@ -977,7 +973,6 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
CodegenModel cm = mo.getModel();
if (cm.discriminator != null && cm.children != null) {
for (CodegenModel child : cm.children) {
// TODO marker5
this.setDiscriminatorValue(child, cm.discriminator.getPropertyName(), this.getDiscriminatorValue(child));
}
}

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

@@ -305,15 +305,6 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp
baseItem = baseItem.items;
}
if (baseItem != null) {
// set both datatype and datetypeWithEnum as only the inner type is enum
System.out.println("Marker: 1");
System.out.println("Replace: " + property.datatypeWithEnum + " from " + baseItem.baseType + " to " + toEnumName(baseItem));
System.out.println("Property info: " + property.isArray + " // " + property.isContainer + " // " + property.isFreeFormObject + " // " + property.isMap);
System.out.println("Property: "+ property.dataType);
System.out.println("Base ITem: " + baseItem.isMap + " // " + baseItem.baseName + " // " + baseItem.containerType + " // " + baseItem.dataType);
System.out.println("Base Type: "+ baseItem.jsonSchema);
System.out.println("Property: "+ property.jsonSchema);
/*
* Note: There are cases where we have datatypeWithEnum == Array<{ [key: string]: string}
* In these cases, we then have Array <{ [key: EnumName]: EnumName}> - which is invalid typescript
@@ -329,9 +320,6 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp
// set default value for variable with inner enum
if (property.defaultValue != null) {
System.out.println("Default Vaule: " + property.defaultValue);
System.out.println("Base Type: " + baseItem.baseType);
System.out.println("Enum Name: "+ toEnumName(baseItem));
property.defaultValue = property.defaultValue.replace(baseItem.baseType, toEnumName(baseItem));
}
@@ -349,24 +337,16 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp
// name enum with model name, e.g. StatusEnum => Pet.StatusEnum
for (CodegenProperty var : cm.vars) {
if (Boolean.TRUE.equals(var.isEnum)) {
System.out.println("Generating data type with enum");
System.out.println("Enum name before processing (datatype):" + var.dataType);
System.out.println("Enum name before processing (datatypeWenum): " + var.datatypeWithEnum);
String replaceName = var.isInnerEnum ? "Inner" + super.enumSuffix : var.enumName;
System.out.println("Enum data: " + replaceName + " / " + cm.classname + " " + var.enumName);
var.datatypeWithEnum = var.datatypeWithEnum.replace(replaceName, var.enumName);
var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + var.enumName);
System.out.println("Final data type with enum: " + var.datatypeWithEnum);
}
}
if (cm.parent != null) {
for (CodegenProperty var : cm.allVars) {
if (Boolean.TRUE.equals(var.isEnum)) {
System.out.println("Generating data type with enum");
System.out.println("Enum data: " + var.enumName + " / " + cm.classname + " " + var.enumName);
var.datatypeWithEnum = var.datatypeWithEnum
.replace(var.enumName, cm.classname + var.enumName);
System.out.println("Final data type with enum: " + var.datatypeWithEnum);
}
}
}
@@ -484,7 +464,6 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp
if (Boolean.TRUE.equals(inner.getNullable())) {
postfix = " | null";
}
System.out.println("[getTypeDeclaration] Inner: "+ inner.toString());
return "{ [key: string]: " + this.getTypeDeclaration(unaliasSchema(inner)) + postfix + "; }";
} else if (ModelUtils.isFileSchema(p)) {
return "HttpFile";

1
modules/openapi-generator/src/main/resources/typescript/model/model.mustache vendored
View File

@@ -19,7 +19,6 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
* {{{.}}}
*/
{{/description}}
// HERE?
'{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
{{/vars}}