hippo4j-config rename core to config (opengoofy#627)

* feat: hippo4j-config rename core to config * feat: hippo4j-config-example rename core to config * feat: hippo4j-config-example rename core to config
jianlai5 · Sep 1, 2022 · b2f45a9 · b2f45a9
1 parent 6309358
commit b2f45a9
Show file tree

Hide file tree

Showing 39 changed files with 222 additions and 209 deletions.
diff --git a/...pollo/ConfigApolloExampleApplication.java → ...pollo/ConfigApolloExampleApplication.java b/...pollo/ConfigApolloExampleApplication.java → ...pollo/ConfigApolloExampleApplication.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.example.core.apollo;
+package cn.hippo4j.example.config.apollo;
 
 import cn.hippo4j.core.enable.EnableDynamicThreadPool;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableDynamicThreadPool
-@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core")
+@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config")
 public class ConfigApolloExampleApplication {
 
     public static void main(String[] args) {

diff --git a/.../nacos/ConfigNacosExampleApplication.java → .../nacos/ConfigNacosExampleApplication.java b/.../nacos/ConfigNacosExampleApplication.java → .../nacos/ConfigNacosExampleApplication.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.example.core.nacos;
+package cn.hippo4j.example.config.nacos;
 
 import cn.hippo4j.core.enable.EnableDynamicThreadPool;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableDynamicThreadPool
-@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core")
+@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config")
 public class ConfigNacosExampleApplication {
 
     public static void main(String[] args) {

diff --git a/...er/ConfigZookeeperExampleApplication.java → ...er/ConfigZookeeperExampleApplication.java b/...er/ConfigZookeeperExampleApplication.java → ...er/ConfigZookeeperExampleApplication.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.example.core.zookeeper;
+package cn.hippo4j.example.config.zookeeper;
 
 import cn.hippo4j.core.enable.EnableDynamicThreadPool;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableDynamicThreadPool
-@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core")
+@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config")
 public class ConfigZookeeperExampleApplication {
 
     public static void main(String[] args) {

diff --git a/...ot/starter/common/ConfigFileTypeEnum.java → ...ot/starter/common/ConfigFileTypeEnum.java b/...ot/starter/common/ConfigFileTypeEnum.java → ...ot/starter/common/ConfigFileTypeEnum.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.common;
+package cn.hippo4j.config.springboot.starter.common;
 
 /**
  * Config file type enum.

diff --git a/...ter/config/AdapterExecutorProperties.java → ...ter/config/AdapterExecutorProperties.java b/...ter/config/AdapterExecutorProperties.java → ...ter/config/AdapterExecutorProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import lombok.Data;
 

diff --git a/...ter/config/BootstrapConfigProperties.java → ...ter/config/BootstrapConfigProperties.java b/...ter/config/BootstrapConfigProperties.java → ...ter/config/BootstrapConfigProperties.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import java.util.List;
 import java.util.Map;
 
 import cn.hippo4j.core.config.BootstrapPropertiesInterface;
-import cn.hippo4j.core.springboot.starter.parser.ConfigFileTypeEnum;
+import cn.hippo4j.config.springboot.starter.parser.ConfigFileTypeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/...er/config/ConfigHandlerConfiguration.java → ...er/config/ConfigHandlerConfiguration.java b/...er/config/ConfigHandlerConfiguration.java → ...er/config/ConfigHandlerConfiguration.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
-import cn.hippo4j.core.springboot.starter.refresher.ApolloRefresherHandler;
-import cn.hippo4j.core.springboot.starter.refresher.NacosCloudRefresherHandler;
-import cn.hippo4j.core.springboot.starter.refresher.NacosRefresherHandler;
-import cn.hippo4j.core.springboot.starter.refresher.ZookeeperRefresherHandler;
-import cn.hippo4j.core.springboot.starter.refresher.EtcdRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.ApolloRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.NacosCloudRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.NacosRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.ZookeeperRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.EtcdRefresherHandler;
 import com.alibaba.cloud.nacos.NacosConfigManager;
 import com.alibaba.nacos.api.config.ConfigService;
 import io.etcd.jetcd.Client;
@@ -102,6 +102,5 @@ public EtcdRefresherHandler etcdRefresher() {
             return new EtcdRefresherHandler();
         }
     }
-
-
+
 }
diff --git a/...namicThreadPoolCoreAutoConfiguration.java → ...namicThreadPoolCoreAutoConfiguration.java b/...namicThreadPoolCoreAutoConfiguration.java → ...namicThreadPoolCoreAutoConfiguration.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.core.config.UtilAutoConfiguration;
 import cn.hippo4j.core.enable.MarkerConfiguration;
 import cn.hippo4j.core.executor.ThreadPoolNotifyAlarmHandler;
 import cn.hippo4j.core.handler.DynamicThreadPoolBannerHandler;
-import cn.hippo4j.core.springboot.starter.monitor.DynamicThreadPoolMonitorExecutor;
-import cn.hippo4j.core.springboot.starter.notify.CoreNotifyConfigBuilder;
-import cn.hippo4j.core.springboot.starter.refresher.event.AdapterExecutorsRefreshListener;
-import cn.hippo4j.core.springboot.starter.refresher.event.DynamicThreadPoolRefreshListener;
-import cn.hippo4j.core.springboot.starter.refresher.event.PlatformsRefreshListener;
-import cn.hippo4j.core.springboot.starter.refresher.event.WebExecutorRefreshListener;
-import cn.hippo4j.core.springboot.starter.support.DynamicThreadPoolAdapterRegister;
-import cn.hippo4j.core.springboot.starter.support.DynamicThreadPoolConfigService;
-import cn.hippo4j.core.springboot.starter.support.DynamicThreadPoolPostProcessor;
+import cn.hippo4j.config.springboot.starter.monitor.DynamicThreadPoolMonitorExecutor;
+import cn.hippo4j.config.springboot.starter.notify.CoreNotifyConfigBuilder;
+import cn.hippo4j.config.springboot.starter.refresher.event.AdapterExecutorsRefreshListener;
+import cn.hippo4j.config.springboot.starter.refresher.event.DynamicThreadPoolRefreshListener;
+import cn.hippo4j.config.springboot.starter.refresher.event.PlatformsRefreshListener;
+import cn.hippo4j.config.springboot.starter.refresher.event.WebExecutorRefreshListener;
+import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolAdapterRegister;
+import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolConfigService;
+import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolPostProcessor;
 import cn.hippo4j.message.api.NotifyConfigBuilder;
 import cn.hippo4j.message.config.MessageConfiguration;
 import cn.hippo4j.message.service.AlarmControlHandler;

diff --git a/...ig/DynamicThreadPoolNotifyProperties.java → ...ig/DynamicThreadPoolNotifyProperties.java b/...ig/DynamicThreadPoolNotifyProperties.java → ...ig/DynamicThreadPoolNotifyProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...ot/starter/config/ExecutorProperties.java → ...ot/starter/config/ExecutorProperties.java b/...ot/starter/config/ExecutorProperties.java → ...ot/starter/config/ExecutorProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...rter/config/NotifyPlatformProperties.java → ...rter/config/NotifyPlatformProperties.java b/...rter/config/NotifyPlatformProperties.java → ...rter/config/NotifyPlatformProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import lombok.Data;
 

diff --git a/...arter/config/WebThreadPoolProperties.java → ...arter/config/WebThreadPoolProperties.java b/...arter/config/WebThreadPoolProperties.java → ...arter/config/WebThreadPoolProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.config;
+package cn.hippo4j.config.springboot.starter.config;
 
 import lombok.Data;
 

diff --git a/...tor/DynamicThreadPoolMonitorExecutor.java → ...tor/DynamicThreadPoolMonitorExecutor.java b/...tor/DynamicThreadPoolMonitorExecutor.java → ...tor/DynamicThreadPoolMonitorExecutor.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package cn.hippo4j.config.springboot.starter.monitor;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
 import cn.hippo4j.core.executor.support.ThreadFactoryBuilder;
 import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader;
-import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties;
 import cn.hippo4j.monitor.base.DynamicThreadPoolMonitor;
 import cn.hippo4j.monitor.base.ThreadPoolMonitor;
 import com.google.common.collect.Lists;

diff --git a/...arter/notify/CoreNotifyConfigBuilder.java → ...arter/notify/CoreNotifyConfigBuilder.java b/...arter/notify/CoreNotifyConfigBuilder.java → ...arter/notify/CoreNotifyConfigBuilder.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.notify;
+package cn.hippo4j.config.springboot.starter.notify;
 
 import cn.hippo4j.common.toolkit.CollectionUtil;
 import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.core.springboot.starter.config.ExecutorProperties;
-import cn.hippo4j.core.springboot.starter.config.NotifyPlatformProperties;
+import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.config.springboot.starter.config.ExecutorProperties;
+import cn.hippo4j.config.springboot.starter.config.NotifyPlatformProperties;
 import cn.hippo4j.message.service.AlarmControlHandler;
 import cn.hippo4j.message.dto.NotifyConfigDTO;
 import cn.hippo4j.message.api.NotifyConfigBuilder;

diff --git a/.../starter/parser/AbstractConfigParser.java → .../starter/parser/AbstractConfigParser.java b/.../starter/parser/AbstractConfigParser.java → .../starter/parser/AbstractConfigParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 /**
  * Abstract config parser

diff --git a/...ot/starter/parser/ConfigFileTypeEnum.java → ...ot/starter/parser/ConfigFileTypeEnum.java b/...ot/starter/parser/ConfigFileTypeEnum.java → ...ot/starter/parser/ConfigFileTypeEnum.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 import lombok.Getter;
 

diff --git a/...ringboot/starter/parser/ConfigParser.java → ...ringboot/starter/parser/ConfigParser.java b/...ringboot/starter/parser/ConfigParser.java → ...ringboot/starter/parser/ConfigParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...t/starter/parser/ConfigParserHandler.java → ...t/starter/parser/ConfigParserHandler.java b/...t/starter/parser/ConfigParserHandler.java → ...t/starter/parser/ConfigParserHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 import com.google.common.collect.Lists;
 

diff --git a/...tarter/parser/PropertiesConfigParser.java → ...tarter/parser/PropertiesConfigParser.java b/...tarter/parser/PropertiesConfigParser.java → ...tarter/parser/PropertiesConfigParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 import com.google.common.collect.Lists;
 

diff --git a/...boot/starter/parser/YamlConfigParser.java → ...boot/starter/parser/YamlConfigParser.java b/...boot/starter/parser/YamlConfigParser.java → ...boot/starter/parser/YamlConfigParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.parser;
+package cn.hippo4j.config.springboot.starter.parser;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

diff --git a/...AbstractCoreThreadPoolDynamicRefresh.java → ...AbstractCoreThreadPoolDynamicRefresh.java b/...AbstractCoreThreadPoolDynamicRefresh.java → ...AbstractCoreThreadPoolDynamicRefresh.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.refresher;
+package cn.hippo4j.config.springboot.starter.refresher;
 
 import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.toolkit.CollectionUtil;
+import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.config.springboot.starter.parser.ConfigParserHandler;
+import cn.hippo4j.config.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEvent;
 import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
-import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.core.springboot.starter.parser.ConfigParserHandler;
-import cn.hippo4j.core.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;

diff --git a/...ter/refresher/ApolloRefresherHandler.java → ...ter/refresher/ApolloRefresherHandler.java b/...ter/refresher/ApolloRefresherHandler.java → ...ter/refresher/ApolloRefresherHandler.java
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.refresher;
+package cn.hippo4j.config.springboot.starter.refresher;
 
+import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.ConfigChangeListener;
 import com.ctrip.framework.apollo.ConfigFile;
@@ -29,8 +30,6 @@
 
 import java.util.Map;
 
-import static cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties.PREFIX;
-
 /**
  * Apollo refresher handler.
  */
@@ -52,7 +51,7 @@ public void afterPropertiesSet() {
             ConfigFileFormat configFileFormat = ConfigFileFormat.fromString(bootstrapConfigProperties.getConfigFileType().getValue());
             ConfigFile configFile = ConfigService.getConfigFile(namespace, configFileFormat);
             Map<String, Object> newChangeValueMap = Maps.newHashMap();
-            configChangeEvent.changedKeys().stream().filter(each -> each.contains(PREFIX)).forEach(each -> {
+            configChangeEvent.changedKeys().stream().filter(each -> each.contains(BootstrapConfigProperties.PREFIX)).forEach(each -> {
                 ConfigChange change = configChangeEvent.getChange(each);
                 String newValue = change.getNewValue();
                 newChangeValueMap.put(each, newValue);

diff --git a/...r/BootstrapCorePropertiesBinderAdapt.java → ...r/BootstrapCorePropertiesBinderAdapt.java b/...r/BootstrapCorePropertiesBinderAdapt.java → ...r/BootstrapCorePropertiesBinderAdapt.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.refresher;
+package cn.hippo4j.config.springboot.starter.refresher;
 
 import cn.hippo4j.common.toolkit.CollectionUtil;
 import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.core.springboot.starter.config.DynamicThreadPoolNotifyProperties;
-import cn.hippo4j.core.springboot.starter.config.ExecutorProperties;
-import cn.hippo4j.core.springboot.starter.config.NotifyPlatformProperties;
+import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.config.springboot.starter.config.DynamicThreadPoolNotifyProperties;
+import cn.hippo4j.config.springboot.starter.config.ExecutorProperties;
+import cn.hippo4j.config.springboot.starter.config.NotifyPlatformProperties;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.google.common.collect.Lists;
@@ -35,8 +35,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties.PREFIX;
-
 /**
  * Bootstrap core properties binder adapt.
  */
@@ -54,7 +52,7 @@ public static BootstrapConfigProperties bootstrapCorePropertiesBinder(Map<Object
         try {
             ConfigurationPropertySource sources = new MapConfigurationPropertySource(configInfo);
             Binder binder = new Binder(sources);
-            bindableCoreProperties = binder.bind(PREFIX, Bindable.ofInstance(bootstrapConfigProperties)).get();
+            bindableCoreProperties = binder.bind(BootstrapConfigProperties.PREFIX, Bindable.ofInstance(bootstrapConfigProperties)).get();
         } catch (Exception ex) {
             try {
                 Class.forName("org.springframework.boot.context.properties.bind.Binder");
@@ -80,11 +78,11 @@ private static BootstrapConfigProperties adapt(Map<Object, Object> configInfo) {
             configInfo.forEach((key, val) -> {
                 boolean containFlag = key != null
                         && StringUtil.isNotBlank((String) key)
-                        && (((String) key).indexOf(PREFIX + ".executors") != -1
-                                || ((String) key).indexOf(PREFIX + ".notify-platforms") != -1
-                                || ((String) key).indexOf(PREFIX + ".notifyPlatforms") != -1);
+                        && (((String) key).indexOf(BootstrapConfigProperties.PREFIX + ".executors") != -1
+                                || ((String) key).indexOf(BootstrapConfigProperties.PREFIX + ".notify-platforms") != -1
+                                || ((String) key).indexOf(BootstrapConfigProperties.PREFIX + ".notifyPlatforms") != -1);
                 if (containFlag) {
-                    String targetKey = key.toString().replace(PREFIX + ".", "");
+                    String targetKey = key.toString().replace(BootstrapConfigProperties.PREFIX + ".", "");
                     targetMap.put(targetKey, val);
                 }
             });