Skip to content

Commit 04d77d6

Browse files
committed
#29, avoid getClass() method in interface
(cherry picked from commit e002007)
1 parent f8638a7 commit 04d77d6

File tree

6 files changed

+34
-7
lines changed

6 files changed

+34
-7
lines changed

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojo.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class DataTypeWriterPojo(
219219
result += ifDeprecated(propDataType)
220220

221221
result += """
222-
| public ${propDataType.getTypeName()} get${toAccessor(propertyName.capitalizeFirstChar())}() {
222+
| public ${propDataType.getTypeName()} get${toMethodTail(propertyName.capitalizeFirstChar())}() {
223223
| return ${toIdentifier(propertyName)};
224224
| }
225225
|
@@ -236,7 +236,7 @@ class DataTypeWriterPojo(
236236
val property = toIdentifier(propertyName)
237237

238238
result += """
239-
| public void set${toAccessor(propertyName.capitalizeFirstChar())}(${propDataType.getTypeName()} ${property}) {
239+
| public void set${toMethodTail(propertyName.capitalizeFirstChar())}(${propDataType.getTypeName()} ${property}) {
240240
| this.${property} = ${property};
241241
| }
242242
|

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/Identifier.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fun toIdentifier(src: String): String {
5858
* @param src the source property name without get/set prefix
5959
* @return a valid accessor name without get/set prefix
6060
*/
61-
fun toAccessor(src: String): String {
61+
fun toMethodTail(src: String): String {
6262
return when (src) {
6363
"Class" -> "AClass"
6464
else -> src

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/MethodWriter.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ open class MethodWriter(
8585
val tail = camel.subList(1, camel.count())
8686
.joinToString("") { it.capitalizeFirstChar() }
8787

88+
if(endpoint.parameters.isEmpty() || endpoint.requestBodies.isNotEmpty()) {
89+
return head + toMethodTail(tail)
90+
}
91+
8892
return head + tail
8993
}
9094

openapi-processor-core/src/testInt/resources/tests/keyword-identifier/generated/api/Api.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
@Generated(value = "openapi-processor-core", version = "test")
99
public interface Api {
1010

11-
@Mapping("/keywords")
12-
Class getKeywords(@Parameter Class aClass);
11+
@Mapping("/class")
12+
Class getAClass();
13+
14+
@Mapping("/class")
15+
Class postClass(@Parameter Class aClass);
1316

1417
}

openapi-processor-core/src/testInt/resources/tests/keyword-identifier/inputs/openapi30.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ info:
55

66
paths:
77

8-
/keywords:
8+
/class:
99
get:
10+
responses:
11+
'200':
12+
description: the foo result
13+
content:
14+
application/json:
15+
schema:
16+
$ref: '#/components/schemas/class'
17+
18+
post:
1019
parameters:
1120
- name: class
1221
description: parameter
@@ -21,6 +30,7 @@ paths:
2130
schema:
2231
$ref: '#/components/schemas/class'
2332

33+
2434
components:
2535
schemas:
2636

openapi-processor-core/src/testInt/resources/tests/keyword-identifier/inputs/openapi31.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ info:
55

66
paths:
77

8-
/keywords:
8+
/class:
99
get:
10+
responses:
11+
'200':
12+
description: the foo result
13+
content:
14+
application/json:
15+
schema:
16+
$ref: '#/components/schemas/class'
17+
18+
post:
1019
parameters:
1120
- name: class
1221
description: parameter
@@ -21,6 +30,7 @@ paths:
2130
schema:
2231
$ref: '#/components/schemas/class'
2332

33+
2434
components:
2535
schemas:
2636

0 commit comments

Comments
 (0)