kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[FIX] correct API generation

Browse Source
This commit is contained in:
Edouard DUPIN 2024-05-24 00:23:11 +02:00
parent 9bad883866
commit 745b0cb39b
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/kar/archidata/externalRestApi/TsApiGeneration.java
View File

@ -348,11 +348,11 @@ public class TsApiGeneration {
data.append(", is"); data.append(", is");
data.append(returnModelNameIfComplex); data.append(returnModelNameIfComplex);
} else { } else {
final String returnType = generateClassModelsTypescript(interfaceElement.returnTypes, tsGroup, imports, final TsClassElement retType = tsGroup.find(interfaceElement.returnTypes.get(0));
false); if (retType.tsCheckType != null) {
if (!"void".equals(returnType)) { data.append(", ");
data.append(", is"); data.append(retType.tsCheckType);
data.append(returnType); imports.add(interfaceElement.returnTypes.get(0));
} }
} }
data.append(");"); data.append(");");
@ -393,7 +393,9 @@ public class TsApiGeneration {
if (tsModel.nativeType == DefinedPosition.NATIVE) { if (tsModel.nativeType == DefinedPosition.NATIVE) {
continue; continue;
} }
finalImportList.add("is" + tsModel.tsTypeName); if (tsModel.tsCheckType != null) {
finalImportList.add(tsModel.tsCheckType);
}
} }
for (final ClassModel model : zodImports) { for (final ClassModel model : zodImports) {
final TsClassElement tsModel = tsGroup.find(model); final TsClassElement tsModel = tsGroup.find(model);

5
src/org/kar/archidata/externalRestApi/TsGenerateApi.java
View File

@ -17,6 +17,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.glassfish.jersey.media.multipart.ContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.kar.archidata.catcher.RestErrorResponse; import org.kar.archidata.catcher.RestErrorResponse;
import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition; import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition;
import org.kar.archidata.externalRestApi.model.ApiGroupModel; import org.kar.archidata.externalRestApi.model.ApiGroupModel;
@ -128,7 +130,8 @@ public class TsGenerateApi {
tsModels.add( tsModels.add(
new TsClassElement(models, "zod.string()", "string", null, "zod.string()", DefinedPosition.NATIVE)); new TsClassElement(models, "zod.string()", "string", null, "zod.string()", DefinedPosition.NATIVE));
} }
models = api.getCompatibleModels(List.of(InputStream.class)); models = api.getCompatibleModels(
List.of(InputStream.class, FormDataContentDisposition.class, ContentDisposition.class));
if (models != null) { if (models != null) {
tsModels.add(new TsClassElement(models, "z.instanceof(File)", "File", null, "z.instanceof(File)", tsModels.add(new TsClassElement(models, "z.instanceof(File)", "File", null, "z.instanceof(File)",
DefinedPosition.NATIVE)); DefinedPosition.NATIVE));

12
src/org/kar/archidata/externalRestApi/model/ApiModel.java
View File

@ -147,11 +147,17 @@ public class ApiModel {
final String queryParam = ApiTool.apiAnnotationGetQueryParam(parameter); final String queryParam = ApiTool.apiAnnotationGetQueryParam(parameter);
final String formDataParam = ApiTool.apiAnnotationGetFormDataParam(parameter); final String formDataParam = ApiTool.apiAnnotationGetFormDataParam(parameter);
if (queryParam != null) { if (queryParam != null) {
this.queries.put(queryParam, parameterModel); if (!this.queries.containsKey(queryParam)) {
this.queries.put(queryParam, parameterModel);
}
} else if (pathParam != null) { } else if (pathParam != null) {
this.parameters.put(pathParam, parameterModel); if (!this.parameters.containsKey(pathParam)) {
this.parameters.put(pathParam, parameterModel);
}
} else if (formDataParam != null) { } else if (formDataParam != null) {
this.multiPartParameters.put(formDataParam, parameterModel); if (!this.multiPartParameters.containsKey(formDataParam)) {
this.multiPartParameters.put(formDataParam, parameterModel);
}
} else { } else {
this.unnamedElement.addAll(parameterModel); this.unnamedElement.addAll(parameterModel);
} }