CBL-7550 : Adding shutdown for CBL Java for non daemon thread (#436) (#445)

* CBL-7550 : Adding shutdown for CBL Java for non daemon thread

* Added space between shutdown function

* Not setting executor service to null

* Added awaitTermination for 5 sec

* Resolving Cmake and Spotbug issues

* Created a utility class for ExecutorService

(cherry picked from commit 2b72cfb)

Author: Aniket392

common/main/java/com/couchbase/lite/internal/exec/ExecutorUtils.java

@@ -0,0 +1,30 @@
+package com.couchbase.lite.internal.exec;
+
+import androidx.annotation.NonNull;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.couchbase.lite.LogDomain;
+import com.couchbase.lite.internal.logging.Log;
+
+public final class ExecutorUtils {
+    private ExecutorUtils() {}
+
+    public static void shutdownAndAwaitTermination(
+            @NonNull ExecutorService pool,
+            int timeoutSeconds,
+            @NonNull LogDomain logDomain) {
+        pool.shutdown();
+        try {
+            if (!pool.awaitTermination(timeoutSeconds, TimeUnit.SECONDS)) {
+                pool.shutdownNow();
+                Log.w(logDomain, "Executor did not terminate within timeout");
+            }
+        } catch (InterruptedException ie) {
+            pool.shutdownNow();
+            Thread.currentThread().interrupt();
+            Log.w(logDomain, "Executor shutdown interrupted", ie);
+        }
+    }
+}

common/main/java/com/couchbase/lite/internal/sockets/OkHttpSocket.java

@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -44,6 +45,7 @@
 import com.couchbase.lite.LogDomain;
 import com.couchbase.lite.internal.core.C4Constants;
 import com.couchbase.lite.internal.core.C4Replicator;
+import com.couchbase.lite.internal.exec.ExecutorUtils;
 import com.couchbase.lite.internal.logging.Log;
 import com.couchbase.lite.internal.utils.ClassUtils;
 import com.couchbase.lite.internal.utils.Fn;
@@ -72,6 +74,13 @@ private interface SocketFactory {
 
         .build();
 
+    public static void shutdownHttpClient() {
+        final ExecutorService dispatcher = BASE_HTTP_CLIENT.dispatcher().executorService();
+        ExecutorUtils.shutdownAndAwaitTermination(dispatcher, 5, LogDomain.NETWORK);
+        // Clean up connection pool
+        BASE_HTTP_CLIENT.connectionPool().evictAll();
+    }
+
     // A singleton WebSocket
     @NonNull
     private static final WebSocket NULL_WS = new WebSocket() {

java/main/java/com/couchbase/lite/internal/CouchbaseLiteInternal.java

@@ -35,9 +35,11 @@
 import com.couchbase.lite.internal.exec.ExecutionService;
 import com.couchbase.lite.internal.logging.Log;
 import com.couchbase.lite.internal.logging.LogSinksImpl;
+import com.couchbase.lite.internal.sockets.OkHttpSocket;
 import com.couchbase.lite.internal.utils.FileUtils;
 
 
+
 /**
  * Among the other things that this class attempts to abstract away, is access to the file system.
  * On both Android, and in a Web Container, file system access is pretty problematic.
@@ -161,4 +163,13 @@ private static void setC4TmpDirPath(@NonNull File scratchDir) {
         }
         catch (LiteCoreException e) { Log.w(LogDomain.DATABASE, "Failed to set c4TmpDir", e); }
     }
+
+    public static void shutdown() {
+        final ExecutionService executionService = EXECUTION_SERVICE.get();
+        if (executionService instanceof JavaExecutionService) {
+            ((JavaExecutionService) executionService).shutdown();
+        }
+
+        OkHttpSocket.shutdownHttpClient();
+    }
 }

java/main/java/com/couchbase/lite/internal/JavaExecutionService.java

@@ -19,6 +19,7 @@
 import androidx.annotation.VisibleForTesting;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -29,6 +30,7 @@
 import com.couchbase.lite.LogDomain;
 import com.couchbase.lite.internal.exec.AbstractExecutionService;
 import com.couchbase.lite.internal.exec.CBLExecutor;
+import com.couchbase.lite.internal.exec.ExecutorUtils;
 import com.couchbase.lite.internal.logging.Log;
 import com.couchbase.lite.internal.utils.Preconditions;
 
@@ -100,4 +102,15 @@ public Cancellable postDelayedOnExecutor(long delayMs, @NonNull Executor executo
         final Future<?> future = scheduler.schedule(delayedTask, delayMs, TimeUnit.MILLISECONDS);
         return new CancellableTask(future);
     }
+
+    public void shutdown() {
+        ExecutorUtils.shutdownAndAwaitTermination(
+                (ExecutorService) defaultExecutor, 5, LogDomain.DATABASE
+        );
+
+        if (scheduler != null) {
+            ExecutorUtils.shutdownAndAwaitTermination(scheduler, 5, LogDomain.DATABASE);
+        }
+        getConcurrentExecutor().stop(5, TimeUnit.SECONDS);
+    }
 }