Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[go] Fix filenames with $GOOS and $GOARCH sufixes #5283

Merged
merged 3 commits into from
Feb 21, 2020
Merged

[go] Fix filenames with $GOOS and $GOARCH sufixes #5283

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c947a5
[go] Fix filenames with $GOOS and $GOARCH sufixes
jirikuncar Feb 11, 2020
3e5a0f8
Too early commit
jirikuncar Feb 11, 2020
4f27a6a
Use suffix instead of name
jirikuncar Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions ...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,28 @@ public String toModelName(String name) {
return camelize(toModel(name));
}

protected boolean isReservedFilename(String name) {
String[] parts = name.split("_");
String suffix = parts[parts.length - 1];

Set<String> reservedSuffixes = new HashSet<String>(Arrays.asList(
// Test
"test",
// $GOOS
"aix", "android", "darwin", "dragonfly", "freebsd", "illumos", "js", "linux", "netbsd", "openbsd",
"plan9", "solaris", "windows",
// $GOARCH
"386", "amd64", "arm", "arm64", "mips", "mips64", "mips64le", "mipsle", "ppc64", "ppc64le", "s390x",
"wasm"));
return reservedSuffixes.contains(suffix);
}

@Override
public String toModelFilename(String name) {
name = toModel("model_" + name);
if (name.endsWith("_test")) {
LOGGER.warn(name + ".go with `_test.go` suffix (reserved word) cannot be used as filename. Renamed to " + name + "_.go");

if (isReservedFilename(name)) {
LOGGER.warn(name + ".go with suffix (reserved word) cannot be used as filename. Renamed to " + name + "_.go");
name += "_";
}
return name;
Expand Down Expand Up @@ -279,8 +296,8 @@ public String toApiFilename(String name) {

// e.g. PetApi.go => pet_api.go
name = "api_" + underscore(name);
if (name.endsWith("_test")) {
LOGGER.warn(name + ".go with `_test.go` suffix (reserved word) cannot be used as filename. Renamed to " + name + "_.go");
if (isReservedFilename(name)) {
LOGGER.warn(name + ".go with suffix (reserved word) cannot be used as filename. Renamed to " + name + "_.go");
name += "_";
}
return name;
Expand Down Expand Up @@ -341,10 +358,10 @@ public String getSchemaType(Schema p) {
type = openAPIType;
return type;
}

/**
* Determines the golang instantiation type of the specified schema.
*
*
* This function is called when the input schema is a map, and specifically
* when the 'additionalProperties' attribute is present in the OAS specification.
* Codegen invokes this function to resolve the "parent" association to
Expand All @@ -354,7 +371,7 @@ public String getSchemaType(Schema p) {
* - Indicate a polymorphic association with some other type (e.g. class inheritance).
* - If the specification has a discriminator, cogegen create a “parent” based on the discriminator.
* - Use of the 'additionalProperties' attribute in the OAS specification.
* This is the specific scenario when codegen invokes this function.
* This is the specific scenario when codegen invokes this function.
*
* @param property the input schema
*
Expand Down