Skip to content

Commit 673f2bc

Browse files
jminijmini
authored
Add CodegenProperty.nameInSnakeCase (#42)
1 parent f0234b8 commit 673f2bc

File tree

224 files changed

+1260
-1237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+1260
-1237
lines changed

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public class CodegenProperty implements Cloneable {
6868
public boolean isInherited;
6969
public String discriminatorValue;
7070
public String nameInCamelCase; // property name in camel case
71+
public String nameInSnakeCase; // property name in upper snake case
7172
// enum name based on the property name, usually use as a prefix (e.g. VAR_NAME) for enum name (e.g. VAR_NAME_VALUE1)
7273
public String enumName;
7374
public Integer maxItems;
@@ -344,6 +345,10 @@ public void setNameInCamelCase(String nameInCamelCase) {
344345
this.nameInCamelCase = nameInCamelCase;
345346
}
346347

348+
public String getNameInSnakeCase() {
349+
return nameInSnakeCase;
350+
}
351+
347352
public String getEnumName() {
348353
return enumName;
349354
}
@@ -456,6 +461,7 @@ public int hashCode()
456461
result = prime * result + Objects.hashCode(isInherited);
457462
result = prime * result + Objects.hashCode(discriminatorValue);
458463
result = prime * result + Objects.hashCode(nameInCamelCase);
464+
result = prime * result + Objects.hashCode(nameInSnakeCase);
459465
result = prime * result + Objects.hashCode(enumName);
460466
result = prime * result + ((maxItems == null) ? 0 : maxItems.hashCode());
461467
result = prime * result + ((minItems == null) ? 0 : minItems.hashCode());
@@ -642,6 +648,9 @@ public boolean equals(Object obj) {
642648
if (!Objects.equals(this.nameInCamelCase, other.nameInCamelCase)) {
643649
return false;
644650
}
651+
if (!Objects.equals(this.nameInSnakeCase, other.nameInSnakeCase)) {
652+
return false;
653+
}
645654
if (!Objects.equals(this.enumName, other.enumName)) {
646655
return false;
647656
}

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openapitools.codegen;
1919

2020
import com.fasterxml.jackson.core.JsonProcessingException;
21+
import com.google.common.base.CaseFormat;
2122
import com.samskivert.mustache.Mustache.Compiler;
2223

2324
import io.swagger.v3.core.util.Json;
@@ -1636,6 +1637,7 @@ public CodegenProperty fromProperty(String name, Schema p) {
16361637
property.name = toVarName(name);
16371638
property.baseName = name;
16381639
property.nameInCamelCase = camelize(property.name, false);
1640+
property.nameInSnakeCase = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, property.nameInCamelCase);
16391641
property.description = escapeText(p.getDescription());
16401642
property.unescapedDescription = p.getDescription();
16411643
property.title = p.getTitle();

‎modules/openapi-generator/src/main/resources/Java/pojo.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
5757
{{/isXmlAttribute}}
5858
{{/withXml}}
5959
{{#gson}}
60-
public static final String SERIALIZED_NAME_{{nameInCamelCase}} = "{{baseName}}";
61-
@SerializedName(SERIALIZED_NAME_{{nameInCamelCase}})
60+
public static final String SERIALIZED_NAME_{{nameInSnakeCase}} = "{{baseName}}";
61+
@SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
6262
{{/gson}}
6363
{{#isContainer}}
6464
private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ public void simpleModelTest() {
8686

8787
final CodegenProperty property1 = vars.get(0);
8888
Assert.assertEquals(property1.baseName, "id");
89+
Assert.assertEquals(property1.nameInCamelCase, "Id");
90+
Assert.assertEquals(property1.nameInSnakeCase, "ID");
8991
Assert.assertEquals(property1.getter, "getId");
9092
Assert.assertEquals(property1.setter, "setId");
9193
Assert.assertEquals(property1.datatype, "Long");
@@ -98,6 +100,8 @@ public void simpleModelTest() {
98100

99101
final CodegenProperty property2 = vars.get(1);
100102
Assert.assertEquals(property2.baseName, "name");
103+
Assert.assertEquals(property2.nameInCamelCase, "Name");
104+
Assert.assertEquals(property2.nameInSnakeCase, "NAME");
101105
Assert.assertEquals(property2.getter, "getName");
102106
Assert.assertEquals(property2.setter, "setName");
103107
Assert.assertEquals(property2.datatype, "String");
@@ -111,6 +115,8 @@ public void simpleModelTest() {
111115

112116
final CodegenProperty property3 = vars.get(2);
113117
Assert.assertEquals(property3.baseName, "createdAt");
118+
Assert.assertEquals(property3.nameInCamelCase, "CreatedAt");
119+
Assert.assertEquals(property3.nameInSnakeCase, "CREATED_AT");
114120
Assert.assertEquals(property3.getter, "getCreatedAt");
115121
Assert.assertEquals(property3.setter, "setCreatedAt");
116122
Assert.assertEquals(property3.datatype, "Date");
@@ -790,6 +796,8 @@ public void longPropertyTest() {
790796
final CodegenProperty cp = codegen.fromProperty("property", property);
791797

792798
Assert.assertEquals(cp.baseName, "property");
799+
Assert.assertEquals(cp.nameInCamelCase, "Property");
800+
Assert.assertEquals(cp.nameInSnakeCase, "PROPERTY");
793801
Assert.assertEquals(cp.datatype, "Long");
794802
Assert.assertEquals(cp.name, "property");
795803
Assert.assertEquals(cp.baseType, "Long");
@@ -813,13 +821,17 @@ public void integerPropertyInReferencedSchemaTest() {
813821

814822
CodegenProperty cp1 = cm.vars.get(0);
815823
Assert.assertEquals(cp1.baseName, "Integer1");
824+
Assert.assertEquals(cp1.nameInCamelCase, "Integer1");
825+
Assert.assertEquals(cp1.nameInSnakeCase, "INTEGER1");
816826
Assert.assertEquals(cp1.datatype, "Integer");
817827
Assert.assertEquals(cp1.name, "integer1");
818828
Assert.assertEquals(cp1.baseType, "Integer");
819829
Assert.assertEquals(cp1.getter, "getInteger1");
820830

821831
CodegenProperty cp2 = cm.vars.get(1);
822832
Assert.assertEquals(cp2.baseName, "Integer2");
833+
Assert.assertEquals(cp2.nameInCamelCase, "Integer2");
834+
Assert.assertEquals(cp2.nameInSnakeCase, "INTEGER2");
823835
Assert.assertEquals(cp2.datatype, "Integer");
824836
Assert.assertEquals(cp2.name, "integer2");
825837
Assert.assertEquals(cp2.baseType, "Integer");

‎samples/client/petstore/java/google-api-client/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

‎samples/client/petstore/java/jersey1/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

‎samples/client/petstore/java/jersey2-java6/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

‎samples/client/petstore/java/jersey2-java8/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

‎samples/client/petstore/java/jersey2/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

‎samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Name | Type | Description | Notes
406406
**enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
407407
**enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
408408
**enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
409-
**enumFormStringArray** | **List<String>**| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
409+
**enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $]
410410
**enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
411411

412412
### Return type

0 commit comments

Comments
 (0)