Apply suggestions from Javi's code review

Co-authored-by: Francisco Javier Tirado Sarti <[email protected]>
serverlessworkflow · May 28, 2024 · cbb8ab0 · cbb8ab0
1 parent 500c31b
commit cbb8ab0
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java b/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java
@@ -362,11 +362,7 @@ public WorkflowValidator reset() {
   private boolean isMissingFunctionDefinition(
       String functionName, List<FunctionDefinition> functions) {
     if (functions != null) {
-      return functions.stream()
-              .filter(f -> f.getName().equals(functionName))
-              .findFirst()
-              .orElse(null)
-          == null;
+      return !functions.stream().anyMatch(f -> f.getName().equals(functionName));
     } else {
       return true;
     }
@@ -377,23 +373,15 @@ private boolean isMissingEventsDefinition(String eventName, List<EventDefinition
       return false;
     }
     if (events != null) {
-      return events.stream().filter(e -> e.getName().equals(eventName)).findFirst().orElse(null)
-          == null;
+      return !events.stream().anyMatch(e -> e.getName().equals(eventName));
     } else {
       return true;
     }
   }
 
   private boolean isMissingRetryDefinition(String retryName, List<RetryDefinition> retries) {
-    if (retries != null) {
-      return retries.stream()
-              .filter(f -> f.getName() != null && f.getName().equals(retryName))
-              .findFirst()
-              .orElse(null)
-          == null;
-    } else {
-      return true;
-    }
+    return retries == null || ! retries.stream()
+              .anyMatch(f -> f.getName() != null && f.getName().equals(retryName));
   }
 
   private static final Set<String> skipMessages =