Skip to content

[Java] Fix numeric field names #3436

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

Merged
macjohnny merged 3 commits into from
Jul 25, 2019
Merged

[Java] Fix numeric field names #3436

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1280221
Fix for OpenAPITools/openapi-generator#3293. Number fields in java ge…
Fjolnir-Dvorak Jul 24, 2019
8847046
Added a few tests for number to varName to persist and ensure this be…
Fjolnir-Dvorak Jul 24, 2019
01f52f1
I also added a few test for convertModelName to prevent similar break…
Fjolnir-Dvorak Jul 24, 2019
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
Prev Previous commit
I also added a few test for convertModelName to prevent similar break… 
…ing changes in the future. #3293.
  • Loading branch information
@Fjolnir-Dvorak
Fjolnir-Dvorak committed Jul 24, 2019
commit 01f52f12055cf54118fd3b6d378eb22e06aaa7ca
24 changes: 18 additions & 6 deletions ...penapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,26 @@ public void convertVarName() throws Exception {
Assert.assertEquals(fakeJavaCodegen.toVarName("1A"), "_1A");
Assert.assertEquals(fakeJavaCodegen.toVarName("1AAAA"), "_1AAAA");
Assert.assertEquals(fakeJavaCodegen.toVarName("1AAaa"), "_1aAaa");
}
}

@Test
public void convertModelName() throws Exception {
@Test
public void convertModelName() throws Exception {
Assert.assertEquals(fakeJavaCodegen.toModelName("name"), "Name");
Assert.assertEquals(fakeJavaCodegen.toModelName("$name"), "Name");
Assert.assertEquals(fakeJavaCodegen.toModelName("nam#e"), "Name");
Assert.assertEquals(fakeJavaCodegen.toModelName("$another-fake?"), "AnotherFake");
}
Assert.assertEquals(fakeJavaCodegen.toModelName("1a"), "Model1a");
Assert.assertEquals(fakeJavaCodegen.toModelName("1A"), "Model1A");
Assert.assertEquals(fakeJavaCodegen.toModelName("AAAb"), "AAAb");
Assert.assertEquals(fakeJavaCodegen.toModelName("aBB"), "ABB");
Assert.assertEquals(fakeJavaCodegen.toModelName("AaBBa"), "AaBBa");
Assert.assertEquals(fakeJavaCodegen.toModelName("A_B"), "AB");
Assert.assertEquals(fakeJavaCodegen.toModelName("A-B"), "AB");
Assert.assertEquals(fakeJavaCodegen.toModelName("Aa_Bb"), "AaBb");
Assert.assertEquals(fakeJavaCodegen.toModelName("Aa-Bb"), "AaBb");
Assert.assertEquals(fakeJavaCodegen.toModelName("Aa_bb"), "AaBb");
Assert.assertEquals(fakeJavaCodegen.toModelName("Aa-bb"), "AaBb");
}

@Test
public void testInitialConfigValues() throws Exception {
Expand Down Expand Up @@ -168,7 +179,7 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception {
}

@Test
public void toEnumValue(){
public void toEnumValue() {
final AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
Assert.assertEquals(codegen.toEnumValue("1", "Integer"), "1");
Assert.assertEquals(codegen.toEnumValue("42", "Double"), "42");
Expand Down Expand Up @@ -218,7 +229,7 @@ public void apiDocFileFolder() {
codegen.setOutputDir("/User/open.api.tools");
Assert.assertEquals(codegen.apiDocFileFolder(), "/User/open.api.tools/docs/".replace('/', File.separatorChar));
}

@Test(description = "tests if API version specification is used if no version is provided in additional properties")
public void openApiversionTest() {
final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
Expand Down Expand Up @@ -315,6 +326,7 @@ public String getHelp() {
/**
* Gets artifact version.
* Only for testing purposes.
*
* @return version
*/
public String getArtifactVersion() {
Expand Down