loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-10-14 16:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(kotlin): set isVoid to true for Unit datatypes (#21940)

Browse Source
This commit is contained in:
Knut Erik Langdahl 2025-09-11 14:17:05 +02:00 committed by GitHub
parent 5f647b8477
commit d523903827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
View File

@ -1119,6 +1119,8 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
} }
protected interface DataTypeAssigner { protected interface DataTypeAssigner {
void setIsVoid(Boolean isVoid);
void setReturnType(String returnType); void setReturnType(String returnType);
void setReturnContainer(String returnContainer); void setReturnContainer(String returnContainer);
@ -1131,6 +1133,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
protected void doDataTypeAssignment(final String returnType, DataTypeAssigner dataTypeAssigner) { protected void doDataTypeAssignment(final String returnType, DataTypeAssigner dataTypeAssigner) {
if (returnType == null) { if (returnType == null) {
dataTypeAssigner.setReturnType("Unit"); dataTypeAssigner.setReturnType("Unit");
dataTypeAssigner.setIsVoid(true);
} else if (returnType.startsWith("kotlin.collections.List")) { } else if (returnType.startsWith("kotlin.collections.List")) {
int end = returnType.lastIndexOf(">"); int end = returnType.lastIndexOf(">");
if (end > 0) { if (end > 0) {

9
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
View File

@ -418,6 +418,11 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
} }
doDataTypeAssignment(resp.dataType, new DataTypeAssigner() { doDataTypeAssignment(resp.dataType, new DataTypeAssigner() {
@Override
public void setIsVoid(Boolean isVoid) {
resp.isVoid = isVoid;
}
@Override @Override
public void setReturnType(final String returnType) { public void setReturnType(final String returnType) {
resp.dataType = returnType; resp.dataType = returnType;
@ -432,6 +437,10 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
} }
doDataTypeAssignment(operation.returnType, new DataTypeAssigner() { doDataTypeAssignment(operation.returnType, new DataTypeAssigner() {
@Override
public void setIsVoid(Boolean isVoid) {
operation.isVoid = isVoid;
}
@Override @Override
public void setReturnType(final String returnType) { public void setReturnType(final String returnType) {

9
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
View File

@ -880,6 +880,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
resp.baseType = getNonMutableContainerTypeIfNeeded(resp.baseType); resp.baseType = getNonMutableContainerTypeIfNeeded(resp.baseType);
doDataTypeAssignment(resp.dataType, new DataTypeAssigner() { doDataTypeAssignment(resp.dataType, new DataTypeAssigner() {
@Override
public void setIsVoid(Boolean isVoid) {
resp.isVoid = isVoid;
}
@Override @Override
public void setReturnType(final String returnType) { public void setReturnType(final String returnType) {
resp.dataType = returnType; resp.dataType = returnType;
@ -904,6 +909,10 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
} }
doDataTypeAssignment(operation.returnType, new DataTypeAssigner() { doDataTypeAssignment(operation.returnType, new DataTypeAssigner() {
@Override
public void setIsVoid(Boolean isVoid) {
operation.isVoid = isVoid;
}
@Override @Override
public void setReturnType(final String returnType) { public void setReturnType(final String returnType) {