Merge pull request #470 from blacklee123/main

refactor: @bean should not return void
SonicCloudOrg · Oct 12, 2024 · 5d0665a · 5d0665a
2 parents 5fa2d3e + 83aa608
commit 5d0665a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidDeviceThreadPool.java b/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidDeviceThreadPool.java
@@ -1,5 +1,6 @@
 package org.cloud.sonic.agent.bridge.android;
 
+import jakarta.annotation.PreDestroy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,7 +17,15 @@ public class AndroidDeviceThreadPool {
     public static ExecutorService cachedThreadPool;
 
     @Bean
-    public void androidThreadPoolInit() {
+    public ExecutorService androidThreadPoolInit() {
         cachedThreadPool = Executors.newCachedThreadPool();
+        return cachedThreadPool;
+    }
+
+    @PreDestroy
+    public void shutdownThreadPool() {
+        if (cachedThreadPool != null) {
+            cachedThreadPool.shutdown();
+        }
     }
 }
diff --git a/src/main/java/org/cloud/sonic/agent/bridge/ios/IOSDeviceThreadPool.java b/src/main/java/org/cloud/sonic/agent/bridge/ios/IOSDeviceThreadPool.java
@@ -1,11 +1,11 @@
 package org.cloud.sonic.agent.bridge.ios;
 
+import jakarta.annotation.PreDestroy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 /**
  * @author ZhouYiXun
  * @des 所有iOS相关线程都放这个线程池
@@ -16,7 +16,15 @@ public class IOSDeviceThreadPool {
     public static ExecutorService cachedThreadPool;
 
     @Bean
-    public void iOSThreadPoolInit() {
+    public ExecutorService iOSThreadPoolInit() {
         cachedThreadPool = Executors.newCachedThreadPool();
+        return cachedThreadPool;
+    }
+
+    @PreDestroy
+    public void shutdownThreadPool() {
+        if (cachedThreadPool != null) {
+            cachedThreadPool.shutdown();
+        }
     }
 }
diff --git a/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java b/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java
@@ -37,7 +37,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Bean;
+import jakarta.annotation.PostConstruct;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.Ordered;
@@ -83,7 +83,7 @@ public class SibTool implements ApplicationListener<ContextRefreshedEvent> {
     private RestTemplate restTemplateBean;
     private static Map<String, Integer> webViewMap = new HashMap<>();
 
-    @Bean
+    @PostConstruct
     public void setEnv() {
         bundleId = getBundleId;
         xcodeProjectPath = getXcodeProjectPath;