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

[Go] Prefix enum number with _ (#703)

Browse Source 
* prefix enum number with _ in go

* reformat code, use else if
This commit is contained in:
William Cheng 2018-08-02 10:13:01 +08:00 committed by GitHub
parent ab08dd1d26
commit 40024ac72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
View File

@ -145,7 +145,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
@Override @Override
public String toVarName(String name) { public String toVarName(String name) {
// replace - with _ e.g. created-at => created_at // replace - with _ e.g. created-at => created_at
name = sanitizeName(name); name = sanitizeName(name);
@ -267,10 +267,10 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// the type. // the type.
String openAPIType = getSchemaType(p); String openAPIType = getSchemaType(p);
String ref = p.get$ref(); String ref = p.get$ref();
if(ref != null && !ref.isEmpty()) { if (ref != null && !ref.isEmpty()) {
String tryRefV2 = "#/definitions/" + openAPIType; String tryRefV2 = "#/definitions/" + openAPIType;
String tryRefV3 = "#/components/schemas/" + openAPIType; String tryRefV3 = "#/components/schemas/" + openAPIType;
if(ref.equals(tryRefV2) || ref.equals(tryRefV3)) { if (ref.equals(tryRefV2) || ref.equals(tryRefV3)) {
return toModelName(openAPIType); return toModelName(openAPIType);
} }
} }
@ -296,7 +296,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
String ref = p.get$ref(); String ref = p.get$ref();
String type = null; String type = null;
if(ref != null && !ref.isEmpty()) { if (ref != null && !ref.isEmpty()) {
type = openAPIType; type = openAPIType;
} else if (typeMapping.containsKey(openAPIType)) { } else if (typeMapping.containsKey(openAPIType)) {
type = typeMapping.get(openAPIType); type = typeMapping.get(openAPIType);
@ -570,8 +570,10 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
enumName = enumName.replaceFirst("^_", ""); enumName = enumName.replaceFirst("^_", "");
enumName = enumName.replaceFirst("_$", ""); enumName = enumName.replaceFirst("_$", "");
if (isReservedWord(enumName) || enumName.matches("\\d.*")) { // reserved word or starts with number if (isReservedWord(enumName)) { // reserved word
return escapeReservedWord(enumName); return escapeReservedWord(enumName);
} else if (enumName.matches("\\d.*")) { // starts with a number
return "_" + enumName;
} else { } else {
return enumName; return enumName;
} }

2
samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION
View File

@ -1 +1 @@
3.1.1-SNAPSHOT 3.2.0-SNAPSHOT