From 1cfc7c278ce18d458f57d4fd09533ec33e002b56 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Mon, 30 Oct 2023 19:05:23 +0800 Subject: [PATCH] Merge kernel and infra module --- .../dingtalk/DingtalkJobErrorHandler.java | 6 +- ...alkJobErrorHandlerPropertiesValidator.java | 6 +- .../dingtalk/DingtalkPropertiesConstants.java | 2 +- ...al.executor.error.handler.JobErrorHandler} | 0 ...andler.JobErrorHandlerPropertiesValidator} | 0 ...obErrorHandlerPropertiesValidatorTest.java | 2 +- .../dingtalk/DingtalkJobErrorHandlerTest.java | 2 +- .../fixture/DingtalkInternalController.java | 2 +- .../handler/email/EmailJobErrorHandler.java | 2 +- ...ailJobErrorHandlerPropertiesValidator.java | 4 +- ...al.executor.error.handler.JobErrorHandler} | 0 ...andler.JobErrorHandlerPropertiesValidator} | 0 ...obErrorHandlerPropertiesValidatorTest.java | 2 +- .../email/EmailJobErrorHandlerTest.java | 2 +- .../handler/wechat/WechatJobErrorHandler.java | 4 +- ...hatJobErrorHandlerPropertiesValidator.java | 4 +- ...al.executor.error.handler.JobErrorHandler} | 0 ...andler.JobErrorHandlerPropertiesValidator} | 0 ...obErrorHandlerPropertiesValidatorTest.java | 2 +- .../wechat/WechatJobErrorHandlerTest.java | 2 +- .../fixture/WechatInternalController.java | 2 +- .../http/executor/HttpJobExecutor.java | 6 +- .../http/executor/HttpJobExecutorTest.java | 4 +- .../script/executor/ScriptJobExecutor.java | 6 +- .../script/ScriptJobExecutorTest.java | 4 +- ecosystem/tracing/api/pom.xml | 58 ------------------ .../api/src/test/resources/logback-test.xml | 43 ------------- ecosystem/tracing/pom.xml | 1 - ecosystem/tracing/rdb/pom.xml | 2 +- .../datasource/DataSourceConfiguration.java | 2 +- .../rdb/datasource/DataSourceRegistry.java | 3 +- .../DataSourceTracingStorageConverter.java | 6 +- .../rdb/listener/RDBTracingListener.java | 6 +- .../RDBTracingListenerConfiguration.java | 6 +- .../rdb/storage/RDBJobEventStorage.java | 22 +++---- .../rdb/yaml/YamlDataSourceConfiguration.java | 6 +- .../YamlDataSourceConfigurationConverter.java | 6 +- ...ra.yaml.config.YamlConfigurationConverter} | 0 ...ing.listener.TracingListenerConfiguration} | 0 ...l.tracing.storage.TracingStorageConverter} | 0 ...DataSourceTracingStorageConverterTest.java | 6 +- .../RDBTracingListenerConfigurationTest.java | 2 +- .../rdb/listener/RDBTracingListenerTest.java | 12 ++-- .../rdb/storage/RDBJobEventStorageTest.java | 8 +-- ...lDataSourceConfigurationConverterTest.java | 2 +- .../elasticjob/example/JavaMain.java | 2 +- infra/pom.xml | 61 ------------------- infra/src/test/resources/logback-test.xml | 42 ------------- kernel/pom.xml | 5 -- ...tractDistributeOnceElasticJobListener.java | 6 +- .../kernel}/infra/constant/ExecutionType.java | 2 +- .../kernel}/infra/env/HostException.java | 2 +- .../elasticjob/kernel}/infra/env/IpUtils.java | 2 +- .../infra/exception/ExceptionUtils.java | 2 +- .../exception/JobConfigurationException.java | 2 +- .../JobExecutionEnvironmentException.java | 2 +- .../exception/JobExecutionException.java | 2 +- .../infra/exception/JobSystemException.java | 2 +- .../exception/PropertiesPreconditions.java | 2 +- .../kernel}/infra/json/GsonFactory.java | 2 +- .../infra/listener/ElasticJobListener.java | 2 +- .../infra/listener/ShardingContexts.java | 2 +- .../kernel}/infra/yaml/YamlEngine.java | 4 +- .../infra/yaml/config/YamlConfiguration.java | 2 +- .../config/YamlConfigurationConverter.java | 2 +- .../DefaultYamlTupleProcessor.java | 2 +- .../ElasticJobYamlRepresenter.java | 2 +- .../annotation/JobAnnotationBuilder.java | 2 +- .../internal/config/ConfigurationService.java | 6 +- .../internal/config/JobConfigurationPOJO.java | 4 +- .../config/RescheduleListenerManager.java | 2 +- .../kernel/internal/context/TaskContext.java | 2 +- .../internal/executor/ElasticJobExecutor.java | 14 ++--- .../kernel/internal/executor/JobFacade.java | 16 ++--- .../handler/general/ThrowJobErrorHandler.java | 2 +- .../executor/item/JobItemExecutorFactory.java | 2 +- .../failover/FailoverListenerManager.java | 2 +- .../guarantee/GuaranteeListenerManager.java | 2 +- .../internal/guarantee/GuaranteeService.java | 2 +- .../internal/instance/InstanceNode.java | 2 +- .../internal/instance/InstanceService.java | 2 +- .../internal/listener/ListenerManager.java | 2 +- .../schedule/JobScheduleController.java | 2 +- .../internal/schedule/JobScheduler.java | 6 +- .../kernel/internal/server/ServerNode.java | 2 +- .../kernel/internal/setup/SetUpFacade.java | 2 +- .../sharding/ExecutionContextService.java | 2 +- .../internal/sharding/ExecutionService.java | 2 +- .../kernel/internal/sharding/JobInstance.java | 2 +- .../MonitorExecutionListenerManager.java | 2 +- .../sharding/ShardingItemParameters.java | 2 +- .../sharding/ShardingListenerManager.java | 2 +- .../internal/sharding/ShardingService.java | 2 +- .../internal}/tracing/JobTracingEventBus.java | 10 +-- .../tracing/api/TracingConfiguration.java | 6 +- .../api/TracingStorageConfiguration.java | 2 +- .../internal}/tracing/event/JobEvent.java | 2 +- .../tracing/event/JobExecutionEvent.java | 4 +- .../tracing/event/JobStatusTraceEvent.java | 4 +- .../TracingConfigurationException.java | 2 +- ...cingStorageConverterNotFoundException.java | 4 +- .../TracingStorageUnavailableException.java | 2 +- .../tracing/exception/WrapException.java | 2 +- .../tracing/listener/TracingListener.java | 6 +- .../TracingListenerConfiguration.java | 4 +- .../storage/TracingStorageConverter.java | 4 +- .../TracingStorageConverterFactory.java | 2 +- .../yaml/YamlTracingConfiguration.java | 8 +-- .../YamlTracingConfigurationConverter.java | 8 +-- .../yaml/YamlTracingStorageConfiguration.java | 8 +-- .../internal/util/SensitiveInfoUtils.java | 2 +- ...fra.yaml.config.YamlConfigurationConverter | 2 +- .../DistributeOnceElasticJobListenerTest.java | 4 +- .../TestDistributeOnceElasticJobListener.java | 2 +- .../fixture/TestElasticJobListener.java | 4 +- .../kernel}/infra/env/HostExceptionTest.java | 2 +- .../kernel}/infra/env/IpUtilsTest.java | 2 +- .../infra/exception/ExceptionUtilsTest.java | 2 +- .../JobConfigurationExceptionTest.java | 2 +- .../JobExecutionEnvironmentExceptionTest.java | 2 +- .../exception/JobSystemExceptionTest.java | 2 +- .../PropertiesPreconditionsTest.java | 2 +- .../kernel}/infra/json/GsonFactoryTest.java | 2 +- .../infra/listener/ShardingContextsTest.java | 2 +- .../kernel}/infra/yaml/YamlEngineTest.java | 8 +-- .../yaml/fixture/FooYamlConfiguration.java | 2 +- .../config/ConfigurationServiceTest.java | 6 +- .../config/JobConfigurationPOJOTest.java | 2 +- .../internal/context/TaskContextTest.java | 2 +- .../internal/context/fixture/TaskNode.java | 2 +- .../executor/ElasticJobExecutorTest.java | 8 +-- .../internal/executor/JobFacadeTest.java | 6 +- .../general/ThrowJobErrorHandlerTest.java | 2 +- .../item/JobItemExecutorFactoryTest.java | 2 +- .../GuaranteeListenerManagerTest.java | 2 +- .../guarantee/GuaranteeServiceTest.java | 2 +- .../schedule/JobScheduleControllerTest.java | 2 +- .../sharding/ExecutionContextServiceTest.java | 2 +- .../sharding/ExecutionServiceTest.java | 2 +- .../internal/sharding/JobInstanceTest.java | 4 +- .../sharding/ShardingItemParametersTest.java | 2 +- .../tracing/JobTracingEventBusTest.java | 12 ++-- .../tracing/event/JobExecutionEventTest.java | 2 +- .../tracing/fixture/JobEventCaller.java | 2 +- .../fixture/JobEventCallerConfiguration.java | 4 +- .../fixture/JobEventCallerConverter.java | 6 +- .../TestTracingFailureConfiguration.java | 8 +-- .../tracing/fixture/TestTracingListener.java | 8 +-- .../TestTracingListenerConfiguration.java | 6 +- .../TracingStorageConverterFactoryTest.java | 4 +- .../yaml/YamlJobEventCallerConfiguration.java | 8 +-- ...lJobEventCallerConfigurationConverter.java | 10 +-- ...YamlTracingConfigurationConverterTest.java | 6 +- ....kernel.infra.listener.ElasticJobListener} | 0 ...fra.yaml.config.YamlConfigurationConverter | 2 +- ...cing.listener.TracingListenerConfiguration | 4 +- ...al.tracing.storage.TracingStorageConverter | 2 +- .../internal/operate/JobOperateAPIImpl.java | 2 +- .../settings/JobConfigurationAPIImpl.java | 2 +- .../statistics/JobStatisticsAPIImpl.java | 2 +- .../statistics/ServerStatisticsAPIImpl.java | 2 +- .../statistics/ShardingStatisticsAPIImpl.java | 2 +- pom.xml | 1 - .../job/ElasticJobBootstrapConfiguration.java | 2 +- .../ElasticJobTracingConfiguration.java | 2 +- .../boot/job/ElasticJobSpringBootTest.java | 2 +- .../listener/LogElasticJobListener.java | 4 +- .../listener/NoopElasticJobListener.java | 4 +- .../tracing/TracingConfigurationTest.java | 2 +- ....kernel.infra.listener.ElasticJobListener} | 0 .../spring/core/util/AopTargetUtils.java | 2 +- .../parser/TracingBeanDefinitionParser.java | 2 +- .../fixture/listener/SimpleCglibListener.java | 4 +- .../SimpleJdkDynamicProxyListener.java | 4 +- .../fixture/listener/SimpleListener.java | 4 +- .../fixture/listener/SimpleOnceListener.java | 2 +- ....kernel.infra.listener.ElasticJobListener} | 0 .../annotation/OneOffEnabledJobE2ETest.java | 4 +- .../annotation/ScheduleEnabledJobE2ETest.java | 4 +- .../e2e/raw/disable/DisabledJobE2ETest.java | 4 +- .../e2e/raw/enable/EnabledJobE2ETest.java | 4 +- .../DistributeOnceE2EFixtureJobListener.java | 2 +- .../listener/E2EFixtureJobListener.java | 4 +- ....kernel.infra.listener.ElasticJobListener} | 0 184 files changed, 298 insertions(+), 514 deletions(-) rename ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler} (100%) rename ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator} (100%) rename ecosystem/error-handler/type/email/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler} (100%) rename ecosystem/error-handler/type/email/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator} (100%) rename ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler} (100%) rename ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator => org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator} (100%) delete mode 100644 ecosystem/tracing/api/pom.xml delete mode 100644 ecosystem/tracing/api/src/test/resources/logback-test.xml rename ecosystem/tracing/rdb/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter => org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter} (100%) rename ecosystem/tracing/rdb/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration => org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration} (100%) rename ecosystem/tracing/rdb/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter => org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter} (100%) delete mode 100644 infra/pom.xml delete mode 100644 infra/src/test/resources/logback-test.xml rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/constant/ExecutionType.java (93%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/env/HostException.java (94%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/env/IpUtils.java (99%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/ExceptionUtils.java (95%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobConfigurationException.java (94%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobExecutionEnvironmentException.java (94%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobExecutionException.java (93%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobSystemException.java (95%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/PropertiesPreconditions.java (96%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/json/GsonFactory.java (95%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/listener/ElasticJobListener.java (95%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/listener/ShardingContexts.java (97%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/YamlEngine.java (92%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/config/YamlConfiguration.java (93%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/config/YamlConfigurationConverter.java (95%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/representer/DefaultYamlTupleProcessor.java (96%) rename {infra/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/representer/ElasticJobYamlRepresenter.java (95%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/JobTracingEventBus.java (88%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/api/TracingConfiguration.java (84%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/api/TracingStorageConfiguration.java (93%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/event/JobEvent.java (92%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/event/JobExecutionEvent.java (97%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/event/JobStatusTraceEvent.java (91%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/exception/TracingConfigurationException.java (93%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/exception/TracingStorageConverterNotFoundException.java (87%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/exception/TracingStorageUnavailableException.java (93%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/exception/WrapException.java (92%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/listener/TracingListener.java (84%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/listener/TracingListenerConfiguration.java (88%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/storage/TracingStorageConverter.java (88%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/storage/TracingStorageConverterFactory.java (95%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlTracingConfiguration.java (82%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlTracingConfigurationConverter.java (84%) rename {ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob => kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlTracingStorageConfiguration.java (75%) rename ecosystem/tracing/api/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter => kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter (88%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/env/HostExceptionTest.java (94%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/env/IpUtilsTest.java (98%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/ExceptionUtilsTest.java (95%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobConfigurationExceptionTest.java (95%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobExecutionEnvironmentExceptionTest.java (94%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/JobSystemExceptionTest.java (96%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/exception/PropertiesPreconditionsTest.java (97%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/json/GsonFactoryTest.java (94%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/listener/ShardingContextsTest.java (96%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/YamlEngineTest.java (90%) rename {infra/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel}/infra/yaml/fixture/FooYamlConfiguration.java (93%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/JobTracingEventBusTest.java (84%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/event/JobExecutionEventTest.java (97%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/JobEventCaller.java (92%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/JobEventCallerConfiguration.java (87%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/JobEventCallerConverter.java (82%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/TestTracingFailureConfiguration.java (75%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/TestTracingListener.java (80%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/fixture/TestTracingListenerConfiguration.java (80%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/storage/TracingStorageConverterFactoryTest.java (89%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlJobEventCallerConfiguration.java (77%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlJobEventCallerConfigurationConverter.java (76%) rename {ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob => kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal}/tracing/yaml/YamlTracingConfigurationConverterTest.java (88%) rename kernel/src/test/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener => org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener} (100%) rename ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter => kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter (88%) rename ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration => kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration (79%) rename ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter => kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter (89%) rename spring/boot-starter/src/test/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener => org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener} (100%) rename spring/namespace/src/test/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener => org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener} (100%) rename test/e2e/src/test/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener => org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener} (100%) diff --git a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java index 7fd77b094a..317b7a8be3 100644 --- a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java +++ b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java @@ -29,8 +29,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -48,7 +48,7 @@ import java.util.Properties; /** - * Job error handler for send error message via dingtalk. + * Job error handler for send error message via Dingtalk. */ @Slf4j public final class DingtalkJobErrorHandler implements JobErrorHandler { diff --git a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java index de97f1bb88..7d29b7266b 100644 --- a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.elasticjob.error.handler.dingtalk; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; -import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; /** - * Job error handler properties validator for dingtalk. + * Job error handler properties validator for Dingtalk. */ public final class DingtalkJobErrorHandlerPropertiesValidator implements JobErrorHandlerPropertiesValidator { diff --git a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java index bc0557e8c2..75eeea4c07 100644 --- a/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java +++ b/ecosystem/error-handler/type/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.dingtalk; /** - * Job error handler properties constants for send error message via dingtalk. + * Job error handler properties constants for send error message via Dingtalk. */ public final class DingtalkPropertiesConstants { diff --git a/ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler rename to ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/type/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java index 55ddddf94a..518439f457 100644 --- a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.dingtalk; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java index c8d9aa7445..c408d07894 100644 --- a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java +++ b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java @@ -20,8 +20,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.error.handler.dingtalk.fixture.DingtalkInternalController; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; diff --git a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java index 1c2c6c7d5a..a53025da4b 100644 --- a/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java +++ b/ecosystem/error-handler/type/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java @@ -21,7 +21,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import lombok.SneakyThrows; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; import org.apache.shardingsphere.elasticjob.restful.Http; import org.apache.shardingsphere.elasticjob.restful.RestfulController; import org.apache.shardingsphere.elasticjob.restful.annotation.Mapping; diff --git a/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java index 5d48b4b6f8..5c6a478ba9 100644 --- a/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java +++ b/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java @@ -20,7 +20,7 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import javax.mail.Authenticator; import javax.mail.BodyPart; diff --git a/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java index a48e20c50f..6260372047 100644 --- a/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/type/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.error.handler.email; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; -import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; diff --git a/ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler rename to ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/type/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java index 34e7dd76ab..6e99f5b82d 100644 --- a/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.email; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java index 3c216f262d..db91092ec6 100644 --- a/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java +++ b/ecosystem/error-handler/type/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java @@ -20,7 +20,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.BeforeAll; diff --git a/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java b/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java index 496e28d038..a62647fca1 100644 --- a/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java +++ b/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java @@ -28,8 +28,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import java.io.IOException; import java.io.PrintWriter; diff --git a/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java index c2a6947c60..3552dabaa3 100644 --- a/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/type/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; -import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; diff --git a/ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler rename to ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/type/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java index 254e2a0125..778e6ff637 100644 --- a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java index b39cda94d0..4df5094ad0 100644 --- a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java +++ b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java @@ -20,8 +20,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture.WechatInternalController; +import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; diff --git a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java index 90d572abe8..b11169ffcd 100644 --- a/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java +++ b/ecosystem/error-handler/type/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture; import com.google.common.collect.ImmutableMap; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; import org.apache.shardingsphere.elasticjob.restful.Http; import org.apache.shardingsphere.elasticjob.restful.RestfulController; import org.apache.shardingsphere.elasticjob.restful.annotation.Mapping; diff --git a/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java index 75043c96cd..94aaa551b9 100644 --- a/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java +++ b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java @@ -26,9 +26,9 @@ import org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor; import org.apache.shardingsphere.elasticjob.http.pojo.HttpParam; import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionException; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionException; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; import java.io.BufferedReader; import java.io.IOException; diff --git a/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java index 23125c0226..1d52619961 100644 --- a/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java +++ b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java @@ -23,8 +23,8 @@ import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.http.executor.fixture.InternalController; import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionException; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; diff --git a/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java index 3cb9ada910..ded2ddefcf 100644 --- a/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java +++ b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java @@ -25,9 +25,9 @@ import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext; import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; import java.io.IOException; diff --git a/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java b/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java index 5568bb0667..033a84b277 100644 --- a/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java +++ b/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java @@ -22,8 +22,8 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext; import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; import org.junit.jupiter.api.BeforeEach; diff --git a/ecosystem/tracing/api/pom.xml b/ecosystem/tracing/api/pom.xml deleted file mode 100644 index 78dabbd173..0000000000 --- a/ecosystem/tracing/api/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - 4.0.0 - - org.apache.shardingsphere.elasticjob - elasticjob-tracing - 3.1.0-SNAPSHOT - - elasticjob-tracing-api - ${project.artifactId} - - - - org.apache.shardingsphere.elasticjob - elasticjob-api - ${project.parent.version} - - - org.apache.shardingsphere.elasticjob - elasticjob-infra - ${project.parent.version} - - - - org.apache.shardingsphere.elasticjob - elasticjob-test-util - ${project.parent.version} - test - - - - org.apache.commons - commons-lang3 - - - - org.awaitility - awaitility - - - diff --git a/ecosystem/tracing/api/src/test/resources/logback-test.xml b/ecosystem/tracing/api/src/test/resources/logback-test.xml deleted file mode 100644 index dbd01b8d51..0000000000 --- a/ecosystem/tracing/api/src/test/resources/logback-test.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ${log.context.name} - - - - - - ERROR - - - ${log.pattern} - - - - - - - - - - diff --git a/ecosystem/tracing/pom.xml b/ecosystem/tracing/pom.xml index c158d86e54..0e7c871578 100644 --- a/ecosystem/tracing/pom.xml +++ b/ecosystem/tracing/pom.xml @@ -28,7 +28,6 @@ ${project.artifactId} - api rdb diff --git a/ecosystem/tracing/rdb/pom.xml b/ecosystem/tracing/rdb/pom.xml index 8156d0e1d4..1bf77c6f3a 100644 --- a/ecosystem/tracing/rdb/pom.xml +++ b/ecosystem/tracing/rdb/pom.xml @@ -29,7 +29,7 @@ org.apache.shardingsphere.elasticjob - elasticjob-tracing-api + elasticjob-kernel ${project.parent.version} diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java index 63434bf611..b4144aa5e3 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java @@ -24,7 +24,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import javax.sql.DataSource; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java index f42152c514..518954e388 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java @@ -19,14 +19,13 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; import javax.sql.DataSource; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** - * Mapping {@link TracingStorageConfiguration} to {@link DataSource}. + * Mapping tracing storage configuration} to data source. */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class DataSourceRegistry { diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java index 40475c1677..e4a809b477 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingStorageUnavailableException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingStorageUnavailableException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter; import javax.sql.DataSource; import java.sql.Connection; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java index 87b4a907bd..cc67e3318d 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage; import javax.sql.DataSource; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java index 397f78c338..cb47480ec1 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java index 37e93759bd..0d4873e6bb 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java @@ -19,11 +19,11 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; -import org.apache.shardingsphere.elasticjob.tracing.exception.WrapException; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.WrapException; import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType; import org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DefaultDatabaseType; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; @@ -82,8 +82,8 @@ public static RDBJobEventStorage getInstance(final DataSource dataSource) throws return wrapException(() -> STORAGE_MAP.computeIfAbsent(dataSource, ds -> { try { return new RDBJobEventStorage(ds); - } catch (SQLException e) { - throw new WrapException(e); + } catch (final SQLException ex) { + throw new WrapException(ex); } })); } @@ -98,11 +98,11 @@ public static RDBJobEventStorage getInstance(final DataSource dataSource) throws public static RDBJobEventStorage wrapException(final Supplier supplier) throws SQLException { try { return supplier.get(); - } catch (WrapException e) { - if (e.getCause() instanceof SQLException) { - throw new SQLException(e.getCause()); + } catch (final WrapException ex) { + if (ex.getCause() instanceof SQLException) { + throw new SQLException(ex.getCause()); } - throw e; + throw ex; } } diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java index 253d954efd..56447cb57a 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java @@ -19,9 +19,9 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml.YamlTracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.yaml.YamlTracingStorageConfiguration; import javax.sql.DataSource; import java.util.LinkedHashMap; @@ -30,8 +30,8 @@ /** * YAML Data source configuration. */ -@Setter @Getter +@Setter public final class YamlDataSourceConfiguration implements YamlTracingStorageConfiguration { private static final long serialVersionUID = -8013707594458676772L; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java index 28ec2d65af..66dca491f0 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml.YamlTracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.yaml.YamlTracingStorageConfiguration; import javax.sql.DataSource; diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter similarity index 100% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration similarity index 100% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter similarity index 100% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java index aadde04a23..dcc49e0951 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource; import com.zaxxer.hikari.HikariDataSource; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingStorageUnavailableException; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverterFactory; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingStorageUnavailableException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverterFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java index 781b3652fe..eae9b3e7bb 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java index 738fe3f344..742a935f18 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java @@ -18,13 +18,13 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.JobTracingEventBus; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java index b79ebd3cd9..937b507a2c 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.storage; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java index 06ccb4aa55..2df52bccec 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml; import org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.yaml.YamlTracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml.YamlTracingStorageConfiguration; import org.junit.jupiter.api.Test; import javax.sql.DataSource; diff --git a/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java index 975ecadd04..ae3b30aae7 100644 --- a/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java +++ b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java @@ -33,7 +33,7 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import javax.sql.DataSource; import java.io.IOException; diff --git a/infra/pom.xml b/infra/pom.xml deleted file mode 100644 index 1a0a2aa4fa..0000000000 --- a/infra/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - 4.0.0 - - org.apache.shardingsphere.elasticjob - elasticjob - 3.1.0-SNAPSHOT - - elasticjob-infra - ${project.artifactId} - - - - org.apache.shardingsphere.elasticjob - elasticjob-api - ${project.parent.version} - - - - org.apache.shardingsphere.elasticjob - elasticjob-test-util - ${project.parent.version} - test - - - - org.apache.commons - commons-lang3 - - - org.yaml - snakeyaml - - - com.google.code.gson - gson - - - - org.awaitility - awaitility - - - diff --git a/infra/src/test/resources/logback-test.xml b/infra/src/test/resources/logback-test.xml deleted file mode 100644 index 060ba6530c..0000000000 --- a/infra/src/test/resources/logback-test.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - ${log.context.name} - - - - - - ERROR - - - ${log.pattern} - - - - - - - - - diff --git a/kernel/pom.xml b/kernel/pom.xml index b126a12b1c..ae63a8371e 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -32,11 +32,6 @@ elasticjob-api ${project.parent.version} - - org.apache.shardingsphere.elasticjob - elasticjob-infra - ${project.parent.version} - org.apache.shardingsphere.elasticjob elasticjob-error-handler-spi diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java index ce628253b2..023f12fef2 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java @@ -20,9 +20,9 @@ import lombok.Setter; import org.apache.shardingsphere.elasticjob.kernel.internal.util.BlockUtils; import org.apache.shardingsphere.elasticjob.kernel.internal.time.TimeService; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeService; import java.util.Set; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/constant/ExecutionType.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/constant/ExecutionType.java similarity index 93% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/constant/ExecutionType.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/constant/ExecutionType.java index 538f68ab13..5149b9786a 100755 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/constant/ExecutionType.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/constant/ExecutionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.constant; +package org.apache.shardingsphere.elasticjob.kernel.infra.constant; /** * Execution type. diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostException.java similarity index 94% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostException.java index 56e1423199..5a51219058 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/HostException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.env; +package org.apache.shardingsphere.elasticjob.kernel.infra.env; import java.io.IOException; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtils.java similarity index 99% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtils.java index c5ddbefe5a..9d803e96d6 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtils.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.env; +package org.apache.shardingsphere.elasticjob.kernel.infra.env; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtils.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtils.java index 7a127b60d5..825dee4dd6 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtils.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationException.java similarity index 94% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationException.java index dc8bcee988..5860775304 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; /** * Job configuration exception. diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentException.java similarity index 94% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentException.java index 95245b9f72..71a9b8477b 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; /** * Job execution environment exception. diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionException.java similarity index 93% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionException.java index e5265a55aa..8a5579cc64 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; /** * Job execution exception. diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemException.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemException.java index 914540e30b..18c5fa8521 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; /** * Job system exception. diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditions.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditions.java similarity index 96% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditions.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditions.java index 60aaecde66..90b1d17363 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditions.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import com.google.common.base.Preconditions; import lombok.AccessLevel; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactory.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactory.java index 23bddddfdc..9f867ece27 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.json; +package org.apache.shardingsphere.elasticjob.kernel.infra.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ElasticJobListener.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ElasticJobListener.java index 87eabd3f13..e92d72e2d9 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.listener; +package org.apache.shardingsphere.elasticjob.kernel.infra.listener; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContexts.java similarity index 97% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContexts.java index e1db270f87..aef13ca19d 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContexts.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContexts.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.listener; +package org.apache.shardingsphere.elasticjob.kernel.infra.listener; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngine.java similarity index 92% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngine.java index f5760d8c22..1e75393584 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngine.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.yaml.representer.ElasticJobYamlRepresenter; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.representer.ElasticJobYamlRepresenter; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java similarity index 93% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java index 0b2d8bf0cb..0dc414979d 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml.config; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config; import java.io.Serializable; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java index 29ad03bb71..1e38b4028c 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverter.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml.config; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/DefaultYamlTupleProcessor.java similarity index 96% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/DefaultYamlTupleProcessor.java index 480b5d8dfc..2fa2272755 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/DefaultYamlTupleProcessor.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/DefaultYamlTupleProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml.representer; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.representer; import org.yaml.snakeyaml.nodes.CollectionNode; import org.yaml.snakeyaml.nodes.MappingNode; diff --git a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/ElasticJobYamlRepresenter.java similarity index 95% rename from infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/ElasticJobYamlRepresenter.java index aa13ff780a..c448779f17 100644 --- a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/representer/ElasticJobYamlRepresenter.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/representer/ElasticJobYamlRepresenter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml.representer; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.representer; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.introspector.Property; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java index 93d5b64464..ac284830af 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; import org.apache.shardingsphere.elasticjob.api.JobExtraConfigurationFactory; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import java.util.Optional; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java index 10fe3842ba..971f6ad8cd 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java @@ -19,12 +19,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.kernel.internal.time.TimeService; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; /** * Configuration service. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java index 6419da3072..1d9a912412 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java @@ -21,8 +21,8 @@ import lombok.Setter; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.ArrayList; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java index fe492a14a6..304d269d5f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java @@ -19,7 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java index f8cdabbd8a..2a4f8ad652 100755 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; import java.util.Collections; import java.util.List; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutor.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutor.java index 6cc6b781a1..121080acd5 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutor.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutor.java @@ -26,13 +26,13 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.executor.item.JobItemExecutorFactory; import org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.threadpool.ExecutorServiceReloader; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.exception.ExceptionUtils; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent.ExecutionSource; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.ExceptionUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent.ExecutionSource; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.Collection; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacade.java index 49c3ed6092..3f30a58c0d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacade.java @@ -20,9 +20,9 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.context.TaskContext; import org.apache.shardingsphere.elasticjob.kernel.internal.failover.FailoverService; @@ -31,11 +31,11 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.JobTracingEventBus; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; import java.util.Collection; import java.util.Comparator; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandler.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandler.java index 22afad06e1..008604f82b 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandler.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandler.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.general; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; /** * Job error handler for throw exception. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactory.java index f2a9848f84..9f362441f8 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactory.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.spi.JobItemExecutor; import org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java index 4c727a4d0d..f64279ccbe 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationNode; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java index d0c8937da4..7c257f79a9 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java index a1df049f67..33fb5d335e 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java index be0aed258f..97bde398f5 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.instance; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java index 5d3e03e687..5cb59ebaad 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.kernel.internal.trigger.TriggerNode; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java index 23e09bebd5..719cf499cd 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.config.RescheduleListenerManager; import org.apache.shardingsphere.elasticjob.kernel.internal.election.ElectionListenerManager; import org.apache.shardingsphere.elasticjob.kernel.internal.failover.FailoverListenerManager; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java index 00ad6a137f..e8daa73cbb 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; import org.quartz.JobDetail; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java index 245a64bb26..4c2865afe9 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java @@ -24,17 +24,17 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.ElasticJobExecutor; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.JobFacade; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeService; import org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProviderFactory; import org.apache.shardingsphere.elasticjob.kernel.internal.setup.SetUpFacade; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java index 45cbdd0d88..6e663d5327 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; import java.util.Objects; import java.util.regex.Pattern; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java index d0c1e7be12..d1d8843975 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.setup; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; import org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerManager; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java index 1aa21f9bd6..18075c0625 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java index b918e4edfa..1cb8799dc3 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java index 02ce1e2f3e..2f7bbfdcaa 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java @@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; import java.lang.management.ManagementFactory; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java index 21e71013ca..a75f5fc376 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationNode; import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParameters.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParameters.java index e2fc8bca8c..91560ab971 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParameters.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParameters.java @@ -20,7 +20,7 @@ import com.google.common.base.Strings; import lombok.AllArgsConstructor; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import java.util.Collections; import java.util.HashMap; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java index 9b4d2e4489..909d66ce2f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationNode; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java index c4e2f1e98c..0ef230969e 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.kernel.internal.util.BlockUtils; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode; diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBus.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBus.java similarity index 88% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBus.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBus.java index 003e03837c..1f8d43d10e 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBus.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBus.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing; import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.EventBus; import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.event.JobEvent; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.concurrent.ExecutorService; diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingConfiguration.java similarity index 84% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingConfiguration.java index 7bd2343d69..6163ebdfe3 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingConfiguration.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.api; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingStorageConverterNotFoundException; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverterFactory; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingStorageConverterNotFoundException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverterFactory; /** * Tracing configuration. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingStorageConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingStorageConfiguration.java similarity index 93% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingStorageConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingStorageConfiguration.java index c051dd54e4..6318349020 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/api/TracingStorageConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/api/TracingStorageConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.api; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api; /** * Tracing storage configuration. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobEvent.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobEvent.java similarity index 92% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobEvent.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobEvent.java index 68f2241670..ac52eb0a41 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobEvent.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.event; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event; /** * Job event. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEvent.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEvent.java similarity index 97% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEvent.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEvent.java index 183c34aff1..71bad519d0 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEvent.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.event; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event; import lombok.AllArgsConstructor; import lombok.Getter; @@ -28,8 +28,8 @@ /** * Job execution event. */ -@RequiredArgsConstructor @AllArgsConstructor +@RequiredArgsConstructor @Getter public final class JobExecutionEvent implements JobEvent { diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobStatusTraceEvent.java similarity index 91% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobStatusTraceEvent.java index 7a95a30c74..0447deadae 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobStatusTraceEvent.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.event; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; import java.util.Date; import java.util.UUID; diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingConfigurationException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingConfigurationException.java similarity index 93% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingConfigurationException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingConfigurationException.java index 067e82cd1a..1776783f60 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingConfigurationException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.exception; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception; /** * Tracing configuration exception. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageConverterNotFoundException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageConverterNotFoundException.java similarity index 87% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageConverterNotFoundException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageConverterNotFoundException.java index cecc6176c1..9190c3bef0 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageConverterNotFoundException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageConverterNotFoundException.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.exception; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter; /** * {@link TracingStorageConverter} not found exception. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageUnavailableException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageUnavailableException.java similarity index 93% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageUnavailableException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageUnavailableException.java index f3fac7f2a7..cb9bdcb7bf 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/TracingStorageUnavailableException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/TracingStorageUnavailableException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.exception; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception; /** * Tracing storage unavailable exception. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/WrapException.java similarity index 92% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/WrapException.java index 8e776a8d76..693ea2bcf2 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/exception/WrapException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.exception; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception; /** * Use to wrap Exception. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListener.java similarity index 84% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListener.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListener.java index b9ac000265..7aac02be30 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListener.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener; import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; /** * Tracing listener. diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListenerConfiguration.java similarity index 88% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListenerConfiguration.java index 190dce213a..5bb0345af5 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/listener/TracingListenerConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverter.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverter.java similarity index 88% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverter.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverter.java index 559821e4e9..9371997f13 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverter.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; /** diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactory.java similarity index 95% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactory.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactory.java index b326c1ee39..d1bf19840b 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfiguration.java similarity index 82% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfiguration.java index 8069c4416e..9181fb097a 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfiguration.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; /** - * YAML configuration for {@link org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration}. + * YAML configuration for {@link org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration}. * * @param type of storage */ diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverter.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverter.java similarity index 84% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverter.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverter.java index d605fcce51..60d97f5501 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverter.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverter.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; /** diff --git a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingStorageConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingStorageConfiguration.java similarity index 75% rename from ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingStorageConfiguration.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingStorageConfiguration.java index 1e50d9ee33..3ed9605380 100644 --- a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingStorageConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingStorageConfiguration.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; /** - * YAML configuration for {@link org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration}. + * YAML configuration for {@link org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration}. * * @param type of storage */ diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java index ae23f403f3..e48b56938f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; import java.util.HashMap; import java.util.List; diff --git a/ecosystem/tracing/api/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter b/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter similarity index 88% rename from ecosystem/tracing/api/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter rename to kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter index e353bc066f..3582dc2b6c 100644 --- a/ecosystem/tracing/api/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter +++ b/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.tracing.yaml.YamlTracingConfigurationConverter +org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml.YamlTracingConfigurationConverter diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java index 8b4b57f30b..5763e0a097 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java @@ -19,8 +19,8 @@ import com.google.common.collect.Sets; import org.apache.shardingsphere.elasticjob.kernel.internal.time.TimeService; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.ElasticJobListenerCaller; import org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.TestDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeService; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java index abdd4f049c..f358d01b19 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; public final class TestDistributeOnceElasticJobListener extends AbstractDistributeOnceElasticJobListener { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java index c21bb39f05..07a07b03ec 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; @RequiredArgsConstructor public final class TestElasticJobListener implements ElasticJobListener { diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostExceptionTest.java similarity index 94% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostExceptionTest.java index db2d8b26a6..c853915d79 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/HostExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.env; +package org.apache.shardingsphere.elasticjob.kernel.infra.env; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtilsTest.java similarity index 98% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtilsTest.java index eb3bf70137..6e9ca993a8 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/env/IpUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.env; +package org.apache.shardingsphere.elasticjob.kernel.infra.env; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtilsTest.java similarity index 95% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtilsTest.java index 2739b42350..1822916cd2 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/ExceptionUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationExceptionTest.java similarity index 95% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationExceptionTest.java index 4605f68929..4a2e1e0ad5 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobConfigurationExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentExceptionTest.java similarity index 94% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentExceptionTest.java index fbbaf78cf6..32b03a6d23 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobExecutionEnvironmentExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemExceptionTest.java similarity index 96% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemExceptionTest.java index 89c2c78a10..9b95a2f136 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/JobSystemExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditionsTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditionsTest.java similarity index 97% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditionsTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditionsTest.java index 7500c99b92..66acf47a51 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/PropertiesPreconditionsTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/exception/PropertiesPreconditionsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.exception; +package org.apache.shardingsphere.elasticjob.kernel.infra.exception; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactoryTest.java similarity index 94% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactoryTest.java index e74291385b..d35e63092a 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/json/GsonFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.json; +package org.apache.shardingsphere.elasticjob.kernel.infra.json; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContextsTest.java similarity index 96% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContextsTest.java index 51845f3f2e..b906c08f18 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/listener/ShardingContextsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.listener; +package org.apache.shardingsphere.elasticjob.kernel.infra.listener; import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext; import org.junit.jupiter.api.Test; diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngineTest.java similarity index 90% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngineTest.java index 1e830b65ad..7199a04d88 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/YamlEngineTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml; -import org.apache.shardingsphere.elasticjob.infra.yaml.fixture.FooYamlConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.fixture.FooYamlConfiguration; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; @@ -34,10 +34,6 @@ class YamlEngineTest { private static final String YAML_WITH_NULL = "foo: foo\n"; - private static final String PREFIX = "nest"; - - private static final String PREFIX2 = "nest.bar"; - @Test void assertMarshal() { FooYamlConfiguration actual = new FooYamlConfiguration(); diff --git a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/fixture/FooYamlConfiguration.java similarity index 93% rename from infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/fixture/FooYamlConfiguration.java index b158498558..49be0f3517 100644 --- a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/fixture/FooYamlConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/fixture/FooYamlConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.infra.yaml.fixture; +package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.fixture; import lombok.Getter; import lombok.Setter; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java index 62d8c8e150..8597fa7fb9 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java @@ -19,9 +19,9 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.fixture.YamlConstants; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJOTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJOTest.java index 6bcd353293..b7605b3826 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJOTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJOTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.config; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java index 4b997dbbab..2f94916b00 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.context; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; import org.apache.shardingsphere.elasticjob.kernel.internal.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture.TaskNode; import org.hamcrest.CoreMatchers; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java index 295d11302d..44e8fc50de 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture; import lombok.Builder; -import org.apache.shardingsphere.elasticjob.infra.constant.ExecutionType; +import org.apache.shardingsphere.elasticjob.kernel.infra.constant.ExecutionType; @Builder public final class TaskNode { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutorTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutorTest.java index fba118dce3..00ad0cc887 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutorTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/ElasticJobExecutorTest.java @@ -18,14 +18,14 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.fixture.executor.ClassedFooJobExecutor; import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent.State; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacadeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacadeTest.java index b84c0191d2..857df35c59 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacadeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/JobFacadeTest.java @@ -19,8 +19,8 @@ import com.google.common.collect.Lists; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.ElasticJobListenerCaller; import org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.TestElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; @@ -29,7 +29,7 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.JobTracingEventBus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandlerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandlerTest.java index 4864a8a8c9..3b7636a1eb 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandlerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/error/handler/general/ThrowJobErrorHandlerTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.general; import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java index b84d952c60..6c5fccc8de 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.executor.item; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.kernel.fixture.executor.ClassedFooJobExecutor; import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java index 8de42c1832..f8d0ac368d 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java index 0db9a27296..8f1a6d6426 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java index b85551f921..6a786c9ada 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java index 04f2c930a2..d0571998e0 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java @@ -19,7 +19,7 @@ import com.google.common.collect.Lists; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java index e66d54fdcc..f7eb3d7274 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java index 64f7131bda..2894c10cf2 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParametersTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParametersTest.java index 661db7c863..a487fde7c2 100755 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParametersTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingItemParametersTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; -import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBusTest.java similarity index 84% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBusTest.java index 8b5d50161c..3de513c0b6 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/JobTracingEventBusTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing; import com.google.common.eventbus.EventBus; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCaller; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.TestTracingListener; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.event.JobEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; -import org.apache.shardingsphere.elasticjob.tracing.fixture.TestTracingListener; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEventTest.java similarity index 97% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEventTest.java index e83d4b886e..fd37cc6665 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/event/JobExecutionEventTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.event; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event; import org.junit.jupiter.api.Test; diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCaller.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCaller.java similarity index 92% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCaller.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCaller.java index 1d454862bb..a6459bef75 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCaller.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCaller.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; public interface JobEventCaller { diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConfiguration.java similarity index 87% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConfiguration.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConfiguration.java index 1a9d01cf56..d2f0deaeb9 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConfiguration.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; /** * {@link TracingStorageConfiguration} for {@link JobEventCaller}. diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConverter.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConverter.java similarity index 82% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConverter.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConverter.java index d46ed55ab0..99ebded974 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/JobEventCallerConverter.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/JobEventCallerConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter; /** * {@link TracingStorageConverter} for {@link JobEventCaller}. diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingFailureConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingFailureConfiguration.java similarity index 75% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingFailureConfiguration.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingFailureConfiguration.java index 7f6cfdf40c..9f59e4bda3 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingFailureConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingFailureConfiguration.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener; -import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException; public final class TestTracingFailureConfiguration implements TracingListenerConfiguration { diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListener.java similarity index 80% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListener.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListener.java index d29b840f2a..5262686da5 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListener.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener; -import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent; @RequiredArgsConstructor public final class TestTracingListener implements TracingListener { diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListenerConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListenerConfiguration.java similarity index 80% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListenerConfiguration.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListenerConfiguration.java index d87fb5e432..fe0d6b262f 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/fixture/TestTracingListenerConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/fixture/TestTracingListenerConfiguration.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.fixture; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener; public final class TestTracingListenerConfiguration implements TracingListenerConfiguration { diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactoryTest.java similarity index 89% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactoryTest.java index 760fc956a0..c142e22fd8 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/storage/TracingStorageConverterFactoryTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCaller; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfiguration.java similarity index 77% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfiguration.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfiguration.java index d1a0fda903..938c93989b 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfiguration.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCallerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCaller; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCallerConfiguration; /** * YAML JobEventCaller configuration. diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfigurationConverter.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfigurationConverter.java similarity index 76% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfigurationConverter.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfigurationConverter.java index b25b87ebfa..c6b780f95b 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlJobEventCallerConfigurationConverter.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlJobEventCallerConfigurationConverter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; -import org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCallerConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCaller; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCallerConfiguration; /** * YAML JobEventCaller configuration converter. diff --git a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverterTest.java similarity index 88% rename from ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverterTest.java index afb26ba851..d33ff13e8e 100644 --- a/ecosystem/tracing/api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/tracing/yaml/YamlTracingConfigurationConverterTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.tracing.yaml; +package org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCaller; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener diff --git a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter similarity index 88% rename from ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter index 19d25e62c0..228b68f8e7 100644 --- a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.yaml.config.YamlConfigurationConverter +++ b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.tracing.yaml.YamlJobEventCallerConfigurationConverter +org.apache.shardingsphere.elasticjob.kernel.internal.tracing.yaml.YamlJobEventCallerConfigurationConverter diff --git a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration similarity index 79% rename from ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration index 6abb615a86..1773d05041 100644 --- a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration +++ b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration @@ -15,5 +15,5 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.tracing.fixture.TestTracingListenerConfiguration -org.apache.shardingsphere.elasticjob.tracing.fixture.TestTracingFailureConfiguration +org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.TestTracingListenerConfiguration +org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.TestTracingFailureConfiguration diff --git a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter similarity index 89% rename from ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter index 73f32b36b2..98c255109d 100644 --- a/ecosystem/tracing/api/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter +++ b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCallerConverter +org.apache.shardingsphere.elasticjob.kernel.internal.tracing.fixture.JobEventCallerConverter diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java index 989ddf5811..87f7503776 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java index 14a6cea1b6..ed84d4bcf2 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.JobConfigurationAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; /** * Job Configuration API implementation class. diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java index 246d678c36..28a33ed233 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI; import org.apache.shardingsphere.elasticjob.lifecycle.domain.JobBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import java.util.ArrayList; import java.util.Collection; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java index 5ddf90e87f..954664eabb 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java @@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI; import org.apache.shardingsphere.elasticjob.lifecycle.domain.ServerBriefInfo; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java index 69294e87fb..678343b3f6 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java @@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI; import org.apache.shardingsphere.elasticjob.lifecycle.domain.ShardingInfo; diff --git a/pom.xml b/pom.xml index 3325080949..df518fb764 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,6 @@ api registry-center bootstrap - infra kernel lifecycle restful diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java index fb848b9d42..c1d53bffae 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.elasticjob.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.config.SingletonBeanRegistry; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java index 86233220c1..2b285ce337 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.tracing; import com.zaxxer.hikari.HikariDataSource; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java index 867b6feef1..32309c4462 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties; import org.apache.shardingsphere.elasticjob.test.util.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java index b55e1c8d91..13c318edb6 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; /** * Log elastic job listener. diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java index cf1940c2eb..665f92614f 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; /** * No operation elastic job listener. diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java index c88e187d7f..d9b7d9ced6 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.tracing; import org.apache.shardingsphere.elasticjob.test.util.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.ObjectProvider; diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener similarity index 100% rename from spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener rename to spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java index 6410b752a8..0df6f6ea48 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java @@ -20,7 +20,7 @@ import java.lang.reflect.Field; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; +import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.springframework.aop.framework.AdvisedSupport; import org.springframework.aop.support.AopUtils; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java index 1111f03d12..d75b455f18 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.tracing.parser; import org.apache.shardingsphere.elasticjob.spring.namespace.tracing.tag.TracingBeanDefinitionTag; -import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; +import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingConfiguration; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java index 2ff8f3a8ae..33ba3e5e77 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java index 91be80eee8..93cd094514 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java index 52bf6ff235..fc083672bd 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java index 8336f7ecda..a971943670 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener similarity index 100% rename from spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener rename to spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java index 63328bd417..e23072f521 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.test.e2e.annotation; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/ScheduleEnabledJobE2ETest.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/ScheduleEnabledJobE2ETest.java index cd1f8bce56..d8162f688f 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/ScheduleEnabledJobE2ETest.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/ScheduleEnabledJobE2ETest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.test.e2e.annotation; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/disable/DisabledJobE2ETest.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/disable/DisabledJobE2ETest.java index 32feed6ac0..6ca929fb4b 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/disable/DisabledJobE2ETest.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/disable/DisabledJobE2ETest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.disable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/enable/EnabledJobE2ETest.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/enable/EnabledJobE2ETest.java index 6544c390f6..8dac7cda36 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/enable/EnabledJobE2ETest.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/enable/EnabledJobE2ETest.java @@ -19,9 +19,9 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; +import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.kernel.internal.config.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.test.e2e.raw.BaseE2ETest; import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/DistributeOnceE2EFixtureJobListener.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/DistributeOnceE2EFixtureJobListener.java index 24fa928f9e..19181cbf65 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/DistributeOnceE2EFixtureJobListener.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/DistributeOnceE2EFixtureJobListener.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; public class DistributeOnceE2EFixtureJobListener extends AbstractDistributeOnceElasticJobListener { diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/E2EFixtureJobListener.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/E2EFixtureJobListener.java index efa4bfa82a..0ded3ad091 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/E2EFixtureJobListener.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/listener/E2EFixtureJobListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.listener; -import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.infra.listener.ShardingContexts; public class E2EFixtureJobListener implements ElasticJobListener { diff --git a/test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener similarity index 100% rename from test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener rename to test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.listener.ElasticJobListener