Revert "[KOGITO-9614] Kogito changes for new asyncapi extension versi…

…on (apache#3147)" This reverts commit decf232.
fjtirado · Aug 3, 2023 · 8699087 · 8699087
1 parent bee53d4
commit 8699087
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 50 deletions.
diff --git a/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/validation/ValidationDecorator.java b/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/validation/ValidationDecorator.java
@@ -19,9 +19,9 @@
 
 public abstract class ValidationDecorator {
 
-    protected final Map<String, Throwable> exceptions;
+    protected final Map<String, Exception> exceptions;
 
-    protected ValidationDecorator(Map<String, Throwable> exceptions) {
+    protected ValidationDecorator(Map<String, Exception> exceptions) {
         this.exceptions = exceptions;
     }
 

diff --git a/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/validation/ValidationLogDecorator.java b/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/validation/ValidationLogDecorator.java
@@ -24,7 +24,7 @@ public class ValidationLogDecorator extends ValidationDecorator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ValidationLogDecorator.class);
 
-    public ValidationLogDecorator(Map<String, Throwable> exceptions) {
+    public ValidationLogDecorator(Map<String, Exception> exceptions) {
         super(exceptions);
     }
 

diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -30,7 +30,7 @@
     <version.net.thisptr.jackson-jq>1.0.0-preview.20220705</version.net.thisptr.jackson-jq>
     <version.io.quarkiverse.jackson-jq>1.1.0</version.io.quarkiverse.jackson-jq>
     <version.io.quarkiverse.openapi.generator>1.3.8</version.io.quarkiverse.openapi.generator>
-    <version.io.quarkiverse.asyncapi>0.0.5</version.io.quarkiverse.asyncapi>
+    <version.io.quarkiverse.asyncapi>0.0.3</version.io.quarkiverse.asyncapi>
     <version.io.quarkiverse.reactivemessaging.http>1.1.5</version.io.quarkiverse.reactivemessaging.http>
     <version.io.quarkiverse.embedded.postgresql>0.0.8</version.io.quarkiverse.embedded.postgresql>
     <version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>

diff --git a/...kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java b/...kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java
@@ -106,7 +106,7 @@ public class ProcessCodegen extends AbstractGenerator {
 
     public static ProcessCodegen ofCollectedResources(KogitoBuildContext context, Collection<CollectedResource> resources) {
         Map<String, byte[]> processSVGMap = new HashMap<>();
-        Map<String, Throwable> processesErrors = new HashMap<>();
+        Map<String, Exception> processesErrors = new HashMap<>();
         boolean useSvgAddon = context.getAddonsConfig().useProcessSVG();
         final List<GeneratedInfo<KogitoWorkflowProcess>> processes = resources.stream()
                 .map(CollectedResource::resource)
@@ -123,13 +123,13 @@ public static ProcessCodegen ofCollectedResources(KogitoBuildContext context, Co
                             GeneratedInfo<KogitoWorkflowProcess> generatedInfo = parseWorkflowFile(resource, WorkflowFormat.fromFileName(resource.getSourcePath()), context);
                             notifySourceFileCodegenBindListeners(context, resource, Collections.singletonList(generatedInfo.info()));
                             return Stream.of(addResource(generatedInfo, resource));
+                        } else {
+                            return Stream.empty();
                         }
-                    } catch (ValidationException e) {
+                    } catch (ValidationException | ProcessParsingException e) {
                         processesErrors.put(resource.getSourcePath(), e);
-                    } catch (ProcessParsingException e) {
-                        processesErrors.put(resource.getSourcePath(), e.getCause());
+                        return Stream.empty();
                     }
-                    return Stream.empty();
                 })
                 //Validate parsed processes
                 .map(processInfo -> validate(processInfo, processesErrors))
@@ -154,7 +154,7 @@ private static void notifySourceFileCodegenBindListeners(KogitoBuildContext cont
                 .ifPresent(notifier -> processes.forEach(p -> notifier.notify(new SourceFileCodegenBindEvent(p.getId(), resource.getSourcePath()))));
     }
 
-    private static void handleValidation(KogitoBuildContext context, Map<String, Throwable> processesErrors) {
+    private static void handleValidation(KogitoBuildContext context, Map<String, Exception> processesErrors) {
         if (!processesErrors.isEmpty()) {
             ValidationLogDecorator decorator = new ValidationLogDecorator(processesErrors);
             decorator.decorate();
@@ -165,7 +165,7 @@ private static void handleValidation(KogitoBuildContext context, Map<String, Thr
         }
     }
 
-    private static GeneratedInfo<KogitoWorkflowProcess> validate(GeneratedInfo<KogitoWorkflowProcess> processInfo, Map<String, Throwable> processesErrors) {
+    private static GeneratedInfo<KogitoWorkflowProcess> validate(GeneratedInfo<KogitoWorkflowProcess> processInfo, Map<String, Exception> processesErrors) {
         Process process = processInfo.info();
         try {
             ProcessValidatorRegistry.getInstance().getValidator(process, process.getResource()).validate(process);
@@ -216,7 +216,7 @@ protected static GeneratedInfo<KogitoWorkflowProcess> parseWorkflowFile(Resource
         try (Reader reader = r.getReader()) {
             return ServerlessWorkflowParser.of(reader, format, context).getProcessInfo();
         } catch (IOException | RuntimeException e) {
-            throw new ProcessParsingException(e);
+            throw new ProcessParsingException("Could not parse file " + r.getSourcePath(), e);
         }
     }
 
@@ -227,7 +227,7 @@ protected static Collection<Process> parseProcessFile(Resource r) {
                     Thread.currentThread().getContextClassLoader());
             return xmlReader.read(reader);
         } catch (SAXException | IOException e) {
-            throw new ProcessParsingException(e);
+            throw new ProcessParsingException("Could not parse file " + r.getSourcePath(), e);
         }
     }
 

diff --git a/...degen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessParsingException.java b/...degen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessParsingException.java
@@ -16,9 +16,12 @@
 package org.kie.kogito.codegen.process;
 
 public class ProcessParsingException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
 
     public ProcessParsingException(Throwable cause) {
         super(cause);
     }
+
+    public ProcessParsingException(String s, Throwable e) {
+        super(s, e);
+    }
 }
diff --git a/...oyment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/WorkflowCodeGenUtils.java b/...oyment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/WorkflowCodeGenUtils.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
@@ -27,6 +28,7 @@
 
 import org.drools.codegen.common.GeneratedFile;
 import org.drools.codegen.common.GeneratedFileType;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.codegen.api.context.KogitoBuildContext;
 import org.kie.kogito.internal.SupportedExtensions;
 import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory;
@@ -40,9 +42,12 @@
 
 import com.github.javaparser.ast.CompilationUnit;
 
+import io.quarkus.deployment.CodeGenContext;
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.functions.FunctionDefinition;
 
+import static org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils.FAIL_ON_ERROR_PROPERTY;
+
 public class WorkflowCodeGenUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(WorkflowCodeGenUtils.class);
@@ -51,8 +56,12 @@ public class WorkflowCodeGenUtils {
     private WorkflowCodeGenUtils() {
     }
 
-    public static Stream<WorkflowOperationResource> operationResources(Stream<Path> files, Predicate<FunctionDefinition> predicate, Optional<String> operationIdProp) {
-        return getWorkflows(files).flatMap(w -> processFunction(w, predicate, WorkflowOperationIdFactoryProvider.getFactory(operationIdProp)));
+    private static WorkflowOperationIdFactory operationIdFactory(CodeGenContext context) {
+        return WorkflowOperationIdFactoryProvider.getFactory(context.config().getOptionalValue(WorkflowOperationIdFactoryProvider.PROPERTY_NAME, String.class));
+    }
+
+    public static Stream<WorkflowOperationResource> operationResources(Stream<Path> files, Predicate<FunctionDefinition> predicate, CodeGenContext context) {
+        return getWorkflows(files).flatMap(w -> processFunction(w, predicate, operationIdFactory(context)));
     }
 
     public static Stream<Workflow> getWorkflows(Stream<Path> files) {
@@ -87,16 +96,20 @@ private static WorkflowOperationResource getResource(Workflow workflow, Function
     }
 
     private static Optional<Workflow> getWorkflow(Path path) {
-        if (SupportedExtensions.getSWFExtensions().stream().anyMatch(ext -> path.toString().endsWith(ext))) {
-            return workflowCache.computeIfAbsent(path, p -> {
-                try (Reader r = Files.newBufferedReader(p)) {
-                    return Optional.of(ServerlessWorkflowUtils.getWorkflow(r, WorkflowFormat.fromFileName(p.getFileName())));
-                } catch (IOException ex) {
-                    logger.info("Error reading workflow file {}. Ignoring exception {}", p, ex);
-                    return Optional.<Workflow> empty();
-                }
-            });
-        }
-        return Optional.empty();
+        return workflowCache.computeIfAbsent(path, p -> SupportedExtensions.getSWFExtensions()
+                .stream()
+                .filter(e -> p.getFileName().toString().endsWith(e))
+                .map(e -> {
+                    try (Reader r = Files.newBufferedReader(p)) {
+                        return Optional.of(ServerlessWorkflowUtils.getWorkflow(r, WorkflowFormat.fromFileName(p.getFileName())));
+                    } catch (IOException ex) {
+                        if (ConfigProvider.getConfig().getOptionalValue(FAIL_ON_ERROR_PROPERTY, Boolean.class).orElse(true)) {
+                            throw new UncheckedIOException(ex);
+                        } else {
+                            logger.error("Error reading workflow file {}", p, ex);
+                            return Optional.<Workflow> empty();
+                        }
+                    }
+                }).flatMap(Optional::stream).findFirst());
     }
 }
diff --git a/...asyncapi/AsyncAPIInputStreamSupplier.java → ...ow/asyncapi/AsyncInputStreamSupplier.java b/...asyncapi/AsyncAPIInputStreamSupplier.java → ...ow/asyncapi/AsyncInputStreamSupplier.java
@@ -19,13 +19,13 @@
 
 import org.kie.kogito.quarkus.serverless.workflow.WorkflowOperationResource;
 
-import io.quarkiverse.asyncapi.config.InputStreamSupplier;
+import io.quarkiverse.asyncapi.generator.input.InputStreamSupplier;
 
-class AsyncAPIInputStreamSupplier implements InputStreamSupplier {
+class AsyncInputStreamSupplier implements InputStreamSupplier {
 
     private final WorkflowOperationResource resource;
 
-    public AsyncAPIInputStreamSupplier(WorkflowOperationResource resource) {
+    public AsyncInputStreamSupplier(WorkflowOperationResource resource) {
         this.resource = resource;
     }
 

diff --git a/...pi/WorkflowAsyncAPISpecInputProvider.java → ...pi/WorkflowAsyncApiSpecInputProvider.java b/...pi/WorkflowAsyncAPISpecInputProvider.java → ...pi/WorkflowAsyncApiSpecInputProvider.java
@@ -18,27 +18,31 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.kie.kogito.quarkus.serverless.workflow.WorkflowCodeGenUtils;
-import org.kie.kogito.serverless.workflow.operationid.WorkflowOperationIdFactoryProvider;
 
-import io.quarkiverse.asyncapi.config.AsyncAPISpecInput;
-import io.quarkiverse.asyncapi.config.AsyncAPISpecInputProvider;
+import io.quarkiverse.asyncapi.generator.input.AsyncAPISpecInput;
+import io.quarkiverse.asyncapi.generator.input.AsyncApiSpecInputProvider;
+import io.quarkus.deployment.CodeGenContext;
 import io.serverlessworkflow.api.functions.FunctionDefinition.Type;
-import io.smallrye.config.ConfigSourceContext;
 
-public class WorkflowAsyncAPISpecInputProvider implements AsyncAPISpecInputProvider {
+public class WorkflowAsyncApiSpecInputProvider implements AsyncApiSpecInputProvider {
+
+    private static final String KOGITO_PACKAGE_PREFIX = "org.kie.kogito.asyncAPI";
 
     @Override
-    public AsyncAPISpecInput read(ConfigSourceContext context) throws IOException {
-        try (Stream<Path> workflowFiles = Files.walk(Path.of(System.getProperty("user.dir")))) {
-            return new AsyncAPISpecInput(WorkflowCodeGenUtils
-                    .operationResources(workflowFiles, f -> f.getType() == Type.ASYNCAPI,
-                            Optional.ofNullable(context.getValue(WorkflowOperationIdFactoryProvider.PROPERTY_NAME).getValue()))
-                    .collect(Collectors.toMap(resource -> resource.getOperationId().getFileName(), AsyncAPIInputStreamSupplier::new, (key1, key2) -> key1)));
+    public AsyncAPISpecInput read(CodeGenContext context) {
+        Path inputDir = context.inputDir();
+        while (!Files.exists(inputDir)) {
+            inputDir = inputDir.getParent();
+        }
+        try (Stream<Path> workflowFiles = Files.walk(inputDir)) {
+            return new AsyncAPISpecInput(WorkflowCodeGenUtils.operationResources(workflowFiles, f -> f.getType() == Type.ASYNCAPI, context)
+                    .collect(Collectors.toMap(resource -> resource.getOperationId().getFileName(), AsyncInputStreamSupplier::new, (key1, key2) -> key1)), KOGITO_PACKAGE_PREFIX);
+        } catch (IOException io) {
+            throw new IllegalStateException(io);
         }
     }
 }
diff --git a/...rverless/workflow/deployment/livereload/LiveReloadableAsyncApiGeneratorStreamCodeGen.java b/...rverless/workflow/deployment/livereload/LiveReloadableAsyncApiGeneratorStreamCodeGen.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.kie.kogito.quarkus.serverless.workflow.deployment.livereload;
+
+import io.quarkiverse.asyncapi.generator.input.AsyncApiGeneratorStreamCodeGen;
+
+/**
+ * Wrapper for {@link AsyncApiGeneratorStreamCodeGen} that implements the {@link LiveReloadableCodeGenProvider} Service Provider Interface.
+ */
+public class LiveReloadableAsyncApiGeneratorStreamCodeGen extends LiveReloadableCodeGenProviderBase<AsyncApiGeneratorStreamCodeGen> {
+
+    public LiveReloadableAsyncApiGeneratorStreamCodeGen() {
+        super(new AsyncApiGeneratorStreamCodeGen());
+    }
+}
diff --git a/.../org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiSpecInputProvider.java b/.../org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiSpecInputProvider.java
@@ -24,7 +24,6 @@
 
 import org.kie.kogito.quarkus.serverless.workflow.WorkflowCodeGenUtils;
 import org.kie.kogito.quarkus.serverless.workflow.WorkflowOperationResource;
-import org.kie.kogito.serverless.workflow.operationid.WorkflowOperationIdFactoryProvider;
 import org.kie.kogito.serverless.workflow.utils.OpenAPIWorkflowUtils;
 
 import io.quarkiverse.openapi.generator.deployment.codegen.OpenApiSpecInputProvider;
@@ -42,9 +41,7 @@ public List<SpecInputModel> read(CodeGenContext context) {
             inputDir = inputDir.getParent();
         }
         try (Stream<Path> openApiFilesPaths = Files.walk(inputDir)) {
-            return WorkflowCodeGenUtils
-                    .operationResources(openApiFilesPaths, OpenAPIWorkflowUtils::isOpenApiOperation, context.config().getOptionalValue(WorkflowOperationIdFactoryProvider.PROPERTY_NAME, String.class))
-                    .map(this::getSpecInput).collect(Collectors.toList());
+            return WorkflowCodeGenUtils.operationResources(openApiFilesPaths, OpenAPIWorkflowUtils::isOpenApiOperation, context).map(this::getSpecInput).collect(Collectors.toList());
         } catch (IOException io) {
             throw new IllegalStateException(io);
         }

diff --git a/.../main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCCodeGenProvider.java b/.../main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCCodeGenProvider.java
@@ -31,7 +31,6 @@
 import org.kie.kogito.serverless.workflow.io.FileContentLoader;
 import org.kie.kogito.serverless.workflow.io.URIContentLoader;
 import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory;
-import org.kie.kogito.serverless.workflow.operationid.WorkflowOperationIdFactoryProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,8 +65,7 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
             Path outputPath = context.workDir().resolve("proto_temp");
             Files.createDirectories(outputPath);
             Collection<Path> protoFiles =
-                    WorkflowCodeGenUtils.operationResources(rpcFilePaths, this::isRPC, context.config().getOptionalValue(WorkflowOperationIdFactoryProvider.PROPERTY_NAME, String.class))
-                            .map(r -> getPath(r, outputPath)).filter(Optional::isPresent).map(Optional::get)
+                    WorkflowCodeGenUtils.operationResources(rpcFilePaths, this::isRPC, context).map(r -> getPath(r, outputPath)).filter(Optional::isPresent).map(Optional::get)
                             .collect(Collectors.toList());
             logger.debug("Collected proto paths are {}", protoFiles);
             if (protoFiles.isEmpty()) {

diff --git a/...asyncapi.config.AsyncAPISpecInputProvider → ...generator.input.AsyncApiSpecInputProvider b/...asyncapi.config.AsyncAPISpecInputProvider → ...generator.input.AsyncApiSpecInputProvider
@@ -1 +1 @@
-org.kie.kogito.quarkus.serverless.workflow.asyncapi.WorkflowAsyncAPISpecInputProvider
+org.kie.kogito.quarkus.serverless.workflow.asyncapi.WorkflowAsyncApiSpecInputProvider
diff --git a/...ie.kogito.quarkus.serverless.workflow.deployment.livereload.LiveReloadableCodeGenProvider b/...ie.kogito.quarkus.serverless.workflow.deployment.livereload.LiveReloadableCodeGenProvider
@@ -1,2 +1,3 @@
+org.kie.kogito.quarkus.serverless.workflow.deployment.livereload.LiveReloadableAsyncApiGeneratorStreamCodeGen
 org.kie.kogito.quarkus.serverless.workflow.deployment.livereload.LiveReloadableOpenApiGeneratorStreamCodeGen
 org.kie.kogito.quarkus.serverless.workflow.deployment.livereload.LiveReloadableWorkflowRPCCodeGenProvider
diff --git a/...-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml b/...-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
@@ -43,15 +43,25 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
+            <version>${version.io.grpc}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
+            <version>${version.io.grpc}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
+            <version>${version.io.grpc}</version>
+        </dependency>
+        <dependency>
+            <!-- necessary for Java 9+ -->
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>annotations-api</artifactId>
+            <version>6.0.53</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/...kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java b/...kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java
@@ -28,6 +28,7 @@
 
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.kie.kogito.test.utils.SocketUtils;
@@ -162,6 +163,7 @@ void testGrpc() throws InterruptedException, IOException {
     }
 
     @Test
+    @Disabled("Disabled until https://issues.redhat.com/browse/KOGITO-9614 is resolved")
     void testAsyncApi() throws IOException {
         given()
                 .contentType(ContentType.JSON)