revert: ubuntu 24.04 failing to terminate schedulers during test

Author: petruki

.github/workflows/master-2.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build-scan:
     name: SonarCloud Scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/master.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build-scan:
     name: SonarCloud Scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8', '11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -39,7 +39,7 @@ jobs:
   publish:
     name: Publish Release
     needs: [build-test]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/sonar.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   sonar-analysis:
     name: SonarCloud Analysis for PR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Get PR details

src/main/java/com/switcherapi/client/SwitcherContextBase.java

@@ -461,18 +461,9 @@ public static void watchSnapshot(SnapshotEventHandler handler) {
 	 */
 	public static void stopWatchingSnapshot() {
 		if (Objects.nonNull(watcherSnapshot)) {
-			watcherExecutorService.shutdown();
-			try {
-				if (!watcherExecutorService.awaitTermination(5, TimeUnit.SECONDS)) {
-					watcherExecutorService.shutdownNow();
-				}
-			} catch (InterruptedException e) {
-				watcherExecutorService.shutdownNow();
-				Thread.currentThread().interrupt();
-			} finally {
-				watcherSnapshot.terminate();
-				watcherSnapshot = null;
-			}
+			watcherExecutorService.shutdownNow();
+			watcherSnapshot.terminate();
+			watcherSnapshot = null;
 		}
 	}
 

src/test/java/com/switcherapi/client/utils/SnapshotTest.java

@@ -7,7 +7,6 @@
 import com.switcherapi.client.service.WorkerName;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.switcherapi.fixture.CountDownHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,20 +74,4 @@ protected void assertWorker(boolean exists) {
 		assertEquals(exists, Thread.getAllStackTraces().keySet().stream()
 				.anyMatch(t -> t.getName().equals(WorkerName.SNAPSHOT_WATCH_WORKER.toString())));
 	}
-
-	protected void assertWorkerUntil(boolean exists, long seconds) {
-		long count = 0;
-		while (count < seconds) {
-			if (Thread.getAllStackTraces().keySet().stream()
-					.anyMatch(t -> t.getName().equals(WorkerName.SNAPSHOT_WATCH_WORKER.toString())) == exists) {
-				break;
-			}
-
-			CountDownHelper.wait(1);
-			count++;
-		}
-
-		assertEquals(exists, Thread.getAllStackTraces().keySet().stream()
-				.anyMatch(t -> t.getName().equals(WorkerName.SNAPSHOT_WATCH_WORKER.toString())));
-	}
 }

src/test/java/com/switcherapi/client/utils/SnapshotWatcherTest.java

@@ -4,7 +4,10 @@
 import com.switcherapi.client.ContextBuilder;
 import com.switcherapi.client.model.SwitcherRequest;
 import com.switcherapi.fixture.CountDownHelper;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
@@ -26,17 +29,17 @@ static void setupContext() throws IOException {
 
 		SwitchersBase.initializeClient();
 	}
+
+	@AfterAll
+	static void tearDown() {
+		SwitchersBase.stopWatchingSnapshot();
+	}
 
 	@BeforeEach
 	void prepareTest() {
 		generateFixture();
 		SwitchersBase.watchSnapshot();
 	}
-
-	@AfterEach
-	void cleanUp() {
-		SwitchersBase.stopWatchingSnapshot();
-	}
 
 	@Test
 	void shouldNotReloadDomainAfterChangingSnapshot() {

src/test/java/com/switcherapi/client/utils/SnapshotWatcherWorkerTest.java

@@ -2,7 +2,6 @@
 
 import com.switcherapi.SwitchersBase;
 import com.switcherapi.client.ContextBuilder;
-import com.switcherapi.client.service.WorkerName;
 import com.switcherapi.fixture.CountDownHelper;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -23,27 +22,12 @@ static void setupContext() {
 	@Test
 	void shouldStartAndKillWorker() {
 		SwitchersBase.watchSnapshot();
-		CountDownHelper.wait(1);
-		assertWorkerUntil(true, 2);
-
-		Thread.getAllStackTraces().keySet()
-				.forEach(t -> {
-					if (t.getName().equals(WorkerName.SNAPSHOT_WATCH_WORKER.toString())) {
-						System.out.println("Thread: " + t.getName() + " - Alive: " + t.isAlive());
-					}
-				});
+		assertWorker(true);
 
 		SwitchersBase.stopWatchingSnapshot();
 		CountDownHelper.wait(2);
 
-		Thread.getAllStackTraces().keySet()
-				.forEach(t -> {
-					if (t.getName().equals(WorkerName.SNAPSHOT_WATCH_WORKER.toString())) {
-						System.out.println("Thread: " + t.getName() + " - Alive: " + t.isAlive());
-					}
-				});
-
-		assertWorkerUntil(false, 10);
+		assertWorker(false);
 	}
 
 }