Merge pull request #644 from com-pas/fix/openapi-content-field-missmatch

Fix Open API "content" field mismatch in javadoc

Author: noraeb

api/pom.xml

@@ -57,6 +57,7 @@ SPDX-License-Identifier: Apache-2.0
                             <inputSpec>${project.basedir}/plugins-custom-resources.yaml</inputSpec>
                             <generatorName>jaxrs-spec</generatorName>
                             <output>${project.basedir}</output>
+                            <templateDirectory>${project.basedir}/src/main/resources/templates</templateDirectory>
                             <generateSupportingFiles>false</generateSupportingFiles>
 
                             <configOptions>

api/src/main/java/org/lfenergy/compas/scl/data/rest/PluginsCustomResourcesApi.java

@@ -81,6 +81,6 @@ public interface PluginsCustomResourcesApi {
     @POST
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    UploadDataResponse uploadData(@FormParam(value = "type")  String type,@FormParam(value = "name")  String name,@FormParam(value = "content-type")  String contentType, @FormParam(value = "content") InputStream contentInputStream,@FormParam(value = "data-compatibility-version")  String dataCompatibilityVersion,@FormParam(value = "description")  String description,@FormParam(value = "version")  String version,@FormParam(value = "nextVersionType")  String nextVersionType);
+    UploadDataResponse uploadData(@FormParam(value = "type")  String type,@FormParam(value = "name")  String name,@FormParam(value = "content-type")  String contentType, @FormParam(value = "content") InputStream content,@FormParam(value = "data-compatibility-version")  String dataCompatibilityVersion,@FormParam(value = "description")  String description,@FormParam(value = "version")  String version,@FormParam(value = "nextVersionType")  String nextVersionType);
 
 }

api/src/main/resources/templates/formParams.mustache

@@ -0,0 +1 @@
+{{#isFormParam}}{{^isFile}}@FormParam(value = "{{baseName}}")  {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}{{/isFile}}{{/isFormParam}}

api/src/main/resources/templates/formParams.mustache.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2026 BearingPoint GmbH
+
+SPDX-License-Identifier: Apache-2.0

app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasPluginsResource.java

@@ -77,19 +77,19 @@ public DataEntryWithContent getDataById(UUID id) {
     public UploadDataResponse uploadData(String type,
                                              String name,
                                              String contentType,
-                                             InputStream contentInputStream,
+                                             InputStream content,
                                              String dataCompatibilityVersion,
                                              String description,
                                              String version,
                                              String nextVersionType) {
-        String content;
+        String contentText;
         try {
-            content = new String(contentInputStream.readAllBytes(), StandardCharsets.UTF_8);
+            contentText = new String(content.readAllBytes(), StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new CompasInvalidInputException("Failed to read content from upload");
         }
 
-        var entity = service.upload(new UploadCustomPluginsResourceData(type, name, contentType, content,
+        var entity = service.upload(new UploadCustomPluginsResourceData(type, name, contentType, contentText,
                 dataCompatibilityVersion, description, version, nextVersionType));
 
         var response = new UploadDataResponse();