Restore behavior when no conditions are specified

neo4j-contrib · Mar 22, 2024 · a31ad76 · a31ad76
1 parent 2e0720d
commit a31ad76
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/main/java/org/neo4j/dataflow/LocalRunner.java b/src/main/java/org/neo4j/dataflow/LocalRunner.java
@@ -132,19 +132,23 @@ private static String executionId() {
     }
 
     private void waitUntilDone() {
-        Neo4jQueryCheck[] conditions = countQueryChecks.stream()
-                .map(check -> check.asRunnableCondition(neo4j))
-                .toList()
-                .toArray(new Neo4jQueryCheck[0]);
-        new PipelineOperator(launcher)
-                .waitForCondition(
-                        Config.builder()
-                                .setJobId(execution.jobId())
-                                .setProject(project)
-                                .setRegion(region)
-                                .setTimeoutAfter(maxTimeout).setCheckAfter(checkInterval)
-                                .build(),
-                        conditions);
+        Config config = Config.builder()
+                .setJobId(execution.jobId())
+                .setProject(project)
+                .setRegion(region)
+                .setTimeoutAfter(maxTimeout).setCheckAfter(checkInterval)
+                .build();
+        PipelineOperator operator = new PipelineOperator(launcher);
+        if (countQueryChecks.isEmpty()) {
+            operator.waitUntilDone(config);
+            return;
+        }
+        operator.waitForCondition(
+                config,
+                countQueryChecks.stream()
+                        .map(check -> check.asRunnableCondition(neo4j))
+                        .toList()
+                        .toArray(new Neo4jQueryCheck[0]));
     }
 
     private String gcsPath(String artifactId) {