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] Add support for model name mapping for go #17023

Merged
merged 3 commits into from
Nov 11, 2023
Merged

[GO] Add support for model name mapping for go #17023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b87e5a6
Add support for model name mapping for go
artificial-aidan Nov 9, 2023
ec5a059
Add model name and filename tests
artificial-aidan Nov 9, 2023
6ec9de9
Use File.separator to make the test platform agnostic
artificial-aidan Nov 9, 2023
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
9 changes: 9 additions & 0 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 @@ -280,6 +280,10 @@ protected boolean isReservedFilename(String name) {

@Override
public String toModelFilename(String name) {
// Obtain the model name from modelNameMapping directly if provided
if (modelNameMapping.containsKey(name)) {
name = modelNameMapping.get(name);
}
name = toModel("model_" + name);

if (isReservedFilename(name)) {
Expand All @@ -295,6 +299,11 @@ public String toModel(String name) {
}

public String toModel(String name, boolean doUnderscore) {
// obtain the name from modelNameMapping directly if provided
if (modelNameMapping.containsKey(name)) {
return modelNameMapping.get(name);
}

if (!StringUtils.isEmpty(modelNamePrefix)) {
name = modelNamePrefix + "_" + name;
}
Expand Down
26 changes: 26 additions & 0 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.io.File;

@SuppressWarnings("static-method")
public class GoModelTest {

Expand Down Expand Up @@ -298,4 +300,28 @@ public void modelNameTest(String name, String expectedName) {
Assert.assertEquals(cm.name, name);
Assert.assertEquals(cm.classname, expectedName);
}

@DataProvider(name = "modelMappedNames")
public static Object[][] mappedNames() {
return new Object[][] {
{"mapped", "Remapped", "model_remapped.go"},
{"mapped_underscore", "RemappedUnderscore", "model_remapped_underscore.go"},
};
}

@Test(dataProvider = "modelMappedNames", description = "map model names")
public void modelNameMappingsTest(String name, String expectedName, String expectedFilename) {
final Schema model = new Schema();
final DefaultCodegen codegen = new GoClientCodegen();
codegen.modelNameMapping().put(name, expectedName);
OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema(name, model);
codegen.setOpenAPI(openAPI);
final CodegenModel cm = codegen.fromModel(name, model);

final String fn = codegen.modelFilename("model.mustache", name, "");
Assert.assertEquals(fn, File.separator + expectedFilename);

Assert.assertEquals(cm.name, name);
Assert.assertEquals(cm.classname, expectedName);
}
}
Loading