diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtra.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtra.java deleted file mode 100644 index 695f2402..00000000 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtra.java +++ /dev/null @@ -1,57 +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 lombok.extern.slf4j.Slf4j; - -import java.util.Map; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.TimeUnit; - -/** - * thread pool adapter extra. - */ -@Slf4j -public class ThreadPoolAdapterExtra { - - private static final int BLOCKING_QUEUE_CAPACITY = 100; - - private BlockingQueue> blockingQueue; - - public ThreadPoolAdapterExtra() { - blockingQueue = new ArrayBlockingQueue(BLOCKING_QUEUE_CAPACITY); - } - - public void offerQueue(Map map) throws InterruptedException { - blockingQueue.offer(map, 5, TimeUnit.SECONDS); - } - - public void extraStart(ThreadPoolAdapterExtraHandle threadPoolAdapterExtraHandle) { - new Thread(() -> { - try { - for (;;) { - Map map = blockingQueue.take(); - threadPoolAdapterExtraHandle.execute(map); - } - } catch (InterruptedException e) { - log.error("extraStart error", e); - } - }, "threadPoolAdapterExtra").start(); - } -} diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtraAutoConfiguration.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtraAutoConfiguration.java deleted file mode 100644 index a856a52b..00000000 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterExtraAutoConfiguration.java +++ /dev/null @@ -1,34 +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 ThreadPoolAdapterExtraAutoConfiguration { - - @Bean - public ThreadPoolAdapterExtra threadPoolAdapterExtra() { - return new ThreadPoolAdapterExtra(); - } - -} diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterScheduler.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterScheduler.java index 2ce8a5d6..3f81dbff 100644 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterScheduler.java +++ b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterScheduler.java @@ -32,7 +32,6 @@ public class ThreadPoolAdapterScheduler { private final ScheduledExecutorService scheduler; - public ThreadPoolAdapterScheduler() { scheduler = new ScheduledThreadPoolExecutor(2, new ThreadFactoryBuilder() @@ -45,7 +44,7 @@ public class ThreadPoolAdapterScheduler { return scheduler; } - public int getTaskIntervalSeconds(){ + public int getTaskIntervalSeconds() { return TASK_INTERVAL_SECONDS; } } diff --git a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter.java index 2f2e2b1f..28b23e31 100644 --- a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter.java @@ -108,7 +108,7 @@ public class HystrixThreadPoolAdapter implements ThreadPoolAdapter, ApplicationL public void onApplicationEvent(ApplicationStartedEvent event) { ScheduledExecutorService scheduler = threadPoolAdapterScheduler.getScheduler(); int taskIntervalSeconds = threadPoolAdapterScheduler.getTaskIntervalSeconds(); - HystrixThreadPoolRefreshTask hystrixThreadPoolRefreshTask = new HystrixThreadPoolRefreshTask(scheduler,taskIntervalSeconds); + HystrixThreadPoolRefreshTask hystrixThreadPoolRefreshTask = new HystrixThreadPoolRefreshTask(scheduler, taskIntervalSeconds); scheduler.schedule(hystrixThreadPoolRefreshTask, taskIntervalSeconds, TimeUnit.SECONDS); } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java index eaf33f08..21798532 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java @@ -66,8 +66,6 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { private List cacheConfigList = Lists.newArrayList(); - - @Override public void run(ApplicationArguments args) throws Exception { @@ -77,7 +75,7 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { scheduler.schedule(threadPoolAdapterRegisterTask, threadPoolAdapterScheduler.getTaskIntervalSeconds(), TimeUnit.SECONDS); } - public List getThreadPoolAdapterCacheConfigs(){ + public List getThreadPoolAdapterCacheConfigs() { Map threadPoolAdapterMap = ApplicationContextHolder.getBeansOfType(ThreadPoolAdapter.class); List cacheConfigList = Lists.newArrayList(); threadPoolAdapterMap.forEach((key, val) -> { @@ -98,7 +96,7 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { return cacheConfigList; } - public void doRegister(List cacheConfigList){ + public void doRegister(List cacheConfigList) { if (CollectionUtil.isNotEmpty(cacheConfigList)) { try { Result result = httpAgent.httpPost(REGISTER_ADAPTER_PATH, cacheConfigList); @@ -116,13 +114,13 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { doRegister(threadPoolAdapterCacheConfigs); } - class ThreadPoolAdapterRegisterTask implements Runnable{ + class ThreadPoolAdapterRegisterTask implements Runnable { private ScheduledExecutorService scheduler; private int taskIntervalSeconds; - public ThreadPoolAdapterRegisterTask(ScheduledExecutorService scheduler, int taskIntervalSeconds){ + public ThreadPoolAdapterRegisterTask(ScheduledExecutorService scheduler, int taskIntervalSeconds) { this.scheduler = scheduler; this.taskIntervalSeconds = taskIntervalSeconds; } @@ -139,9 +137,9 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { if (registerFlag) { doRegister(cacheConfigList); } - }catch (Exception e){ - log.error("Register Task Error",e); - }finally { + } catch (Exception e) { + log.error("Register Task Error", e); + } finally { if (!scheduler.isShutdown()) { scheduler.schedule(this, taskIntervalSeconds, TimeUnit.MILLISECONDS); } @@ -150,7 +148,7 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { } private boolean compareThreadPoolAdapterCacheConfigs(List newThreadPoolAdapterCacheConfigs, - List oldThreadPoolAdapterCacheConfigs){ + List oldThreadPoolAdapterCacheConfigs) { boolean registerFlag = false; Map> newThreadPoolAdapterCacheConfigMap = @@ -168,7 +166,7 @@ public class ThreadPoolAdapterRegister implements ApplicationRunner { if (oldValue == null) { registerFlag = true; break; - }else { + } else { if (newValue.size() != oldValue.size()) { registerFlag = true; break;