From f7eb468af8b737767f98d35cc948ca6dd5fe6eb7 Mon Sep 17 00:00:00 2001 From: magestack Date: Mon, 15 May 2023 23:57:32 +0800 Subject: [PATCH] Refactor package directory, abstract infra and kernel layers (#1285) * Refactor package directory, abstract infra and kernel layers * Update pom.xml --- agents/threadpool/hippo4j-agent-core/pom.xml | 2 +- .../thread-pool-plugin/pom.xml | 2 +- {threadpool => infra}/common/pom.xml | 4 ++-- .../common/api/ClientCloseHookExecute.java | 0 .../common/api/ClientNetworkService.java | 0 .../common/api/IExecutorProperties.java | 0 .../cn/hippo4j/common/api/JsonFacade.java | 0 .../cn/hippo4j/common/api/NotifyRequest.java | 0 .../hippo4j/common/api/ThreadDetailState.java | 0 .../common/api/ThreadPoolCheckAlarm.java | 0 .../common/api/ThreadPoolConfigChange.java | 0 .../common/api/ThreadPoolDynamicRefresh.java | 0 .../config/ApplicationContextHolder.java | 0 .../config/ExecutorNotifyProperties.java | 0 .../common/config/ExecutorProperties.java | 0 .../constant/ChangeThreadPoolConstants.java | 0 .../constant/ConfigModifyTypeConstants.java | 0 .../cn/hippo4j/common/constant/Constants.java | 0 .../common/constant/HttpHeaderConstants.java | 0 .../common/constant/HttpMediaType.java | 0 .../hippo4j/common/constant/HttpMethod.java | 0 .../common/constant/HttpResponseCode.java | 0 .../common/design/builder/Builder.java | 0 .../design/builder/ThreadFactoryBuilder.java | 0 .../observer/AbstractSubjectCenter.java | 0 .../common/design/observer/Observer.java | 0 .../design/observer/ObserverMessage.java | 0 .../java/cn/hippo4j/common/enums/DelEnum.java | 0 .../cn/hippo4j/common/enums/EnableEnum.java | 0 .../cn/hippo4j/common/enums/VerifyEnum.java | 0 .../common/enums/WebContainerEnum.java | 0 .../common/executor/ExecutorFactory.java | 0 .../common/executor/ThreadPoolManager.java | 0 .../support/BlockingQueueTypeEnum.java | 0 .../executor/support/CustomBlockingQueue.java | 0 .../CustomRejectedExecutionHandler.java | 0 .../support/NotSupportedException.java | 0 .../support/RejectedPolicyTypeEnum.java | 0 .../ResizableCapacityLinkedBlockingQueue.java | 0 .../support/RunsOldestTaskPolicy.java | 0 .../executor/support/SyncPutQueuePolicy.java | 0 .../hippo4j/common/extension/IExtension.java | 0 .../common/extension/IExtensionRequest.java | 0 .../extension/annotation/Realization.java | 0 .../extension/annotation/SingletonSPI.java | 0 .../config/ExtensionRegisterBootstrap.java | 0 .../common/extension/reducer/AllMatch.java | 0 .../common/extension/reducer/AnyMatch.java | 0 .../common/extension/reducer/FirstOf.java | 0 .../common/extension/reducer/None.java | 0 .../common/extension/reducer/Reducer.java | 0 .../common/extension/reducer/Reducers.java | 0 .../support/ExtensionAutoConfiguration.java | 0 .../extension/support/ExtensionCallback.java | 0 .../extension/support/ExtensionInvoker.java | 0 .../extension/support/ExtensionRegistry.java | 0 .../extension/support/IExtensionRegistry.java | 0 .../common/extension/support/ReduceType.java | 0 .../ServiceLoaderInstantiationException.java | 0 .../support/ServiceLoaderRegistry.java | 0 .../cn/hippo4j/common/function/Matcher.java | 0 .../common/function/NoArgsConsumer.java | 0 .../common/model/GlobalRemotePoolInfo.java | 0 .../cn/hippo4j/common/model/InstanceInfo.java | 0 .../model/ManyThreadPoolRunStateInfo.java | 0 .../common/model/ThreadDetailStateInfo.java | 0 .../common/model/ThreadPoolBaseInfo.java | 0 .../common/model/ThreadPoolParameter.java | 0 .../common/model/ThreadPoolParameterInfo.java | 0 .../common/model/ThreadPoolRunStateInfo.java | 0 .../cn/hippo4j/common/model/TokenInfo.java | 0 .../common/model/WebIpAndPortInfo.java | 0 .../DynamicThreadPoolRegisterParameter.java | 0 .../DynamicThreadPoolRegisterWrapper.java | 0 ...ThreadPoolRegisterCoreNotifyParameter.java | 0 ...readPoolRegisterServerNotifyParameter.java | 0 .../common/monitor/AbstractMessage.java | 0 .../cn/hippo4j/common/monitor/Message.java | 0 .../common/monitor/MessageRequest.java | 0 .../common/monitor/MessageTypeEnum.java | 0 .../common/monitor/MessageWrapper.java | 0 .../common/monitor/RuntimeMessage.java | 0 .../cn/hippo4j/common/toolkit/ArrayUtil.java | 0 .../cn/hippo4j/common/toolkit/Assert.java | 0 .../cn/hippo4j/common/toolkit/BeanUtil.java | 0 .../hippo4j/common/toolkit/BooleanUtil.java | 0 .../common/toolkit/ByteConvertUtil.java | 0 .../hippo4j/common/toolkit/CalculateUtil.java | 0 .../cn/hippo4j/common/toolkit/ClassUtil.java | 0 .../common/toolkit/CollectionUtil.java | 0 .../hippo4j/common/toolkit/ConditionUtil.java | 0 .../hippo4j/common/toolkit/ContentUtil.java | 0 .../cn/hippo4j/common/toolkit/DateUtil.java | 0 .../cn/hippo4j/common/toolkit/FileUtil.java | 0 .../cn/hippo4j/common/toolkit/GroupKey.java | 0 .../cn/hippo4j/common/toolkit/IdUtil.java | 0 .../cn/hippo4j/common/toolkit/IoUtil.java | 0 .../cn/hippo4j/common/toolkit/JSONUtil.java | 0 .../common/toolkit/JacksonHandler.java | 0 .../cn/hippo4j/common/toolkit/Joiner.java | 0 .../cn/hippo4j/common/toolkit/MapUtil.java | 0 .../cn/hippo4j/common/toolkit/Md5Util.java | 0 .../cn/hippo4j/common/toolkit/MemoryUtil.java | 0 .../common/toolkit/MessageConvert.java | 0 .../hippo4j/common/toolkit/ReflectUtil.java | 0 .../cn/hippo4j/common/toolkit/Singleton.java | 0 .../cn/hippo4j/common/toolkit/StringUtil.java | 0 .../toolkit/ThreadPoolExecutorUtil.java | 0 .../cn/hippo4j/common/toolkit/ThreadUtil.java | 0 .../hippo4j/common/toolkit/UserContext.java | 0 .../hippo4j/common/toolkit/http/Header.java | 0 .../toolkit/http/HttpClientResponse.java | 0 .../hippo4j/common/toolkit/http/HttpUtil.java | 0 .../toolkit/http/JdkHttpClientResponse.java | 0 .../common/toolkit/logtracing/LogMessage.java | 0 .../cn/hippo4j/common/web/base/Result.java | 0 .../cn/hippo4j/common/web/base/Results.java | 0 .../web/exception/AbstractException.java | 0 .../common/web/exception/ErrorCode.java | 0 .../common/web/exception/ErrorCodeEnum.java | 0 .../web/exception/IllegalException.java | 0 .../web/exception/ServiceException.java | 0 .../main/resources/META-INF/spring.factories | 0 .../java/cn/hippo4j/common/MockitoTests.java | 0 .../common/executor/ExecutorFactoryTest.java | 0 .../executor/ThreadPoolManagerTest.java | 0 .../support/BlockingQueueTypeEnumTest.java | 0 .../extension/ExtensionInvokerTest.java | 0 .../extension/anymatch/AnyMatchExtImplA.java | 0 .../extension/anymatch/AnyMatchExtImplB.java | 0 .../anymatch/IAnyMatchExtension.java | 0 .../extension/firstof/FirstOfExtImplA.java | 0 .../extension/firstof/FirstOfExtImplB.java | 0 .../extension/firstof/IFirstOfExtension.java | 0 .../hippo4j/common/extension/spi/IOldSpi.java | 0 .../common/extension/spi/IOldSpiImplA.java | 0 .../common/function/MatcherFunctionTest.java | 0 .../common/function/NoArgsConsumerTest.java | 0 .../DynamicThreadPoolServiceLoaderTest.java | 0 .../common/spi/MyArrayBlockingQueue.java | 0 .../hippo4j/common/spi/TestInterfaceSPI.java | 0 .../common/spi/TestInterfaceSPIImpl.java | 0 .../common/spi/TestSingletonInterfaceSPI.java | 0 .../spi/TestSingletonInterfaceSPIImpl.java | 0 .../hippo4j/common/toolkit/ArrayUtilTest.java | 0 .../cn/hippo4j/common/toolkit/AssertTest.java | 0 .../hippo4j/common/toolkit/BeanUtilTest.java | 0 .../common/toolkit/BooleanUtilTest.java | 0 .../common/toolkit/ByteConvertUtilTest.java | 0 .../common/toolkit/CalculateUtilTest.java | 0 .../common/toolkit/CollectionUtilTest.java | 0 .../common/toolkit/ConditionUtilTest.java | 0 .../common/toolkit/ContentUtilTest.java | 0 .../hippo4j/common/toolkit/FileUtilTest.java | 0 .../hippo4j/common/toolkit/GroupKeyTest.java | 0 .../cn/hippo4j/common/toolkit/IdUtilTest.java | 0 .../hippo4j/common/toolkit/JSONUtilTest.java | 0 .../hippo4j/common/toolkit/MapUtilTest.java | 0 .../hippo4j/common/toolkit/Md5UtilTest.java | 0 .../common/toolkit/MemoryUtilTest.java | 0 .../common/toolkit/ReflectUtilTest.java | 0 .../hippo4j/common/toolkit/SingletonTest.java | 0 .../common/toolkit/StringUtilTest.java | 0 .../common/toolkit/ThreadUtilTest.java | 0 .../common/toolkit/UserContextTest.java | 0 .../common/toolkit/http/HomeServlet.java | 0 .../common/toolkit/http/HttpUtilsTest.java | 0 .../common/toolkit/http/LoginServlet.java | 0 .../cn/hippo4j/common/web/ResultsTest.java | 0 .../hippo4j/common/web/base/ResultsTest.java | 0 ...ommon.executor.support.CustomBlockingQueue | 0 .../cn.hippo4j.common.extension.spi.IOldSpi | 0 .../cn.hippo4j.common.spi.TestInterfaceSPI | 0 ...ppo4j.common.spi.TestSingletonInterfaceSPI | 0 .../src/test/resources/test/test_utf8.txt | 0 infra/pom.xml | 19 ++++++++++++++++++ {common => infra/toolkit}/pom.xml | 5 +++-- kernel/alarm/pom.xml | 13 ++++++++++++ kernel/dynamic/pom.xml | 13 ++++++++++++ kernel/message/pom.xml | 13 ++++++++++++ kernel/pom.xml | 20 +++++++++++++++++++ pom.xml | 9 +++++---- starters/threadpool/server/pom.xml | 2 +- threadpool/adapter/base/pom.xml | 2 +- threadpool/core/pom.xml | 2 +- .../AbstractBuildThreadPoolTemplateTest.java | 6 ------ threadpool/pom.xml | 1 - threadpool/rpc/pom.xml | 2 +- threadpool/server/auth/pom.xml | 2 +- threadpool/server/config/pom.xml | 2 +- threadpool/server/discovery/pom.xml | 2 +- 191 files changed, 97 insertions(+), 24 deletions(-) rename {threadpool => infra}/common/pom.xml (95%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/IExecutorProperties.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/JsonFacade.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/NotifyRequest.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ThreadPoolConfigChange.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/Constants.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/HttpMediaType.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/HttpMethod.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/constant/HttpResponseCode.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/design/builder/ThreadFactoryBuilder.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/IExtension.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/function/Matcher.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/Message.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/base/Result.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/base/Results.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java (100%) rename {threadpool => infra}/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java (100%) rename {threadpool => infra}/common/src/main/resources/META-INF/spring.factories (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/MockitoTests.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/function/NoArgsConsumerTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ArrayUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/AssertTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/BooleanUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ByteConvertUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/CalculateUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/CollectionUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ConditionUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/GroupKeyTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/IdUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/MapUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/Md5UtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/MemoryUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ReflectUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/StringUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/ThreadUtilTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/UserContextTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/http/HomeServlet.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/http/HttpUtilsTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/toolkit/http/LoginServlet.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java (100%) rename {threadpool => infra}/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java (100%) rename {threadpool => infra}/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue (100%) rename {threadpool => infra}/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi (100%) rename {threadpool => infra}/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI (100%) rename {threadpool => infra}/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI (100%) rename {threadpool => infra}/common/src/test/resources/test/test_utf8.txt (100%) create mode 100644 infra/pom.xml rename {common => infra/toolkit}/pom.xml (77%) create mode 100644 kernel/alarm/pom.xml create mode 100644 kernel/dynamic/pom.xml create mode 100644 kernel/message/pom.xml create mode 100644 kernel/pom.xml diff --git a/agents/threadpool/hippo4j-agent-core/pom.xml b/agents/threadpool/hippo4j-agent-core/pom.xml index add15fd7..b299e9dc 100644 --- a/agents/threadpool/hippo4j-agent-core/pom.xml +++ b/agents/threadpool/hippo4j-agent-core/pom.xml @@ -75,7 +75,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} provided diff --git a/agents/threadpool/hippo4j-agent-plugin/thread-pool-plugin/pom.xml b/agents/threadpool/hippo4j-agent-plugin/thread-pool-plugin/pom.xml index 4fb78e25..c3fa56bb 100644 --- a/agents/threadpool/hippo4j-agent-plugin/thread-pool-plugin/pom.xml +++ b/agents/threadpool/hippo4j-agent-plugin/thread-pool-plugin/pom.xml @@ -20,7 +20,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/common/pom.xml b/infra/common/pom.xml similarity index 95% rename from threadpool/common/pom.xml rename to infra/common/pom.xml index 5d9d6faf..767eb6ee 100644 --- a/threadpool/common/pom.xml +++ b/infra/common/pom.xml @@ -4,10 +4,10 @@ 4.0.0 cn.hippo4j - hippo4j-threadpool + hippo4j-infra ${revision} - hippo4j-threadpool-common + hippo4j-threadpool-infra-common diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java b/infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java b/infra/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/IExecutorProperties.java b/infra/common/src/main/java/cn/hippo4j/common/api/IExecutorProperties.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/IExecutorProperties.java rename to infra/common/src/main/java/cn/hippo4j/common/api/IExecutorProperties.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/JsonFacade.java b/infra/common/src/main/java/cn/hippo4j/common/api/JsonFacade.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/JsonFacade.java rename to infra/common/src/main/java/cn/hippo4j/common/api/JsonFacade.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/NotifyRequest.java b/infra/common/src/main/java/cn/hippo4j/common/api/NotifyRequest.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/NotifyRequest.java rename to infra/common/src/main/java/cn/hippo4j/common/api/NotifyRequest.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java b/infra/common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java b/infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolConfigChange.java b/infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolConfigChange.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolConfigChange.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolConfigChange.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java b/infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java rename to infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java b/infra/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java rename to infra/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java b/infra/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java rename to infra/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java b/infra/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java rename to infra/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/Constants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/Constants.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/Constants.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/Constants.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpMediaType.java b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpMediaType.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpMediaType.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/HttpMediaType.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpMethod.java b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpMethod.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpMethod.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/HttpMethod.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpResponseCode.java b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpResponseCode.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/constant/HttpResponseCode.java rename to infra/common/src/main/java/cn/hippo4j/common/constant/HttpResponseCode.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java b/infra/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java rename to infra/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/builder/ThreadFactoryBuilder.java b/infra/common/src/main/java/cn/hippo4j/common/design/builder/ThreadFactoryBuilder.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/design/builder/ThreadFactoryBuilder.java rename to infra/common/src/main/java/cn/hippo4j/common/design/builder/ThreadFactoryBuilder.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java b/infra/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java rename to infra/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java b/infra/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java rename to infra/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java b/infra/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java rename to infra/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java b/infra/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java b/infra/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java b/infra/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java b/infra/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java b/infra/common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java b/infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/IExtension.java b/infra/common/src/main/java/cn/hippo4j/common/extension/IExtension.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/IExtension.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/IExtension.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java b/infra/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java b/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java b/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java b/infra/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java b/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java b/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java rename to infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/function/Matcher.java b/infra/common/src/main/java/cn/hippo4j/common/function/Matcher.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/function/Matcher.java rename to infra/common/src/main/java/cn/hippo4j/common/function/Matcher.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java b/infra/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java rename to infra/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java rename to infra/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java rename to infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java rename to infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java rename to infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java rename to infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/Message.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/Message.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/Message.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/Message.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java rename to infra/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/base/Result.java b/infra/common/src/main/java/cn/hippo4j/common/web/base/Result.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/base/Result.java rename to infra/common/src/main/java/cn/hippo4j/common/web/base/Result.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/base/Results.java b/infra/common/src/main/java/cn/hippo4j/common/web/base/Results.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/base/Results.java rename to infra/common/src/main/java/cn/hippo4j/common/web/base/Results.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java b/infra/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java rename to infra/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java b/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java rename to infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java rename to infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java b/infra/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java rename to infra/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java b/infra/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java similarity index 100% rename from threadpool/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java rename to infra/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java diff --git a/threadpool/common/src/main/resources/META-INF/spring.factories b/infra/common/src/main/resources/META-INF/spring.factories similarity index 100% rename from threadpool/common/src/main/resources/META-INF/spring.factories rename to infra/common/src/main/resources/META-INF/spring.factories diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/MockitoTests.java b/infra/common/src/test/java/cn/hippo4j/common/MockitoTests.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/MockitoTests.java rename to infra/common/src/test/java/cn/hippo4j/common/MockitoTests.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java rename to infra/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java rename to infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java rename to infra/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java b/infra/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java b/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java b/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java b/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java b/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java b/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java b/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java b/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java b/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java rename to infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java b/infra/common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java rename to infra/common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/function/NoArgsConsumerTest.java b/infra/common/src/test/java/cn/hippo4j/common/function/NoArgsConsumerTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/function/NoArgsConsumerTest.java rename to infra/common/src/test/java/cn/hippo4j/common/function/NoArgsConsumerTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java b/infra/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java b/infra/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java b/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java b/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java b/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java b/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java rename to infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ArrayUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ArrayUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ArrayUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ArrayUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/AssertTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/AssertTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/AssertTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/AssertTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/BooleanUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/BooleanUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/BooleanUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/BooleanUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ByteConvertUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ByteConvertUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ByteConvertUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ByteConvertUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/CalculateUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/CalculateUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/CalculateUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/CalculateUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/CollectionUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/CollectionUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/CollectionUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/CollectionUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ConditionUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ConditionUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ConditionUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ConditionUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ContentUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/GroupKeyTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/GroupKeyTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/GroupKeyTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/GroupKeyTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/IdUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/IdUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/IdUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/IdUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/MapUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/MapUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/MapUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/MapUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/Md5UtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/Md5UtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/Md5UtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/Md5UtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/MemoryUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/MemoryUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/MemoryUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/MemoryUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ReflectUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ReflectUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ReflectUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ReflectUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/StringUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/StringUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/StringUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/StringUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ThreadUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/ThreadUtilTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/ThreadUtilTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/ThreadUtilTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/UserContextTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/UserContextTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/UserContextTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/UserContextTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/HomeServlet.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/http/HomeServlet.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/HomeServlet.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/http/HomeServlet.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/HttpUtilsTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/http/HttpUtilsTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/HttpUtilsTest.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/http/HttpUtilsTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/LoginServlet.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/http/LoginServlet.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/toolkit/http/LoginServlet.java rename to infra/common/src/test/java/cn/hippo4j/common/toolkit/http/LoginServlet.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java b/infra/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java rename to infra/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java b/infra/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java similarity index 100% rename from threadpool/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java rename to infra/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java diff --git a/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue similarity index 100% rename from threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue rename to infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue diff --git a/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi similarity index 100% rename from threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi rename to infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi diff --git a/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI similarity index 100% rename from threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI rename to infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI diff --git a/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI similarity index 100% rename from threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI rename to infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI diff --git a/threadpool/common/src/test/resources/test/test_utf8.txt b/infra/common/src/test/resources/test/test_utf8.txt similarity index 100% rename from threadpool/common/src/test/resources/test/test_utf8.txt rename to infra/common/src/test/resources/test/test_utf8.txt diff --git a/infra/pom.xml b/infra/pom.xml new file mode 100644 index 00000000..17518798 --- /dev/null +++ b/infra/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + cn.hippo4j + hippo4j-all + ${revision} + + + hippo4j-infra + pom + + + common + toolkit + + \ No newline at end of file diff --git a/common/pom.xml b/infra/toolkit/pom.xml similarity index 77% rename from common/pom.xml rename to infra/toolkit/pom.xml index e650370a..8784aa5e 100644 --- a/common/pom.xml +++ b/infra/toolkit/pom.xml @@ -5,8 +5,9 @@ 4.0.0 cn.hippo4j - hippo4j-all + hippo4j-infra ${revision} - hippo4j-common + + hippo4j-threadpool-infra-toolkit \ No newline at end of file diff --git a/kernel/alarm/pom.xml b/kernel/alarm/pom.xml new file mode 100644 index 00000000..0bb19b1c --- /dev/null +++ b/kernel/alarm/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + cn.hippo4j + hippo4j-kernel + ${revision} + + + hippo4j-threadpool-kernel-alarm + \ No newline at end of file diff --git a/kernel/dynamic/pom.xml b/kernel/dynamic/pom.xml new file mode 100644 index 00000000..ee66f779 --- /dev/null +++ b/kernel/dynamic/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + cn.hippo4j + hippo4j-kernel + ${revision} + + + hippo4j-threadpool-kernel-dynamic + \ No newline at end of file diff --git a/kernel/message/pom.xml b/kernel/message/pom.xml new file mode 100644 index 00000000..1957cad9 --- /dev/null +++ b/kernel/message/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + cn.hippo4j + hippo4j-kernel + ${revision} + + + hippo4j-threadpool-kernel-message + \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml new file mode 100644 index 00000000..3b194094 --- /dev/null +++ b/kernel/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + cn.hippo4j + hippo4j-all + ${revision} + + + hippo4j-kernel + pom + + + alarm + dynamic + message + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c986a1de..4a2f7683 100644 --- a/pom.xml +++ b/pom.xml @@ -43,13 +43,14 @@ + agents dependencies - threadpool - common + examples + infra + kernel starters tests - examples - agents + threadpool diff --git a/starters/threadpool/server/pom.xml b/starters/threadpool/server/pom.xml index 4d4f15cc..daf82eaa 100644 --- a/starters/threadpool/server/pom.xml +++ b/starters/threadpool/server/pom.xml @@ -25,7 +25,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/adapter/base/pom.xml b/threadpool/adapter/base/pom.xml index c9db0b08..2c253278 100644 --- a/threadpool/adapter/base/pom.xml +++ b/threadpool/adapter/base/pom.xml @@ -12,7 +12,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/core/pom.xml b/threadpool/core/pom.xml index e3538d46..fac63720 100644 --- a/threadpool/core/pom.xml +++ b/threadpool/core/pom.xml @@ -12,7 +12,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java index 67cbc82a..0e77555c 100644 --- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java +++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java @@ -52,7 +52,6 @@ public class AbstractBuildThreadPoolTemplateTest { .setTaskDecorator(runnable -> runnable); } - @Test public void testBuildPool() { ThreadPoolExecutor executor = AbstractBuildThreadPoolTemplate.buildPool(initParam); @@ -74,7 +73,6 @@ public class AbstractBuildThreadPoolTemplateTest { } - @Test public void testBuildFastPool() { ThreadPoolExecutor executor = AbstractBuildThreadPoolTemplate.buildFastPool(initParam); @@ -96,8 +94,6 @@ public class AbstractBuildThreadPoolTemplateTest { } - - @Test public void testBuildDynamicPool() { initParam.setWaitForTasksToCompleteOnShutdown(true); @@ -118,7 +114,5 @@ public class AbstractBuildThreadPoolTemplateTest { } Assert.assertEquals(2, count.get()); - } - } diff --git a/threadpool/pom.xml b/threadpool/pom.xml index 99831ecb..b167f2f3 100644 --- a/threadpool/pom.xml +++ b/threadpool/pom.xml @@ -13,7 +13,6 @@ adapter - common core message monitor diff --git a/threadpool/rpc/pom.xml b/threadpool/rpc/pom.xml index 15307e93..c6f0d91b 100644 --- a/threadpool/rpc/pom.xml +++ b/threadpool/rpc/pom.xml @@ -12,7 +12,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/server/auth/pom.xml b/threadpool/server/auth/pom.xml index ea452b5c..2b431f09 100644 --- a/threadpool/server/auth/pom.xml +++ b/threadpool/server/auth/pom.xml @@ -54,7 +54,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/server/config/pom.xml b/threadpool/server/config/pom.xml index 77b50351..75740382 100644 --- a/threadpool/server/config/pom.xml +++ b/threadpool/server/config/pom.xml @@ -16,7 +16,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version} diff --git a/threadpool/server/discovery/pom.xml b/threadpool/server/discovery/pom.xml index 0f46eabf..42894bb4 100644 --- a/threadpool/server/discovery/pom.xml +++ b/threadpool/server/discovery/pom.xml @@ -24,7 +24,7 @@ cn.hippo4j - hippo4j-threadpool-common + hippo4j-threadpool-infra-common ${project.version}