Issue #139: Add a sleep input to executeForEachEntryOf

Correction after PR review
sentrysoftware · Mar 29, 2024 · c00718c · c00718c
1 parent 206c124
commit c00718c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...va/org/sentrysoftware/metricshub/engine/connector/model/common/ExecuteForEachEntryOf.java b/...va/org/sentrysoftware/metricshub/engine/connector/model/common/ExecuteForEachEntryOf.java
@@ -38,6 +38,7 @@
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import org.sentrysoftware.metricshub.engine.connector.deserializer.custom.NonBlankDeserializer;
+import org.sentrysoftware.metricshub.engine.connector.deserializer.custom.PositiveIntegerDeserializer;
 
 /**
  * Represents a configuration for executing an operation for each entry of a specified source.
@@ -65,6 +66,7 @@ public class ExecuteForEachEntryOf implements Serializable {
 	/**
 	 * The sleep integer in ms.
 	 */
+	@JsonDeserialize(using = PositiveIntegerDeserializer.class)
 	@JsonSetter(nulls = SKIP)
 	private Integer sleep;
 
@@ -84,7 +86,7 @@ public ExecuteForEachEntryOf(
 	) {
 		this.source = source;
 		this.concatMethod = concatMethod == null ? EntryConcatMethod.LIST : concatMethod;
-		this.sleep = sleep == null ? 0 : sleep;
+		this.sleep = sleep;
 	}
 
 	/**

diff --git a/...ain/java/org/sentrysoftware/metricshub/engine/strategy/source/SourceUpdaterProcessor.java b/...ain/java/org/sentrysoftware/metricshub/engine/strategy/source/SourceUpdaterProcessor.java
@@ -507,11 +507,14 @@ private SourceTable processExecuteForEachEntryOf(final Source source, final Stri
 			copy.update(value -> replaceSourceReference(value, copy));
 
 			concatEntryResult(source, result, row, copy.accept(sourceProcessor));
-			if (sleep != null && sleep > 0) {
+			if (sleep != null && sleep != 0) {
 				try {
 					Thread.sleep(sleep);
 				} catch (InterruptedException e) {
-					log.error("threadSleep", "Thread interrupted during sleep between two requests.");
+					log.error(
+						"Hostname {} - Thread interrupted during sleep between two 'execute for each entry' requests.",
+						hostname
+					);
 					Thread.currentThread().interrupt();
 				}
 			}

diff --git a/...java/org/sentrysoftware/metricshub/engine/strategy/source/SourceUpdaterProcessorTest.java b/...java/org/sentrysoftware/metricshub/engine/strategy/source/SourceUpdaterProcessorTest.java
@@ -243,7 +243,7 @@ void testProcessHTTPSourceExecuteForEachEntrySleep() {
 			ExecuteForEachEntryOf.builder().source(ENCLOSURE_COLLECT_SOURCE_1).concatMethod(EntryConcatMethod.LIST).build()
 		);
 
-		assertEquals(0, httpSource.getSleepExecuteForEachEntryOf());
+		assertEquals(null, httpSource.getSleepExecuteForEachEntryOf());
 
 		httpSource.setExecuteForEachEntryOf(
 			ExecuteForEachEntryOf