Added CompletableFuture support to TzevaAdomNotifier#listen

Author: DavidTheExplorer

src/main/java/dte/tzevaadomapi/notifier/TzevaAdomNotifier.java

@@ -8,6 +8,7 @@
 import java.util.LinkedList;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -44,24 +45,27 @@ public static Builder requestFromPikudHaoref()
 				.requestFrom(new PHOAlertSource());
 	}
 
-	public void listen() throws InterruptedException
+	public CompletableFuture<Void> listen()
 	{
-		//start with an initial alert - against which future alerts will be compared
-		Alert lastTzevaAdom = getMostRecentAlert();
-
-		while(true)
+		return CompletableFuture.runAsync(() -> 
 		{
-			Alert alert = getMostRecentAlert();
-			
-			//if the last alert in history doesn't equal to the last requested one - It's TZEVA ADOM
-			if(lastTzevaAdom.equals(alert)) 
-				continue;
-			
-			lastTzevaAdom = alert;
-			
-			this.listeners.forEach(listener -> listener.accept(alert));
-			this.history.add(alert);
-		}
+			//start with an initial alert - against which future alerts will be compared
+			Alert lastTzevaAdom = getMostRecentAlert();
+
+			while(true)
+			{
+				Alert alert = getMostRecentAlert();
+				
+				//if the last alert in history doesn't equal to the last requested one - It's TZEVA ADOM
+				if(lastTzevaAdom.equals(alert)) 
+					continue;
+				
+				lastTzevaAdom = alert;
+				
+				this.listeners.forEach(listener -> listener.accept(alert));
+				this.history.add(alert);
+			}
+		});
 	}
 
 	public void addListener(Consumer<Alert> tzevaAdomListener) 
@@ -85,14 +89,14 @@ public Iterator<Alert> iterator()
 		return this.history.iterator();
 	}
 
-	private Alert getMostRecentAlert() throws InterruptedException
+	private Alert getMostRecentAlert()
 	{
 		while(true)
 		{
-			TimeUnit.MILLISECONDS.sleep(this.requestDelay.toMillis());
-				
 			try
 			{
+				TimeUnit.MILLISECONDS.sleep(this.requestDelay.toMillis());
+				
 				return this.alertSource.getMostRecentAlert();
 			}
 			catch(Exception exception)
@@ -135,9 +139,9 @@ public Builder onTzevaAdom(Consumer<Alert> listener)
 			return this;
 		}
 
-		public void listen() throws InterruptedException
+		public CompletableFuture<Void> listen()
 		{
-			build().listen();
+			return build().listen();
 		}
 
 		public TzevaAdomNotifier build()

src/main/java/dte/tzevaadomapi/utils/UncheckedExceptions.java

@@ -1,12 +1,10 @@
 package dte.tzevaadomapi.notifier;
 
-import static dte.tzevaadomapi.utils.UncheckedExceptions.unchecked;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.concurrent.CompletableFuture;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -74,7 +72,7 @@ private TzevaAdomNotifier simulateNotifier(int alertsAmount) throws InterruptedE
 				.onFailedRequest(Exception::printStackTrace)
 				.build();
 
-		CompletableFuture.runAsync(unchecked(notifier::listen));
+		notifier.listen();
 
 		//because I'm ahla gever, every alert gets 10ms to be recorded
 		Thread.sleep(Duration.ofMillis(alertsAmount * 10).toMillis());