From 4bbcfa636b820861e19f074afe2bf50bb564336d Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 13 Apr 2023 11:29:06 -0400
Subject: [PATCH] fix(threads): back out #1388 Vertexecutor where not strictly
 required

Signed-off-by: Andrew Azores <aazores@redhat.com>
---
 .../cryostat/net/openshift/OpenShiftNetworkModule.java   | 3 +--
 src/main/java/io/cryostat/net/web/Vertexecutor.java      | 3 ++-
 .../platform/internal/PlatformStrategyModule.java        | 5 +----
 .../java/io/cryostat/recordings/RecordingsModule.java    | 4 ++--
 src/main/java/io/cryostat/sys/SystemModule.java          | 9 +++++++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java b/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java
index b6060f8c9b..f458a9939c 100644
--- a/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java
+++ b/src/main/java/io/cryostat/net/openshift/OpenShiftNetworkModule.java
@@ -50,7 +50,6 @@
 import io.cryostat.core.sys.Environment;
 import io.cryostat.core.sys.FileSystem;
 import io.cryostat.net.AuthManager;
-import io.cryostat.net.web.WebModule;
 import io.cryostat.util.resource.ClassPropertiesLoader;
 
 import com.github.benmanes.caffeine.cache.Scheduler;
@@ -123,7 +122,7 @@ static OpenShiftClient provideServiceAccountClient(
     @Singleton
     static OpenShiftAuthManager provideOpenShiftAuthManager(
             Environment env,
-            @Named(WebModule.VERTX_EXECUTOR) ExecutorService executor,
+            ExecutorService executor,
             @Named(OPENSHIFT_NAMESPACE) Lazy<String> namespace,
             Lazy<OpenShiftClient> serviceAccountClient,
             @Named(TOKENED_CLIENT) Function<String, OpenShiftClient> clientProvider,
diff --git a/src/main/java/io/cryostat/net/web/Vertexecutor.java b/src/main/java/io/cryostat/net/web/Vertexecutor.java
index 35cb0d07ca..6f4c48eb1f 100644
--- a/src/main/java/io/cryostat/net/web/Vertexecutor.java
+++ b/src/main/java/io/cryostat/net/web/Vertexecutor.java
@@ -1,4 +1,3 @@
-package io.cryostat.net.web;
 /*
  * Copyright The Cryostat Authors
  *
@@ -37,6 +36,8 @@
  * SOFTWARE.
  */
 
+package io.cryostat.net.web;
+
 import java.util.List;
 import java.util.concurrent.AbstractExecutorService;
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java b/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java
index 104e46f4d3..9792f47a6f 100644
--- a/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java
+++ b/src/main/java/io/cryostat/platform/internal/PlatformStrategyModule.java
@@ -40,8 +40,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
-import javax.inject.Named;
-
 import io.cryostat.core.log.Logger;
 import io.cryostat.core.net.JFRConnectionToolkit;
 import io.cryostat.core.net.discovery.JvmDiscoveryClient;
@@ -50,7 +48,6 @@
 import io.cryostat.net.NetworkResolver;
 import io.cryostat.net.NoopAuthManager;
 import io.cryostat.net.openshift.OpenShiftAuthManager;
-import io.cryostat.net.web.WebModule;
 
 import com.google.gson.Gson;
 import dagger.Lazy;
@@ -69,7 +66,7 @@ static Set<PlatformDetectionStrategy<?>> providePlatformDetectionStrategies(
             Lazy<OpenShiftAuthManager> openShiftAuthManager,
             Lazy<NoopAuthManager> noopAuthManager,
             Lazy<JFRConnectionToolkit> connectionToolkit,
-            @Named(WebModule.VERTX_EXECUTOR) ExecutorService executor,
+            ExecutorService executor,
             Vertx vertx,
             Gson gson,
             NetworkResolver resolver,
diff --git a/src/main/java/io/cryostat/recordings/RecordingsModule.java b/src/main/java/io/cryostat/recordings/RecordingsModule.java
index b35149208d..493ed1fd54 100644
--- a/src/main/java/io/cryostat/recordings/RecordingsModule.java
+++ b/src/main/java/io/cryostat/recordings/RecordingsModule.java
@@ -176,7 +176,7 @@ static RecordingMetadataManager provideRecordingMetadataManager(
             // CONFIGURATION_PATH
             @Named(ConfigurationModule.CONFIGURATION_PATH) Path confDir,
             @Named(MainModule.RECORDINGS_PATH) Path archivedRecordingsPath,
-            @Named(WebModule.VERTX_EXECUTOR) ExecutorService executor,
+            ExecutorService executor,
             @Named(Variables.JMX_CONNECTION_TIMEOUT) long connectionTimeoutSeconds,
             FileSystem fs,
             Provider<RecordingArchiveHelper> archiveHelperProvider,
@@ -223,7 +223,7 @@ static RecordingMetadataManager provideRecordingMetadataManager(
     @Singleton
     static JvmIdHelper provideJvmIdHelper(
             TargetConnectionManager targetConnectionManager,
-            @Named(WebModule.VERTX_EXECUTOR) ExecutorService executor,
+            ExecutorService executor,
             @Named(Variables.JMX_CONNECTION_TIMEOUT) long connectionTimeoutSeconds,
             CredentialsManager credentialsManager,
             DiscoveryStorage storage,
diff --git a/src/main/java/io/cryostat/sys/SystemModule.java b/src/main/java/io/cryostat/sys/SystemModule.java
index 212be19952..85472f3b64 100644
--- a/src/main/java/io/cryostat/sys/SystemModule.java
+++ b/src/main/java/io/cryostat/sys/SystemModule.java
@@ -37,6 +37,9 @@
  */
 package io.cryostat.sys;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
+
 import javax.inject.Singleton;
 
 import io.cryostat.core.sys.Clock;
@@ -65,4 +68,10 @@ static Environment provideEnvironment() {
     static FileSystem provideFileSystem() {
         return new FileSystem();
     }
+
+    @Provides
+    @Singleton
+    static ExecutorService provideExecutorService() {
+        return ForkJoinPool.commonPool();
+    }
 }