Merge pull request #127 from gmunozfe/9.104.x-prod_4132

[9.104.x-prod][Fix apache#4132] Fixing Json Schema generation (apache#4133)

Author: fjtirado

quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java

@@ -46,28 +46,21 @@ public class JsonSchemaImpl extends SchemaImpl {
 
     private Map<String, Schema> defs;
 
-    private List<Schema.SchemaType> type;
-
     @JsonSetter("type")
     public void setType(JsonNode typeNode) {
+        List<Schema.SchemaType> types = new ArrayList<>();
         if (typeNode.isArray()) {
-            List<Schema.SchemaType> types = new ArrayList<>();
             for (JsonNode node : typeNode) {
-                types.add(Schema.SchemaType.valueOf(node.asText().toUpperCase()));
+                types.add(from(node));
             }
-            this.type = types;
         } else if (typeNode.isTextual()) {
-            this.type = new ArrayList<>();
-            this.type.add(Schema.SchemaType.valueOf(typeNode.asText().toUpperCase()));
+            types.add(from(typeNode));
         }
+        super.setType(types);
     }
 
-    public List<Schema.SchemaType> getType() {
-        return type;
-    }
-
-    public void setType(List<Schema.SchemaType> type) {
-        this.type = type;
+    private static SchemaType from(JsonNode node) {
+        return Schema.SchemaType.valueOf(node.asText().toUpperCase());
     }
 
     @JsonSetter("$defs")

quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java

@@ -134,26 +134,31 @@ private static String getSchemaName(String id, String suffix) {
         return id + suffix;
     }
 
+    private final static String PROCESS_PREFIX = "Process - ";
+
     private static void processOperation(Map<String, Schema> schemas, Operation operation) {
         if (operation != null) {
             List<String> tags = operation.getTags();
             if (tags != null) {
                 for (String tag : tags) {
-                    if (operation.getRequestBody() != null) {
-                        Schema schema = schemas.get(getSchemaName(tag, INPUT_SUFFIX));
-                        if (schema != null) {
-                            getMediaTypes(operation.getRequestBody().getContent()).stream().filter(OpenApiModelSchemaGenerator::isInput).forEach(mediaType -> mediaType.setSchema(schema));
+                    if (tag.startsWith(PROCESS_PREFIX)) {
+                        String processName = tag.substring(PROCESS_PREFIX.length());
+                        if (operation.getRequestBody() != null) {
+                            Schema schema = schemas.get(getSchemaName(processName, INPUT_SUFFIX));
+                            if (schema != null) {
+                                getMediaTypes(operation.getRequestBody().getContent()).stream().filter(OpenApiModelSchemaGenerator::isInput).forEach(mediaType -> mediaType.setSchema(schema));
+                            }
                         }
-                    }
-                    if (operation.getResponses() != null && operation.getResponses().getAPIResponses() != null) {
-                        Schema schema = schemas.get(getSchemaName(tag, OUTPUT_SUFFIX));
-                        if (schema != null) {
-                            for (APIResponse response : operation.getResponses().getAPIResponses().values()) {
-                                Content content = response.getContent();
-                                if (content == null) {
-                                    response.setContent(OASFactory.createContent().addMediaType("application/json", OASFactory.createMediaType().schema(schema)));
-                                } else {
-                                    getMediaTypes(content).stream().filter(OpenApiModelSchemaGenerator::isOutput).forEach(mediaType -> mediaType.setSchema(schema));
+                        if (operation.getResponses() != null && operation.getResponses().getAPIResponses() != null) {
+                            Schema schema = schemas.get(getSchemaName(processName, OUTPUT_SUFFIX));
+                            if (schema != null) {
+                                for (APIResponse response : operation.getResponses().getAPIResponses().values()) {
+                                    Content content = response.getContent();
+                                    if (content == null) {
+                                        response.setContent(OASFactory.createContent().addMediaType("application/json", OASFactory.createMediaType().schema(schema)));
+                                    } else {
+                                        getMediaTypes(content).stream().filter(OpenApiModelSchemaGenerator::isOutput).forEach(mediaType -> mediaType.setSchema(schema));
+                                    }
                                 }
                             }
                         }