[KOGITO-8614] Improving log message

apache · Aug 1, 2023 · 582f4b6 · 582f4b6
1 parent a045817
commit 582f4b6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 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, Exception> exceptions;
+    protected final Map<String, Throwable> exceptions;
 
-    protected ValidationDecorator(Map<String, Exception> exceptions) {
+    protected ValidationDecorator(Map<String, Throwable> 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,12 +24,12 @@ public class ValidationLogDecorator extends ValidationDecorator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ValidationLogDecorator.class);
 
-    public ValidationLogDecorator(Map<String, Exception> exceptions) {
+    public ValidationLogDecorator(Map<String, Throwable> exceptions) {
         super(exceptions);
     }
 
     @Override
     public void decorate() {
-        exceptions.forEach((processId, exception) -> LOGGER.error("Invalid process: '{}'", processId, exception));
+        exceptions.forEach((processId, exception) -> LOGGER.error("Invalid process: '{}'. Found error: {}", processId, exception));
     }
 }
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, Exception> processesErrors = new HashMap<>();
+        Map<String, Throwable> 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 | ProcessParsingException e) {
+                    } catch (ValidationException e) {
                         processesErrors.put(resource.getSourcePath(), e);
-                        return Stream.empty();
+                    } catch (ProcessParsingException e) {
+                        processesErrors.put(resource.getSourcePath(), e.getCause());
                     }
+                    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, Exception> processesErrors) {
+    private static void handleValidation(KogitoBuildContext context, Map<String, Throwable> processesErrors) {
         if (!processesErrors.isEmpty()) {
             ValidationLogDecorator decorator = new ValidationLogDecorator(processesErrors);
             decorator.decorate();
@@ -165,7 +165,7 @@ private static void handleValidation(KogitoBuildContext context, Map<String, Exc
         }
     }
 
-    private static GeneratedInfo<KogitoWorkflowProcess> validate(GeneratedInfo<KogitoWorkflowProcess> processInfo, Map<String, Exception> processesErrors) {
+    private static GeneratedInfo<KogitoWorkflowProcess> validate(GeneratedInfo<KogitoWorkflowProcess> processInfo, Map<String, Throwable> 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("Could not parse file " + r.getSourcePath(), e);
+            throw new ProcessParsingException(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("Could not parse file " + r.getSourcePath(), e);
+            throw new ProcessParsingException(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,12 +16,9 @@
 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);
-    }
 }