From c53e1b2d1ea7e468f66f8a804917c6bc3a47fdab Mon Sep 17 00:00:00 2001 From: iwangjie <345127857@qq.com> Date: Sun, 14 Aug 2022 12:45:37 +0800 Subject: [PATCH] review fix --- hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml | 2 +- .../dubbo/AlibabaDubboThreadPoolAdapter.java | 2 +- .../pom.xml | 2 +- .../dubbo/AlibabaDubboAdapterAutoConfiguration.java | 8 ++++---- .../src/main/resources/META-INF/spring.factories | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/{ => alibaba}/dubbo/AlibabaDubboThreadPoolAdapter.java (99%) rename hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/{ => alibaba}/dubbo/AlibabaDubboAdapterAutoConfiguration.java (85%) diff --git a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml index d9d659ff..709c2841 100644 --- a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml @@ -7,7 +7,7 @@ hippo4j-adapter ${revision} - hippo4j-adapter-dubbo-alibaba + hippo4j-adapter-alibaba-dubbo 1.4.0-SNAPSHOT diff --git a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/AlibabaDubboThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java similarity index 99% rename from hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/AlibabaDubboThreadPoolAdapter.java rename to hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java index 2cef6723..ca4f086d 100644 --- a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/AlibabaDubboThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.hippo4j.adapter.dubbo; +package cn.hippo4j.adapter.alibaba.dubbo; import cn.hippo4j.adapter.base.ThreadPoolAdapter; import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/pom.xml b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/pom.xml index b4a58c63..eaef414d 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/pom.xml +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/pom.xml @@ -13,7 +13,7 @@ cn.hippo4j - hippo4j-adapter-dubbo-alibaba + hippo4j-adapter-alibaba-dubbo ${revision} diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/AlibabaDubboAdapterAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java similarity index 85% rename from hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/AlibabaDubboAdapterAutoConfiguration.java rename to hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java index f3a0718d..acf8f3ac 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/AlibabaDubboAdapterAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.hippo4j.springboot.starter.adapter.dubbo; +package cn.hippo4j.springboot.starter.adapter.alibaba.dubbo; -import cn.hippo4j.adapter.dubbo.AlibabaDubboThreadPoolAdapter; +import cn.hippo4j.adapter.alibaba.dubbo.AlibabaDubboThreadPoolAdapter; import cn.hippo4j.common.config.ApplicationContextHolder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -32,14 +32,14 @@ public class AlibabaDubboAdapterAutoConfiguration { @Bean @ConditionalOnMissingBean - public ApplicationContextHolder simpleApplicationContextHolder() { + public ApplicationContextHolder simpleApplicationContextHolder () { return new ApplicationContextHolder(); } @Bean @SuppressWarnings("all") @ConditionalOnProperty(name = "dubbo.application.name") - public AlibabaDubboThreadPoolAdapter dubboThreadPoolAdapter(ApplicationContextHolder applicationContextHolder) { + public AlibabaDubboThreadPoolAdapter dubboThreadPoolAdapter (ApplicationContextHolder applicationContextHolder) { return new AlibabaDubboThreadPoolAdapter(); } } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/resources/META-INF/spring.factories b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/resources/META-INF/spring.factories index b5db5ad1..383891ec 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/resources/META-INF/spring.factories +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-alibaba-dubbo/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.adapter.dubbo.AlibabaDubboAdapterAutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.adapter.alibaba.dubbo.AlibabaDubboAdapterAutoConfiguration