Merge pull request #293 from shining-stars-lk/develop

The scheduled task configuration of the adaptation module is optimized

hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterScheduleAutoConfiguration.java

@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cn.hippo4j.adapter.base;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * thread pool adapter extra auto configuration.
- */
-@Configuration(proxyBeanMethods = false)
-public class ThreadPoolAdapterScheduleAutoConfiguration {
-
-    @Bean
-    public ThreadPoolAdapterScheduler threadPoolAdapterExtra() {
-        return new ThreadPoolAdapterScheduler();
-    }
-}

hippo4j-adapter/hippo4j-adapter-base/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.adapter.base.ThreadPoolAdapterScheduleAutoConfiguration

hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.adapter.base;
+package cn.hippo4j.adapter.hystrix;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;

hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-hystrix/src/main/java/cn/hippo4j/springboot/starter/adapter/hystrix/HystrixAdapterAutoConfiguration.java

@@ -17,9 +17,8 @@
 
 package cn.hippo4j.springboot.starter.adapter.hystrix;
 
-import cn.hippo4j.adapter.base.ThreadPoolAdapterScheduler;
-import cn.hippo4j.adapter.base.ThreadPoolAdapterScheduleAutoConfiguration;
 import cn.hippo4j.adapter.hystrix.HystrixThreadPoolAdapter;
+import cn.hippo4j.adapter.hystrix.ThreadPoolAdapterScheduler;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -33,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
  * @create: 2022-07-15
  **/
 @Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(ThreadPoolAdapterScheduleAutoConfiguration.class)
 public class HystrixAdapterAutoConfiguration {
 
     @Bean
@@ -42,6 +40,11 @@ public class HystrixAdapterAutoConfiguration {
         return new ApplicationContextHolder();
     }
 
+    @Bean
+    public ThreadPoolAdapterScheduler threadPoolAdapterScheduler() {
+        return new ThreadPoolAdapterScheduler();
+    }
+
     @Bean
     public HystrixThreadPoolAdapter hystrixThreadPoolAdapter(ThreadPoolAdapterScheduler threadPoolAdapterScheduler) {
         return new HystrixThreadPoolAdapter(threadPoolAdapterScheduler);

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java

@@ -18,7 +18,6 @@
 package cn.hippo4j.springboot.starter.config;
 
 import cn.hippo4j.adapter.base.ThreadPoolAdapterBeanContainer;
-import cn.hippo4j.adapter.base.ThreadPoolAdapterScheduler;
 import cn.hippo4j.common.api.ThreadDetailState;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.core.config.UtilAutoConfiguration;