From cbb59f5d475dbf24c11f7c6a7dfc04b9b883c868 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 15:11:51 +0800 Subject: [PATCH] =?UTF-8?q?Refactor=20elasticjob-engine=20module=E2=80=98s?= =?UTF-8?q?=20package=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/content/faq/_index.cn.md | 2 +- docs/content/faq/_index.en.md | 2 +- .../configuration/spring-boot-starter.cn.md | 4 ++-- .../configuration/spring-boot-starter.en.md | 4 ++-- .../usage/job-api/spring-namespace.cn.md | 2 +- .../usage/job-api/spring-namespace.en.md | 2 +- .../example/EmbedZookeeperServer.java | 2 +- .../example/fixture/entity/Foo.java | 2 +- .../fixture/repository/FooRepository.java | 4 ++-- .../repository/FooRepositoryFactory.java | 2 +- .../example/job/dataflow/JavaDataflowJob.java | 8 +++---- .../job/dataflow/SpringDataflowJob.java | 6 ++--- .../example/job/simple/JavaOccurErrorJob.java | 2 +- .../example/job/simple/JavaSimpleJob.java | 8 +++---- .../example/job/simple/SpringSimpleJob.java | 6 ++--- .../{lite => }/example/JavaMain.java | 12 +++++----- .../{lite => }/example/SpringMain.java | 2 +- .../META-INF/application-context.xml | 14 ++++++------ .../{engine => }/example/SpringBootMain.java | 2 +- .../controller/OneOffJobController.java | 7 +++--- .../{engine => }/example/entity/Foo.java | 2 +- .../example/job/SpringBootDataflowJob.java | 6 ++--- ...SpringBootOccurErrorNoticeDingtalkJob.java | 2 +- .../SpringBootOccurErrorNoticeEmailJob.java | 2 +- .../SpringBootOccurErrorNoticeWechatJob.java | 2 +- .../example/job/SpringBootSimpleJob.java | 6 ++--- .../example/repository/FooRepository.java | 4 ++-- .../src/main/resources/application.yml | 10 ++++----- .../api/bootstrap/JobBootstrap.java | 2 +- .../bootstrap/impl/OneOffJobBootstrap.java | 10 ++++----- .../bootstrap/impl/ScheduleJobBootstrap.java | 8 +++---- ...tractDistributeOnceElasticJobListener.java | 4 ++-- .../api/registry/JobInstanceRegistry.java | 8 +++---- .../annotation/JobAnnotationBuilder.java | 2 +- .../internal/config/ConfigurationNode.java | 4 ++-- .../internal/config/ConfigurationService.java | 4 ++-- .../config/RescheduleListenerManager.java | 6 ++--- .../election/ElectionListenerManager.java | 12 +++++----- .../internal/election/LeaderNode.java | 4 ++-- .../internal/election/LeaderService.java | 8 +++---- .../failover/FailoverListenerManager.java | 18 +++++++-------- .../internal/failover/FailoverNode.java | 8 +++---- .../internal/failover/FailoverService.java | 14 ++++++------ .../guarantee/GuaranteeListenerManager.java | 6 ++--- .../internal/guarantee/GuaranteeNode.java | 4 ++-- .../internal/guarantee/GuaranteeService.java | 8 +++---- .../internal/instance/InstanceNode.java | 6 ++--- .../internal/instance/InstanceService.java | 8 +++---- .../instance/ShutdownListenerManager.java | 8 +++---- .../listener/AbstractListenerManager.java | 4 ++-- .../internal/listener/ListenerManager.java | 20 ++++++++--------- .../listener/ListenerNotifierManager.java | 2 +- ...RegistryCenterConnectionStateListener.java | 14 ++++++------ .../internal/reconcile/ReconcileService.java | 8 +++---- .../internal/schedule/JobRegistry.java | 4 ++-- .../schedule/JobScheduleController.java | 2 +- .../internal/schedule/JobScheduler.java | 12 +++++----- .../schedule/JobShutdownHookPlugin.java | 6 ++--- .../internal/schedule/JobTriggerListener.java | 6 ++--- .../internal/schedule/LiteJob.java | 2 +- .../internal/schedule/LiteJobFacade.java | 12 +++++----- .../internal/schedule/SchedulerFacade.java | 8 +++---- .../internal/server/ServerNode.java | 6 ++--- .../internal/server/ServerService.java | 8 +++---- .../internal/server/ServerStatus.java | 2 +- .../setup/DefaultJobClassNameProvider.java | 2 +- .../internal/setup/JobClassNameProvider.java | 2 +- .../setup/JobClassNameProviderFactory.java | 2 +- .../internal/setup/SetUpFacade.java | 12 +++++----- .../sharding/ExecutionContextService.java | 8 +++---- .../internal/sharding/ExecutionService.java | 8 +++---- .../MonitorExecutionListenerManager.java | 6 ++--- .../sharding/ShardingListenerManager.java | 16 +++++++------- .../internal/sharding/ShardingNode.java | 6 ++--- .../internal/sharding/ShardingService.java | 18 +++++++-------- .../internal/snapshot/SnapshotService.java | 4 ++-- .../internal/storage/JobNodePath.java | 2 +- .../internal/storage/JobNodeStorage.java | 4 ++-- .../trigger/TriggerListenerManager.java | 6 ++--- .../internal/trigger/TriggerNode.java | 6 ++--- .../internal/trigger/TriggerService.java | 4 ++-- .../internal/util/SensitiveInfoUtils.java | 2 +- .../impl/OneOffJobBootstrapTest.java | 8 +++---- .../DistributeOnceElasticJobListenerTest.java | 10 ++++----- .../fixture/ElasticJobListenerCaller.java | 2 +- .../TestDistributeOnceElasticJobListener.java | 4 ++-- .../fixture/TestElasticJobListener.java | 2 +- .../api/registry/JobInstanceRegistryTest.java | 2 +- .../fixture/EmbedTestingServer.java | 2 +- .../fixture/LiteYamlConstants.java | 2 +- .../executor/ClassedFooJobExecutor.java | 4 ++-- .../fixture/job/AnnotationSimpleJob.java | 2 +- .../fixture/job/AnnotationUnShardingJob.java | 2 +- .../fixture/job/DetailedFooJob.java | 2 +- .../fixture/job/FooJob.java | 2 +- .../integrate/BaseIntegrateTest.java | 16 +++++++------- .../disable/DisabledJobIntegrateTest.java | 12 +++++----- .../OneOffDisabledJobIntegrateTest.java | 2 +- .../ScheduleDisabledJobIntegrateTest.java | 8 +++---- .../enable/EnabledJobIntegrateTest.java | 10 ++++----- .../enable/OneOffEnabledJobIntegrateTest.java | 4 ++-- .../ScheduleEnabledJobIntegrateTest.java | 4 ++-- .../TestDistributeOnceElasticJobListener.java | 4 ++-- .../listener/TestElasticJobListener.java | 2 +- .../annotation/JobAnnotationBuilderTest.java | 4 ++-- .../integrate/BaseAnnotationTest.java | 18 +++++++-------- .../integrate/OneOffEnabledJobTest.java | 8 +++---- .../integrate/ScheduleEnabledJobTest.java | 8 +++---- .../config/ConfigurationNodeTest.java | 2 +- .../config/ConfigurationServiceTest.java | 10 ++++----- .../config/RescheduleListenerManagerTest.java | 12 +++++----- .../election/ElectionListenerManagerTest.java | 14 ++++++------ .../internal/election/LeaderNodeTest.java | 2 +- .../internal/election/LeaderServiceTest.java | 14 ++++++------ .../failover/FailoverListenerManagerTest.java | 22 +++++++++---------- .../internal/failover/FailoverNodeTest.java | 2 +- .../failover/FailoverServiceTest.java | 14 ++++++------ .../GuaranteeListenerManagerTest.java | 8 +++---- .../internal/guarantee/GuaranteeNodeTest.java | 2 +- .../guarantee/GuaranteeServiceTest.java | 10 ++++----- .../internal/instance/InstanceNodeTest.java | 4 ++-- .../instance/InstanceServiceTest.java | 10 ++++----- .../instance/ShutdownListenerManagerTest.java | 12 +++++----- .../listener/ListenerManagerTest.java | 22 +++++++++---------- .../listener/ListenerNotifierManagerTest.java | 2 +- ...stryCenterConnectionStateListenerTest.java | 16 +++++++------- .../reconcile/ReconcileServiceTest.java | 10 ++++----- .../internal/schedule/JobRegistryTest.java | 4 ++-- .../schedule/JobScheduleControllerTest.java | 4 ++-- .../schedule/JobTriggerListenerTest.java | 6 ++--- .../internal/schedule/LiteJobFacadeTest.java | 18 +++++++-------- .../schedule/SchedulerFacadeTest.java | 8 +++---- .../internal/server/ServerNodeTest.java | 4 ++-- .../internal/server/ServerServiceTest.java | 10 ++++----- .../DefaultJobClassNameProviderTest.java | 10 ++++----- .../JobClassNameProviderFactoryTest.java | 2 +- .../internal/setup/SetUpFacadeTest.java | 16 +++++++------- .../sharding/ExecutionContextServiceTest.java | 10 ++++----- .../sharding/ExecutionServiceTest.java | 10 ++++----- .../MonitorExecutionListenerManagerTest.java | 8 +++---- .../sharding/ShardingListenerManagerTest.java | 14 ++++++------ .../internal/sharding/ShardingNodeTest.java | 2 +- .../sharding/ShardingServiceTest.java | 20 ++++++++--------- .../snapshot/BaseSnapshotServiceTest.java | 10 ++++----- .../snapshot/SnapshotServiceDisableTest.java | 4 ++-- .../snapshot/SnapshotServiceEnableTest.java | 4 ++-- .../internal/snapshot/SocketUtils.java | 2 +- .../internal/storage/JobNodePathTest.java | 2 +- .../internal/storage/JobNodeStorageTest.java | 6 ++--- .../trigger/TriggerListenerManagerTest.java | 10 ++++----- .../internal/util/SensitiveInfoUtilsTest.java | 2 +- .../util/ReflectionUtils.java | 2 +- ....executor.item.impl.ClassedJobItemExecutor | 2 +- ...asticjob.infra.listener.ElasticJobListener | 8 +++---- kernel/src/test/resources/logback-test.xml | 2 +- .../internal/operate/JobOperateAPIImpl.java | 8 +++---- .../operate/ShardingOperateAPIImpl.java | 2 +- .../settings/JobConfigurationAPIImpl.java | 2 +- .../statistics/JobStatisticsAPIImpl.java | 2 +- .../statistics/ServerStatisticsAPIImpl.java | 2 +- .../statistics/ShardingStatisticsAPIImpl.java | 2 +- .../job/ElasticJobBootstrapConfiguration.java | 4 ++-- .../ScheduleJobBootstrapStartupRunner.java | 2 +- ...lasticJobSnapshotServiceConfiguration.java | 2 +- .../job/ElasticJobSpringBootScannerTest.java | 2 +- .../boot/job/ElasticJobSpringBootTest.java | 8 +++---- ...icJobSnapshotServiceConfigurationTest.java | 2 +- .../core/scanner/ClassPathJobScanner.java | 2 +- .../SpringProxyJobClassNameProvider.java | 2 +- ...ernel.internal.setup.JobClassNameProvider} | 0 .../JobClassNameProviderFactoryTest.java | 2 +- .../job/parser/JobBeanDefinitionParser.java | 4 ++-- .../parser/SnapshotBeanDefinitionParser.java | 2 +- .../fixture/listener/SimpleOnceListener.java | 2 +- .../job/AbstractJobSpringIntegrateTest.java | 2 +- .../AbstractOneOffJobSpringIntegrateTest.java | 4 ++-- .../job/JobSpringNamespaceWithRefTest.java | 2 +- .../job/JobSpringNamespaceWithTypeTest.java | 2 +- .../OneOffJobSpringNamespaceWithRefTest.java | 4 ++-- .../OneOffJobSpringNamespaceWithTypeTest.java | 4 ++-- .../AbstractJobSpringIntegrateTest.java | 2 +- .../SnapshotSpringNamespaceDisableTest.java | 2 +- 182 files changed, 555 insertions(+), 554 deletions(-) rename examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/EmbedZookeeperServer.java (96%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/fixture/entity/Foo.java (95%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/fixture/repository/FooRepository.java (93%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/fixture/repository/FooRepositoryFactory.java (92%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/job/dataflow/JavaDataflowJob.java (85%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/job/dataflow/SpringDataflowJob.java (89%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/job/simple/JavaOccurErrorJob.java (94%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/job/simple/JavaSimpleJob.java (82%) rename examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/job/simple/SpringSimpleJob.java (87%) rename examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/JavaMain.java (95%) rename examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/{lite => }/example/SpringMain.java (95%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/SpringBootMain.java (95%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/controller/OneOffJobController.java (94%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/entity/Foo.java (96%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/job/SpringBootDataflowJob.java (90%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/job/SpringBootOccurErrorNoticeDingtalkJob.java (95%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/job/SpringBootOccurErrorNoticeEmailJob.java (95%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/job/SpringBootOccurErrorNoticeWechatJob.java (95%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/job/SpringBootSimpleJob.java (89%) rename examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/example/repository/FooRepository.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/bootstrap/JobBootstrap.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/bootstrap/impl/OneOffJobBootstrap.java (89%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/bootstrap/impl/ScheduleJobBootstrap.java (90%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/listener/AbstractDistributeOnceElasticJobListener.java (97%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/registry/JobInstanceRegistry.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/annotation/JobAnnotationBuilder.java (98%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/ConfigurationNode.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/ConfigurationService.java (97%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/RescheduleListenerManager.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/ElectionListenerManager.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/LeaderNode.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/LeaderService.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverListenerManager.java (92%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverNode.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverService.java (95%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeListenerManager.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeNode.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeService.java (96%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/InstanceNode.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/InstanceService.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/ShutdownListenerManager.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/AbstractListenerManager.java (92%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/ListenerManager.java (85%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/ListenerNotifierManager.java (98%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/RegistryCenterConnectionStateListener.java (86%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/reconcile/ReconcileService.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobRegistry.java (97%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobScheduleController.java (99%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobScheduler.java (96%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobShutdownHookPlugin.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobTriggerListener.java (88%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/LiteJob.java (95%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/LiteJobFacade.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/SchedulerFacade.java (88%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/server/ServerNode.java (92%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/server/ServerService.java (95%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/server/ServerStatus.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/DefaultJobClassNameProvider.java (96%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/JobClassNameProvider.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/JobClassNameProviderFactory.java (96%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/SetUpFacade.java (88%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ExecutionContextService.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ExecutionService.java (96%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/MonitorExecutionListenerManager.java (92%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingListenerManager.java (89%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingNode.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingService.java (94%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/snapshot/SnapshotService.java (98%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/storage/JobNodePath.java (98%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/storage/JobNodeStorage.java (98%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/trigger/TriggerListenerManager.java (93%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/trigger/TriggerNode.java (92%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/trigger/TriggerService.java (91%) rename kernel/src/main/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/util/SensitiveInfoUtils.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/bootstrap/impl/OneOffJobBootstrapTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/listener/DistributeOnceElasticJobListenerTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/listener/fixture/ElasticJobListenerCaller.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/listener/fixture/TestDistributeOnceElasticJobListener.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/listener/fixture/TestElasticJobListener.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/api/registry/JobInstanceRegistryTest.java (98%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/EmbedTestingServer.java (98%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/LiteYamlConstants.java (98%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/executor/ClassedFooJobExecutor.java (92%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/job/AnnotationSimpleJob.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/job/AnnotationUnShardingJob.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/job/DetailedFooJob.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/fixture/job/FooJob.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/BaseIntegrateTest.java (87%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/disable/DisabledJobIntegrateTest.java (88%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/disable/OneOffDisabledJobIntegrateTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/disable/ScheduleDisabledJobIntegrateTest.java (91%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/enable/EnabledJobIntegrateTest.java (90%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/enable/OneOffEnabledJobIntegrateTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/enable/ScheduleEnabledJobIntegrateTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/listener/TestDistributeOnceElasticJobListener.java (91%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/integrate/listener/TestElasticJobListener.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/annotation/JobAnnotationBuilderTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/annotation/integrate/BaseAnnotationTest.java (86%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/annotation/integrate/OneOffEnabledJobTest.java (92%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/annotation/integrate/ScheduleEnabledJobTest.java (92%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/ConfigurationNodeTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/ConfigurationServiceTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/config/RescheduleListenerManagerTest.java (91%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/ElectionListenerManagerTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/LeaderNodeTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/election/LeaderServiceTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverListenerManagerTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverNodeTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/failover/FailoverServiceTest.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeListenerManagerTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeNodeTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/guarantee/GuaranteeServiceTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/InstanceNodeTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/InstanceServiceTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/instance/ShutdownListenerManagerTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/ListenerManagerTest.java (85%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/ListenerNotifierManagerTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/listener/RegistryCenterConnectionStateListenerTest.java (90%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/reconcile/ReconcileServiceTest.java (91%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobRegistryTest.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobScheduleControllerTest.java (99%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/JobTriggerListenerTest.java (92%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/LiteJobFacadeTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/schedule/SchedulerFacadeTest.java (92%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/server/ServerNodeTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/server/ServerServiceTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/DefaultJobClassNameProviderTest.java (86%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/JobClassNameProviderFactoryTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/setup/SetUpFacadeTest.java (85%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ExecutionContextServiceTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ExecutionServiceTest.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/MonitorExecutionListenerManagerTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingListenerManagerTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingNodeTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/sharding/ShardingServiceTest.java (95%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/snapshot/BaseSnapshotServiceTest.java (89%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/snapshot/SnapshotServiceDisableTest.java (94%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/snapshot/SnapshotServiceEnableTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/snapshot/SocketUtils.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/storage/JobNodePathTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/storage/JobNodeStorageTest.java (97%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/trigger/TriggerListenerManagerTest.java (93%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/internal/util/SensitiveInfoUtilsTest.java (96%) rename kernel/src/test/java/org/apache/shardingsphere/elasticjob/{engine => kernel}/util/ReflectionUtils.java (97%) rename spring/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProvider => org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProvider} (100%) diff --git a/docs/content/faq/_index.cn.md b/docs/content/faq/_index.cn.md index 66e8326067..3b8ee69468 100644 --- a/docs/content/faq/_index.cn.md +++ b/docs/content/faq/_index.cn.md @@ -78,7 +78,7 @@ ElasticJob 已将 IP 地址等敏感信息过滤，导出的信息可在公网 ElasticJob 执行任务会获取本机IP，首次可能存在获取IP较慢的情况。尝试设置 `-Djava.net.preferIPv4Stack=true`. -## 10. Windows环境下，运行ShardingSphere-ElasticJob-UI，找不到或无法加载主类 org.apache.shardingsphere.elasticjob.engine.ui.Bootstrap，如何解决？ +## 10. Windows环境下，运行ShardingSphere-ElasticJob-UI，找不到或无法加载主类 org.apache.shardingsphere.elasticjob.kernel.ui.Bootstrap，如何解决？ 回答： diff --git a/docs/content/faq/_index.en.md b/docs/content/faq/_index.en.md index daebc029bc..cfd93ec08e 100644 --- a/docs/content/faq/_index.en.md +++ b/docs/content/faq/_index.en.md @@ -79,7 +79,7 @@ Answer: ElasticJob will obtain the local IP when performing task scheduling, and it may be slow to obtain the IP for the first time. Try to set `-Djava.net.preferIPv4Stack=true`. -## 10. In Windows env, run ShardingSphere-ElasticJob-UI, could not find or load main class org.apache.shardingsphere.elasticjob.engine.ui.Bootstrap. Why? +## 10. In Windows env, run ShardingSphere-ElasticJob-UI, could not find or load main class org.apache.shardingsphere.elasticjob.kernel.ui.Bootstrap. Why? Answer: diff --git a/docs/content/user-manual/configuration/spring-boot-starter.cn.md b/docs/content/user-manual/configuration/spring-boot-starter.cn.md index c0de545e29..332702eacf 100644 --- a/docs/content/user-manual/configuration/spring-boot-starter.cn.md +++ b/docs/content/user-manual/configuration/spring-boot-starter.cn.md @@ -89,7 +89,7 @@ elasticjob.reg-center.server-lists=localhost:6181 elasticjob: jobs: simpleJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootSimpleJob cron: 0/5 * * * * ? timeZone: GMT+08:00 shardingTotalCount: 3 @@ -110,7 +110,7 @@ elasticjob: **Properties** ``` -elasticjob.jobs.simpleJob.elastic-job-class=org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob +elasticjob.jobs.simpleJob.elastic-job-class=org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootSimpleJob elasticjob.jobs.simpleJob.cron=0/5 * * * * ? elasticjob.jobs.simpleJob.timeZone=GMT+08:00 elasticjob.jobs.simpleJob.sharding-total-count=3 diff --git a/docs/content/user-manual/configuration/spring-boot-starter.en.md b/docs/content/user-manual/configuration/spring-boot-starter.en.md index b294ca11cb..a50f584d55 100644 --- a/docs/content/user-manual/configuration/spring-boot-starter.en.md +++ b/docs/content/user-manual/configuration/spring-boot-starter.en.md @@ -90,7 +90,7 @@ Reference: elasticjob: jobs: simpleJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootSimpleJob cron: 0/5 * * * * ? timeZone: GMT+08:00 shardingTotalCount: 3 @@ -111,7 +111,7 @@ elasticjob: **Properties** ``` -elasticjob.jobs.simpleJob.elastic-job-class=org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob +elasticjob.jobs.simpleJob.elastic-job-class=org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootSimpleJob elasticjob.jobs.simpleJob.cron=0/5 * * * * ? elasticjob.jobs.simpleJob.timeZone=GMT+08:00 elasticjob.jobs.simpleJob.sharding-total-count=3 diff --git a/docs/content/user-manual/usage/job-api/spring-namespace.cn.md b/docs/content/user-manual/usage/job-api/spring-namespace.cn.md index 085df87267..485eb6c8b5 100644 --- a/docs/content/user-manual/usage/job-api/spring-namespace.cn.md +++ b/docs/content/user-manual/usage/job-api/spring-namespace.cn.md @@ -52,7 +52,7 @@ ElasticJob 提供自定义的 Spring 命名空间，可以与 Spring 容器配 ```xml - + ``` ```java diff --git a/docs/content/user-manual/usage/job-api/spring-namespace.en.md b/docs/content/user-manual/usage/job-api/spring-namespace.en.md index 0f4cb7a37e..f9fd35ccc5 100644 --- a/docs/content/user-manual/usage/job-api/spring-namespace.en.md +++ b/docs/content/user-manual/usage/job-api/spring-namespace.en.md @@ -53,7 +53,7 @@ Trigger the job by invoking `execute()` method manually. ```xml - + ``` ```java diff --git a/examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/EmbedZookeeperServer.java b/examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/example/EmbedZookeeperServer.java similarity index 96% rename from examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/EmbedZookeeperServer.java rename to examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/example/EmbedZookeeperServer.java index 7e62108643..9940bc7211 100644 --- a/examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/EmbedZookeeperServer.java +++ b/examples/elasticjob-example-embed-zk/src/main/java/org/apache/shardingsphere/elasticjob/example/EmbedZookeeperServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example; +package org.apache.shardingsphere.elasticjob.example; import org.apache.curator.test.TestingServer; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/entity/Foo.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/entity/Foo.java similarity index 95% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/entity/Foo.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/entity/Foo.java index 30a8cc1877..530d6e1b58 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/entity/Foo.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/entity/Foo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.fixture.entity; +package org.apache.shardingsphere.elasticjob.example.fixture.entity; import java.io.Serializable; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepository.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepository.java similarity index 93% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepository.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepository.java index 40ce742dc9..7e814a63d8 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepository.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepository.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.fixture.repository; +package org.apache.shardingsphere.elasticjob.example.fixture.repository; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; import org.springframework.stereotype.Repository; import java.util.ArrayList; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepositoryFactory.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepositoryFactory.java similarity index 92% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepositoryFactory.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepositoryFactory.java index 3aac7be913..12db547305 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/fixture/repository/FooRepositoryFactory.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/fixture/repository/FooRepositoryFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.fixture.repository; +package org.apache.shardingsphere.elasticjob.example.fixture.repository; public final class FooRepositoryFactory { diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java similarity index 85% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java index 7cde78a4e3..bc3e46d8e1 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job.dataflow; +package org.apache.shardingsphere.elasticjob.example.job.dataflow; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepository; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepositoryFactory; +import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepositoryFactory; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java similarity index 89% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java index 113ca2b921..02432b7a15 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job.dataflow; +package org.apache.shardingsphere.elasticjob.example.job.dataflow; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; import javax.annotation.Resource; import java.text.SimpleDateFormat; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java similarity index 94% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java index 6800716cde..d249d12b72 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job.simple; +package org.apache.shardingsphere.elasticjob.example.job.simple; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java similarity index 82% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java index 4559ca7b82..92dd4d1d60 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job.simple; +package org.apache.shardingsphere.elasticjob.example.job.simple; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepository; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepositoryFactory; +import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepositoryFactory; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java similarity index 87% rename from examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java rename to examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java index 5cc613497a..f42c0a8455 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job.simple; +package org.apache.shardingsphere.elasticjob.example.job.simple; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.fixture.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; import javax.annotation.Resource; import java.text.SimpleDateFormat; diff --git a/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java b/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java similarity index 95% rename from examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java rename to examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java index 5f68554367..d8cc2bbaeb 100644 --- a/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java +++ b/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example; +package org.apache.shardingsphere.elasticjob.example; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; @@ -23,12 +23,12 @@ import org.apache.shardingsphere.elasticjob.error.handler.dingtalk.DingtalkPropertiesConstants; import org.apache.shardingsphere.elasticjob.error.handler.email.EmailPropertiesConstants; import org.apache.shardingsphere.elasticjob.error.handler.wechat.WechatPropertiesConstants; +import org.apache.shardingsphere.elasticjob.example.job.dataflow.JavaDataflowJob; import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.example.job.dataflow.JavaDataflowJob; -import org.apache.shardingsphere.elasticjob.engine.example.job.simple.JavaOccurErrorJob; -import org.apache.shardingsphere.elasticjob.engine.example.job.simple.JavaSimpleJob; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.example.job.simple.JavaOccurErrorJob; +import org.apache.shardingsphere.elasticjob.example.job.simple.JavaSimpleJob; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/SpringMain.java b/examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java similarity index 95% rename from examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/SpringMain.java rename to examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java index ccbbaf638f..a83e6346ae 100644 --- a/examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/SpringMain.java +++ b/examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example; +package org.apache.shardingsphere.elasticjob.example; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml index e937ea9bd1..4706d4fda0 100644 --- a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml +++ b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml @@ -27,7 +27,7 @@ http://shardingsphere.apache.org/schema/elasticjob http://shardingsphere.apache.org/schema/elasticjob/elasticjob.xsd "> - + - - + + - + @@ -87,7 +87,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/SpringBootMain.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java similarity index 95% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/SpringBootMain.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java index 36904fd31c..d227274153 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/SpringBootMain.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example; +package org.apache.shardingsphere.elasticjob.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/controller/OneOffJobController.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java similarity index 94% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/controller/OneOffJobController.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java index aed8e8af8b..23a4ac01ce 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/controller/OneOffJobController.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.controller; +package org.apache.shardingsphere.elasticjob.example.controller; -import javax.annotation.Resource; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + @RestController public class OneOffJobController { diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/entity/Foo.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java similarity index 96% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/entity/Foo.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java index c51f0be5ed..219d5acc00 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/entity/Foo.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.entity; +package org.apache.shardingsphere.elasticjob.example.entity; import java.io.Serializable; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootDataflowJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java similarity index 90% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootDataflowJob.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java index 5da6e447ad..40a5e0ff84 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootDataflowJob.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job; +package org.apache.shardingsphere.elasticjob.example.job; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; -import org.apache.shardingsphere.elasticjob.engine.example.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.repository.FooRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeDingtalkJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java similarity index 95% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeDingtalkJob.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java index 3317492a8b..fb33a35271 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeDingtalkJob.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job; +package org.apache.shardingsphere.elasticjob.example.job; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeEmailJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java similarity index 95% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeEmailJob.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java index 575689075b..f6c7e69046 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeEmailJob.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job; +package org.apache.shardingsphere.elasticjob.example.job; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeWechatJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java similarity index 95% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeWechatJob.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java index 41a08980d4..b998458a44 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootOccurErrorNoticeWechatJob.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job; +package org.apache.shardingsphere.elasticjob.example.job; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootSimpleJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java similarity index 89% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootSimpleJob.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java index cc15b3fb61..85109787ed 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/job/SpringBootSimpleJob.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.job; +package org.apache.shardingsphere.elasticjob.example.job; import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.engine.example.entity.Foo; -import org.apache.shardingsphere.elasticjob.engine.example.repository.FooRepository; +import org.apache.shardingsphere.elasticjob.example.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.repository.FooRepository; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/repository/FooRepository.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java similarity index 93% rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/repository/FooRepository.java rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java index 6dfe994a7a..fa1a2267f9 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/engine/example/repository/FooRepository.java +++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.example.repository; +package org.apache.shardingsphere.elasticjob.example.repository; -import org.apache.shardingsphere.elasticjob.engine.example.entity.Foo; +import org.apache.shardingsphere.elasticjob.example.entity.Foo; import org.springframework.stereotype.Repository; import java.util.ArrayList; diff --git a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml index f3be9ed814..c7c86494ef 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml +++ b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml @@ -10,12 +10,12 @@ elasticjob: namespace: elasticjob-springboot jobs: simpleJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootSimpleJob cron: 0/5 * * * * ? shardingTotalCount: 3 shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou dataflowJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootDataflowJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootDataflowJob cron: 0/5 * * * * ? shardingTotalCount: 3 shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou @@ -32,7 +32,7 @@ elasticjob: props: script.command.line: "echo Manual SCRIPT Job: " occurErrorNoticeDingtalkJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootOccurErrorNoticeDingtalkJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.example.job.SpringBootOccurErrorNoticeDingtalkJob overwrite: true shardingTotalCount: 3 shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou @@ -46,7 +46,7 @@ elasticjob: connectTimeout: 3000 readTimeout: 5000 occurErrorNoticeWechatJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootOccurErrorNoticeWechatJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.kernel.job.SpringBootOccurErrorNoticeWechatJob overwrite: true shardingTotalCount: 3 shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou @@ -58,7 +58,7 @@ elasticjob: connectTimeout: 3000 readTimeout: 5000 occurErrorNoticeEmailJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootOccurErrorNoticeEmailJob + elasticJobClass: org.apache.shardingsphere.elasticjob.kernel.kernel.job.SpringBootOccurErrorNoticeEmailJob overwrite: true shardingTotalCount: 3 shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/JobBootstrap.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/JobBootstrap.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/JobBootstrap.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/JobBootstrap.java index c734833fc1..b898b877d7 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/JobBootstrap.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/JobBootstrap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.bootstrap; +package org.apache.shardingsphere.elasticjob.kernel.api.bootstrap; /** * Job bootstrap. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrap.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrap.java similarity index 89% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrap.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrap.java index 499f5ffdbc..1119e57577 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrap.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrap.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl; +package org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.JobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.annotation.JobAnnotationBuilder; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduler; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.annotation.JobAnnotationBuilder; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduler; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/ScheduleJobBootstrap.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/ScheduleJobBootstrap.java similarity index 90% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/ScheduleJobBootstrap.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/ScheduleJobBootstrap.java index a45116f23c..2632fa4926 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/ScheduleJobBootstrap.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/ScheduleJobBootstrap.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl; +package org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.JobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.annotation.JobAnnotationBuilder; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduler; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.annotation.JobAnnotationBuilder; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduler; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/listener/AbstractDistributeOnceElasticJobListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java similarity index 97% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/listener/AbstractDistributeOnceElasticJobListener.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java index 0ef6456c45..8a5970491d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/listener/AbstractDistributeOnceElasticJobListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/AbstractDistributeOnceElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.listener; +package org.apache.shardingsphere.elasticjob.kernel.api.listener; import lombok.Setter; import org.apache.shardingsphere.elasticjob.infra.concurrent.BlockUtils; @@ -23,7 +23,7 @@ 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.engine.internal.guarantee.GuaranteeService; +import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeService; import java.util.Set; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistry.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistry.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistry.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistry.java index 1ae7873074..769e1076c3 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistry.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistry.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.registry; +package org.apache.shardingsphere.elasticjob.kernel.api.registry; import lombok.RequiredArgsConstructor; @@ -25,9 +25,9 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilder.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java similarity index 98% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilder.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java index 991c7d3542..66a088323e 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilder.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.annotation; +package org.apache.shardingsphere.elasticjob.kernel.internal.annotation; import com.google.common.base.Preconditions; import com.google.common.base.Strings; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNode.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNode.java index a436932d86..0c1b07233b 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNode.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Configuration node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java similarity index 97% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java index 745a3f4801..4c37a4b0f1 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationService.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; 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.infra.pojo.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.infra.env.TimeService; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java index 6139485344..897160d634 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManager.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +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; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java index 94ec7762c5..b46ef9312c 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerNode; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNode.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNode.java index df9bdb97bd..748814a7e8 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNode.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Leader path node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderService.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderService.java index f83dff2640..628d99cbf6 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.infra.concurrent.BlockUtils; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java index aec6e44787..81e0466449 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationNode; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNode.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNode.java index b09863920c..1a12f28902 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNode.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderNode; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingNode; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Failover node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java similarity index 95% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java index 8af02351e6..7499ee456d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingNode; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +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.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java index 897ad134ef..d0c8937da4 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManager.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; +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; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNode.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNode.java index c5a082e429..984100c932 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNode.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Guarantee node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java similarity index 96% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java index 768f567f22..a1df049f67 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java index fc21857837..be0aed258f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNode.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Instance node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java index 47251c5157..dc1159a9c4 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.internal.trigger.TriggerNode; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.LinkedList; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/ShutdownListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManager.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/ShutdownListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManager.java index acd85f7c4f..dbf6c2f2b5 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/ShutdownListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManager.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.SchedulerFacade; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.SchedulerFacade; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/AbstractListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/AbstractListenerManager.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/AbstractListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/AbstractListenerManager.java index f719094edf..2483ca4645 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/AbstractListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/AbstractListenerManager.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java similarity index 85% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java index 729fa38e14..23e09bebd5 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManager.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.RescheduleListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.election.ElectionListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.failover.FailoverListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.guarantee.GuaranteeListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.ShutdownListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.MonitorExecutionListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.internal.trigger.TriggerListenerManager; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.ShutdownListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.MonitorExecutionListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.trigger.TriggerListenerManager; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.Collection; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerNotifierManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManager.java similarity index 98% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerNotifierManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManager.java index 56a69af4f8..47afc5c41f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerNotifierManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; import org.apache.curator.utils.ThreadUtils; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListener.java similarity index 86% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListener.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListener.java index 0077d815e1..b528e26971 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListener.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileService.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileService.java index 6015797693..f336c40bf8 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.reconcile; +package org.apache.shardingsphere.elasticjob.kernel.internal.reconcile; import com.google.common.util.concurrent.AbstractScheduledService; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.concurrent.TimeUnit; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistry.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java similarity index 97% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistry.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java index 9ac7482eda..9285a0aa27 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistry.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.ListenerNotifierManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerNotifierManager; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.Map; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleController.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java similarity index 99% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleController.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java index 9f63fde606..00ad6a137f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleController.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import com.google.common.base.Preconditions; import com.google.common.base.Strings; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduler.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java similarity index 96% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduler.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java index bda4e794fd..62b0975b95 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduler.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -29,11 +29,11 @@ import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListenerFactory; import org.apache.shardingsphere.elasticjob.infra.spi.ElasticJobServiceLoader; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.guarantee.GuaranteeService; -import org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProviderFactory; -import org.apache.shardingsphere.elasticjob.engine.internal.setup.SetUpFacade; +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.quartz.JobBuilder; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobShutdownHookPlugin.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobShutdownHookPlugin.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobShutdownHookPlugin.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobShutdownHookPlugin.java index 13a6decf6e..dc81fcbb2c 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobShutdownHookPlugin.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobShutdownHookPlugin.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobTriggerListener.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListener.java similarity index 88% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobTriggerListener.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListener.java index f233baa568..f32cd8cbea 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobTriggerListener.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListener.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.quartz.Trigger; import org.quartz.listeners.TriggerListenerSupport; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJob.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java similarity index 95% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJob.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java index cb3821adb1..4d828f1d48 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJob.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import lombok.Setter; import org.apache.shardingsphere.elasticjob.executor.ElasticJobExecutor; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJobFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJobFacade.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java index 7e790c346a..479f720da1 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJobFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.failover.FailoverService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionContextService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; +import org.apache.shardingsphere.elasticjob.kernel.internal.failover.FailoverService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionContextService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.executor.JobFacade; import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacade.java similarity index 88% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacade.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacade.java index 4868ede3be..7e1e45b33c 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacade.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java index 912d3bc68d..6693d12c20 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.server; +package org.apache.shardingsphere.elasticjob.kernel.internal.server; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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 java.util.Objects; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerService.java similarity index 95% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerService.java index 864a0ea030..9aba51c8f6 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerService.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.server; +package org.apache.shardingsphere.elasticjob.kernel.internal.server; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.infra.concurrent.BlockUtils; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.Collection; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerStatus.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerStatus.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerStatus.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerStatus.java index 63124f6b2d..92472d1e8e 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerStatus.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.server; +package org.apache.shardingsphere.elasticjob.kernel.internal.server; /** * Server status. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProvider.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProvider.java similarity index 96% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProvider.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProvider.java index 8974b3138f..4700a24f3a 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProvider.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import org.apache.shardingsphere.elasticjob.api.ElasticJob; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProvider.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProvider.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProvider.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProvider.java index cccca5c2e5..36730e4aa6 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProvider.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import org.apache.shardingsphere.elasticjob.api.ElasticJob; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactory.java similarity index 96% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactory.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactory.java index 1bf8afe819..d2d7cd634d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java similarity index 88% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacade.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java index 6e1356c19d..d0c1e7be12 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacade.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.ListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.reconcile.ReconcileService; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.reconcile.ReconcileService; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.Collection; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java index d980f68886..e989135c74 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.context.ShardingItemParameters; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.ArrayList; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java similarity index 96% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java index da48bc6305..39d85cfa17 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.ArrayList; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java index 9d984e5f7b..f57b01d75f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManager.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationNode; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; +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; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java similarity index 89% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java index a3e8ddc5e5..73249f596d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManager.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationNode; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerNode; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNode.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNode.java index ed4a96557f..c86912f782 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNode.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderNode; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Sharding node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java index 92787552ab..4bde6078a5 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; @@ -24,14 +24,14 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategyFactory; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotService.java similarity index 98% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotService.java index 48f1f48dc5..fdfe329514 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.snapshot; +package org.apache.shardingsphere.elasticjob.kernel.internal.snapshot; import com.google.common.base.Preconditions; import lombok.extern.slf4j.Slf4j; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.CuratorCache; -import org.apache.shardingsphere.elasticjob.engine.internal.util.SensitiveInfoUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.util.SensitiveInfoUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePath.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePath.java similarity index 98% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePath.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePath.java index 10c643ea1b..ad6221af1c 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePath.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.storage; import lombok.RequiredArgsConstructor; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorage.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorage.java similarity index 98% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorage.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorage.java index 17f3429d8d..6ff43fe635 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorage.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorage.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.storage; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.ListenerNotifierManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerNotifierManager; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback; import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManager.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManager.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManager.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManager.java index 3acc24bc6e..f22fba49d4 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManager.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManager.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.trigger; +package org.apache.shardingsphere.elasticjob.kernel.internal.trigger; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.AbstractListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +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; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerNode.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerNode.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java index d962d05b40..1588ae1700 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerNode.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.trigger; +package org.apache.shardingsphere.elasticjob.kernel.internal.trigger; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; /** * Trigger node. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerService.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerService.java similarity index 91% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerService.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerService.java index f05502b9cd..12421b8e9d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerService.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.trigger; +package org.apache.shardingsphere.elasticjob.kernel.internal.trigger; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtils.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java similarity index 97% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtils.java rename to kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java index cc41d7a012..ae23f403f3 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtils.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.util; +package org.apache.shardingsphere.elasticjob.kernel.internal.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrapTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrapTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrapTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrapTest.java index c0f67881bb..f7110eef75 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/bootstrap/impl/OneOffJobBootstrapTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/bootstrap/impl/OneOffJobBootstrapTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl; +package org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl; import lombok.SneakyThrows; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduler; +import org.apache.shardingsphere.elasticjob.kernel.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduler; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/DistributeOnceElasticJobListenerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/DistributeOnceElasticJobListenerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java index 80da4538ef..11e55d116e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/DistributeOnceElasticJobListenerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/DistributeOnceElasticJobListenerTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.listener; +package org.apache.shardingsphere.elasticjob.kernel.api.listener; import com.google.common.collect.Sets; import org.apache.shardingsphere.elasticjob.infra.env.TimeService; import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.api.listener.fixture.ElasticJobListenerCaller; -import org.apache.shardingsphere.elasticjob.engine.api.listener.fixture.TestDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.guarantee.GuaranteeService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/api/listener/fixture/ElasticJobListenerCaller.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/ElasticJobListenerCaller.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/ElasticJobListenerCaller.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/ElasticJobListenerCaller.java index d0adda6526..021e163b83 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/ElasticJobListenerCaller.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/ElasticJobListenerCaller.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.listener.fixture; +package org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture; public interface ElasticJobListenerCaller { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/TestDistributeOnceElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/TestDistributeOnceElasticJobListener.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java index 971b0b2f39..abdd4f049c 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/TestDistributeOnceElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestDistributeOnceElasticJobListener.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.listener.fixture; +package org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; +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/engine/api/listener/fixture/TestElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/TestElasticJobListener.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java index c2c66a9213..c21bb39f05 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/listener/fixture/TestElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/listener/fixture/TestElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.listener.fixture; +package org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistryTest.java similarity index 98% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistryTest.java index 41e1ab8cb7..0e5c8cb504 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/api/registry/JobInstanceRegistryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/api/registry/JobInstanceRegistryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.api.registry; +package org.apache.shardingsphere.elasticjob.kernel.api.registry; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/EmbedTestingServer.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/EmbedTestingServer.java similarity index 98% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/EmbedTestingServer.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/EmbedTestingServer.java index 18f305d9a9..6c704fb401 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/EmbedTestingServer.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/EmbedTestingServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture; +package org.apache.shardingsphere.elasticjob.kernel.fixture; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/LiteYamlConstants.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/LiteYamlConstants.java similarity index 98% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/LiteYamlConstants.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/LiteYamlConstants.java index 9cedba22bf..c7820a9f46 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/LiteYamlConstants.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/LiteYamlConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture; +package org.apache.shardingsphere.elasticjob.kernel.fixture; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/executor/ClassedFooJobExecutor.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java similarity index 92% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/executor/ClassedFooJobExecutor.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java index ed0ad4dcfb..7c033faafe 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/executor/ClassedFooJobExecutor.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture.executor; +package org.apache.shardingsphere.elasticjob.kernel.fixture.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.executor.JobFacade; import org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.FooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; public final class ClassedFooJobExecutor implements ClassedJobItemExecutor { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationSimpleJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationSimpleJob.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationSimpleJob.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationSimpleJob.java index 31f8549d9b..74aedd3b12 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationSimpleJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationSimpleJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture.job; +package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import lombok.Getter; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationUnShardingJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationUnShardingJob.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationUnShardingJob.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationUnShardingJob.java index e235c59449..a75257759b 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/AnnotationUnShardingJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/AnnotationUnShardingJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture.job; +package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import lombok.Getter; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/DetailedFooJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/DetailedFooJob.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java index 48ccb4a117..7d3f5087b6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/DetailedFooJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture.job; +package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/FooJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/FooJob.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java index 09f90f1bc5..f0fe640568 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/fixture/job/FooJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.fixture.job; +package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/BaseIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/BaseIntegrateTest.java similarity index 87% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/BaseIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/BaseIntegrateTest.java index 88f98ed8bb..a91788f42a 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/BaseIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/BaseIntegrateTest.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate; +package org.apache.shardingsphere.elasticjob.kernel.integrate; import lombok.AccessLevel; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.JobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/DisabledJobIntegrateTest.java similarity index 88% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/DisabledJobIntegrateTest.java index ddcc15c44a..9c52f28fc9 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/DisabledJobIntegrateTest.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.disable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.disable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; -import org.apache.shardingsphere.elasticjob.engine.integrate.BaseIntegrateTest; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.integrate.BaseIntegrateTest; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.awaitility.Awaitility; import org.hamcrest.core.IsNull; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/OneOffDisabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/OneOffDisabledJobIntegrateTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/OneOffDisabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/OneOffDisabledJobIntegrateTest.java index 0bcbfe302c..4905aebc6e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/OneOffDisabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/OneOffDisabledJobIntegrateTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.disable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.disable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/ScheduleDisabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/ScheduleDisabledJobIntegrateTest.java similarity index 91% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/ScheduleDisabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/ScheduleDisabledJobIntegrateTest.java index 139f83bace..a2fc80c17c 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/ScheduleDisabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/disable/ScheduleDisabledJobIntegrateTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.disable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.disable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/EnabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/EnabledJobIntegrateTest.java similarity index 90% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/EnabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/EnabledJobIntegrateTest.java index 347f7667a3..d163bab5b1 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/EnabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/EnabledJobIntegrateTest.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.enable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.enable; 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.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.integrate.BaseIntegrateTest; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.integrate.BaseIntegrateTest; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.junit.jupiter.api.BeforeEach; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/OneOffEnabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/OneOffEnabledJobIntegrateTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/OneOffEnabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/OneOffEnabledJobIntegrateTest.java index 97ca2809b1..65b4301de7 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/OneOffEnabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/OneOffEnabledJobIntegrateTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.enable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.enable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/ScheduleEnabledJobIntegrateTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/ScheduleEnabledJobIntegrateTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/ScheduleEnabledJobIntegrateTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/ScheduleEnabledJobIntegrateTest.java index 8c2def4db7..c4a6343723 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/enable/ScheduleEnabledJobIntegrateTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/enable/ScheduleEnabledJobIntegrateTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.enable; +package org.apache.shardingsphere.elasticjob.kernel.integrate.enable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestDistributeOnceElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestDistributeOnceElasticJobListener.java similarity index 91% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestDistributeOnceElasticJobListener.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestDistributeOnceElasticJobListener.java index 834056f851..b0c654c77e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestDistributeOnceElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestDistributeOnceElasticJobListener.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.listener; +package org.apache.shardingsphere.elasticjob.kernel.integrate.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; public class TestDistributeOnceElasticJobListener extends AbstractDistributeOnceElasticJobListener { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestElasticJobListener.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestElasticJobListener.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestElasticJobListener.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestElasticJobListener.java index b45e1fbeb1..81fe295709 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/listener/TestElasticJobListener.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/integrate/listener/TestElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.integrate.listener; +package org.apache.shardingsphere.elasticjob.kernel.integrate.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilderTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilderTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilderTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilderTest.java index d9ebaaf0d6..0582b14b61 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/JobAnnotationBuilderTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/JobAnnotationBuilderTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.annotation; +package org.apache.shardingsphere.elasticjob.kernel.internal.annotation; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.AnnotationSimpleJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.AnnotationSimpleJob; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/BaseAnnotationTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/BaseAnnotationTest.java similarity index 86% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/BaseAnnotationTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/BaseAnnotationTest.java index 9eae55a220..1e92e5a255 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/BaseAnnotationTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/BaseAnnotationTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.annotation.integrate; +package org.apache.shardingsphere.elasticjob.kernel.internal.annotation.integrate; import lombok.AccessLevel; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.JobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.internal.annotation.JobAnnotationBuilder; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.kernel.internal.annotation.JobAnnotationBuilder; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/OneOffEnabledJobTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/OneOffEnabledJobTest.java similarity index 92% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/OneOffEnabledJobTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/OneOffEnabledJobTest.java index 80fcf37d95..f0b5d7a214 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/OneOffEnabledJobTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/OneOffEnabledJobTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.annotation.integrate; +package org.apache.shardingsphere.elasticjob.kernel.internal.annotation.integrate; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.AnnotationUnShardingJob; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.AnnotationUnShardingJob; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/ScheduleEnabledJobTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/ScheduleEnabledJobTest.java similarity index 92% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/ScheduleEnabledJobTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/ScheduleEnabledJobTest.java index 919d855e1f..eb1c3cff11 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/annotation/integrate/ScheduleEnabledJobTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/annotation/integrate/ScheduleEnabledJobTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.annotation.integrate; +package org.apache.shardingsphere.elasticjob.kernel.internal.annotation.integrate; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.AnnotationSimpleJob; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.AnnotationSimpleJob; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNodeTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNodeTest.java index e86dd45811..1c56d09407 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java index 0963268060..d539de0c2d 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/ConfigurationServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/ConfigurationServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; @@ -23,9 +23,9 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.fixture.LiteYamlConstants; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -84,7 +84,7 @@ void assertLoadFromCacheButNull() { void assertSetUpJobConfigurationJobConfigurationForJobConflict() { assertThrows(JobConfigurationException.class, () -> { when(jobNodeStorage.isJobRootNodeExisted()).thenReturn(true); - when(jobNodeStorage.getJobRootNodeData()).thenReturn("org.apache.shardingsphere.elasticjob.engine.api.script.api.ScriptJob"); + when(jobNodeStorage.getJobRootNodeData()).thenReturn("org.apache.shardingsphere.elasticjob.kernel.api.script.api.ScriptJob"); try { configService.setUpJobConfiguration(null, JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").build()); } finally { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java similarity index 91% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java index a46473049d..8b47c957a4 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/config/RescheduleListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.config; +package org.apache.shardingsphere.elasticjob.kernel.internal.config; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.fixture.LiteYamlConstants; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java index f4b7b86aed..3c9c8fdd8e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/ElectionListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNodeTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNodeTest.java index adc4857455..a3e9fa33e7 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java index f5a95a8eef..326a7bf21d 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/election/LeaderServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.election; +package org.apache.shardingsphere.elasticjob.kernel.internal.election; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService.LeaderElectionExecutionCallback; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService.LeaderElectionExecutionCallback; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java index 2962561f0a..2fb30acdb6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.fixture.LiteYamlConstants; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants; +import org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNodeTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNodeTest.java index ad7fe3abdf..d5ebecf6e2 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java index ff6531c1ca..e124f2d2fb 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/failover/FailoverServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.failover; +package org.apache.shardingsphere.elasticjob.kernel.internal.failover; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java index f0c9ecc69b..b51f851ea4 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeListenerManagerTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNodeTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNodeTest.java index 6478383955..955dbcd4aa 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +package org.apache.shardingsphere.elasticjob.kernel.internal.guarantee; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java index e9c9925ac1..b57d475955 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/guarantee/GuaranteeServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/guarantee/GuaranteeServiceTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.guarantee; +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.engine.api.listener.AbstractDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/internal/instance/InstanceNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java index 814dd850fe..e57360719f 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java index 9d6934fcc3..92a4c52288 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/InstanceServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/internal/instance/ShutdownListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/ShutdownListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java index f8b372fc49..648c4905b6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/instance/ShutdownListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.instance; +package org.apache.shardingsphere.elasticjob.kernel.internal.instance; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.SchedulerFacade; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.SchedulerFacade; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManagerTest.java similarity index 85% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManagerTest.java index a4faecfd72..3b24e005f8 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerManagerTest.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.RescheduleListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.election.ElectionListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.failover.FailoverListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.guarantee.GuaranteeListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.ShutdownListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.MonitorExecutionListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.internal.trigger.TriggerListenerManager; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.ShutdownListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.MonitorExecutionListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.internal.trigger.TriggerListenerManager; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/internal/listener/ListenerNotifierManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManagerTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerNotifierManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManagerTest.java index 5004bdf367..5d41011055 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/ListenerNotifierManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/ListenerNotifierManagerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListenerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java similarity index 90% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListenerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java index 59bc43c88d..11addd1d5b 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/listener/RegistryCenterConnectionStateListenerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.listener; +package org.apache.shardingsphere.elasticjob.kernel.internal.listener; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener.State; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java similarity index 91% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java index e739004deb..ed81011efe 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/reconcile/ReconcileServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.reconcile; +package org.apache.shardingsphere.elasticjob.kernel.internal.reconcile; import com.google.common.collect.Lists; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java index cf90da4558..faebd5eac3 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobRegistryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleControllerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java similarity index 99% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleControllerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java index 954411397c..7638f6eae9 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobScheduleControllerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduleControllerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/internal/schedule/JobTriggerListenerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListenerTest.java similarity index 92% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobTriggerListenerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListenerTest.java index 83f7cd8856..2be655b2b0 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/JobTriggerListenerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobTriggerListenerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; 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/engine/internal/schedule/LiteJobFacadeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacadeTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJobFacadeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacadeTest.java index a038e08b6a..79a25322cf 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/LiteJobFacadeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacadeTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; 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.engine.api.listener.fixture.ElasticJobListenerCaller; -import org.apache.shardingsphere.elasticjob.engine.api.listener.fixture.TestElasticJobListener; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.failover.FailoverService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionContextService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ExecutionService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.failover.FailoverService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionContextService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacadeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java similarity index 92% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacadeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java index 20808cdc9f..bed1745ce6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/schedule/SchedulerFacadeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.schedule; +package org.apache.shardingsphere.elasticjob.kernel.internal.schedule; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService; +import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java index e5c65f3b3c..ee4f7e88f5 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.server; +package org.apache.shardingsphere.elasticjob.kernel.internal.server; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java index 8b73f171e7..f6e7d99a9c 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/server/ServerServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.server; +package org.apache.shardingsphere.elasticjob.kernel.internal.server; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProviderTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProviderTest.java similarity index 86% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProviderTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProviderTest.java index 8677c40555..03cd4941eb 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/DefaultJobClassNameProviderTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/DefaultJobClassNameProviderTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.FooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledForJreRange; import org.junit.jupiter.api.condition.JRE; @@ -32,7 +32,7 @@ class DefaultJobClassNameProviderTest { void assertGetOrdinaryClassJobName() { JobClassNameProvider jobClassNameProvider = new DefaultJobClassNameProvider(); String result = jobClassNameProvider.getJobClassName(new DetailedFooJob()); - assertThat(result, is("org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob")); + assertThat(result, is("org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob")); } // TODO OpenJDK 21 breaks this unit test. @@ -43,6 +43,6 @@ void assertGetLambdaJobName() { FooJob lambdaFooJob = shardingContext -> { }; String result = jobClassNameProvider.getJobClassName(lambdaFooJob); - assertThat(result, is("org.apache.shardingsphere.elasticjob.engine.internal.setup.DefaultJobClassNameProviderTest$$Lambda$")); + assertThat(result, is("org.apache.shardingsphere.elasticjob.kernel.internal.setup.DefaultJobClassNameProviderTest$$Lambda$")); } } diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactoryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactoryTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactoryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactoryTest.java index 9abcb65459..55ce2a9989 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/JobClassNameProviderFactoryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/JobClassNameProviderFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacadeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java similarity index 85% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacadeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java index 9a75384159..3f99581c74 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/setup/SetUpFacadeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.setup; +package org.apache.shardingsphere.elasticjob.kernel.internal.setup; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.ListenerManager; -import org.apache.shardingsphere.elasticjob.engine.internal.reconcile.ReconcileService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.reconcile.ReconcileService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java index e9c592c709..23a2e4db46 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionContextServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import com.google.common.collect.Lists; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; 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/engine/internal/sharding/ExecutionServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java index b994a17350..9abcf8e311 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ExecutionServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManagerTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManagerTest.java index 5b7b87069f..20fa06d6dd 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/MonitorExecutionListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/MonitorExecutionListenerManagerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; -import org.apache.shardingsphere.elasticjob.engine.fixture.LiteYamlConstants; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java index 7a2c29e56d..e8e6fee1df 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import com.google.common.collect.Lists; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.fixture.LiteYamlConstants; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants; +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.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNodeTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNodeTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNodeTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNodeTest.java index b017950f6d..eccc117990 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingNodeTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java similarity index 95% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java index f41bc8dadf..9f38576a74 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/sharding/ShardingServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.sharding; +package org.apache.shardingsphere.elasticjob.kernel.internal.sharding; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.config.ConfigurationService; -import org.apache.shardingsphere.elasticjob.engine.internal.election.LeaderService; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceNode; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/BaseSnapshotServiceTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/BaseSnapshotServiceTest.java similarity index 89% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/BaseSnapshotServiceTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/BaseSnapshotServiceTest.java index d515d6837d..98309a2cfa 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/BaseSnapshotServiceTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/BaseSnapshotServiceTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.snapshot; +package org.apache.shardingsphere.elasticjob.kernel.internal.snapshot; import lombok.AccessLevel; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceDisableTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceDisableTest.java similarity index 94% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceDisableTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceDisableTest.java index 418081d3d6..62c5a02fbe 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceDisableTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceDisableTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.snapshot; +package org.apache.shardingsphere.elasticjob.kernel.internal.snapshot; import lombok.SneakyThrows; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceEnableTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceEnableTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceEnableTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceEnableTest.java index e366fd6847..3c40dcaa52 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SnapshotServiceEnableTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotServiceEnableTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.snapshot; +package org.apache.shardingsphere.elasticjob.kernel.internal.snapshot; -import org.apache.shardingsphere.elasticjob.engine.fixture.job.DetailedFooJob; +import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SocketUtils.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SocketUtils.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SocketUtils.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SocketUtils.java index 39ec76d93e..130c10288a 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/snapshot/SocketUtils.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SocketUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.snapshot; +package org.apache.shardingsphere.elasticjob.kernel.internal.snapshot; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePathTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePathTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePathTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePathTest.java index ab920776c8..a49243cfbc 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodePathTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.storage; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorageTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorageTest.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorageTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorageTest.java index 3d32f5b7ff..2d43bcb628 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/storage/JobNodeStorageTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/storage/JobNodeStorageTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.storage; +package org.apache.shardingsphere.elasticjob.kernel.internal.storage; -import org.apache.shardingsphere.elasticjob.engine.internal.listener.ListenerNotifierManager; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerNotifierManager; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation; import org.apache.shardingsphere.elasticjob.reg.exception.RegException; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManagerTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java similarity index 93% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManagerTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java index 0f17628c27..f30045eb30 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/trigger/TriggerListenerManagerTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.trigger; +package org.apache.shardingsphere.elasticjob.kernel.internal.trigger; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduleController; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.engine.util.ReflectionUtils; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage; +import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtilsTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtilsTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtilsTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtilsTest.java index cc1771b949..e21dae37d9 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/internal/util/SensitiveInfoUtilsTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/util/SensitiveInfoUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.internal.util; +package org.apache.shardingsphere.elasticjob.kernel.internal.util; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/util/ReflectionUtils.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/util/ReflectionUtils.java similarity index 97% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/util/ReflectionUtils.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/util/ReflectionUtils.java index fe4639b48d..cc93be2bec 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/engine/util/ReflectionUtils.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/util/ReflectionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.util; +package org.apache.shardingsphere.elasticjob.kernel.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor index 7302c9a357..bb119fea59 100644 --- a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor +++ b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.fixture.executor.ClassedFooJobExecutor +org.apache.shardingsphere.elasticjob.kernel.fixture.executor.ClassedFooJobExecutor 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.infra.listener.ElasticJobListener index cc9b221927..69fd14c6e0 100644 --- 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.infra.listener.ElasticJobListener @@ -15,7 +15,7 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.api.listener.fixture.TestDistributeOnceElasticJobListener -org.apache.shardingsphere.elasticjob.engine.api.listener.fixture.TestElasticJobListener -org.apache.shardingsphere.elasticjob.engine.integrate.listener.TestDistributeOnceElasticJobListener -org.apache.shardingsphere.elasticjob.engine.integrate.listener.TestElasticJobListener +org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.TestDistributeOnceElasticJobListener +org.apache.shardingsphere.elasticjob.kernel.api.listener.fixture.TestElasticJobListener +org.apache.shardingsphere.elasticjob.kernel.integrate.listener.TestDistributeOnceElasticJobListener +org.apache.shardingsphere.elasticjob.kernel.integrate.listener.TestElasticJobListener diff --git a/kernel/src/test/resources/logback-test.xml b/kernel/src/test/resources/logback-test.xml index 3910420a37..bbddeff36a 100644 --- a/kernel/src/test/resources/logback-test.xml +++ b/kernel/src/test/resources/logback-test.xml @@ -36,7 +36,7 @@ - + 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 899a2e7b13..3ba3e6922b 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 @@ -20,10 +20,10 @@ import com.google.common.base.Preconditions; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.instance.InstanceService; -import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; -import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.JobOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java index 58ea9020f7..ececf03ba2 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; 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 39150556cc..5f2405ba70 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 @@ -21,7 +21,7 @@ import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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; 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 7e745eb95e..a1e978f95a 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 @@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath; import org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI; import org.apache.shardingsphere.elasticjob.lifecycle.domain.JobBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; 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 edbe7b3815..95cd969323 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 @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; 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 097dd652dd..32b91f473e 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 @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; 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 2895efde50..a8d157f0e6 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 @@ -23,8 +23,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.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; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java index 423f37e7eb..9896f3e389 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java @@ -19,7 +19,7 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; import org.springframework.boot.CommandLineRunner; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java index 1fdaf4dc0a..0466bb69db 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot; -import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; +import org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java index a8e2984215..2e4a8630fa 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl.AnnotationCustomJob; import org.apache.shardingsphere.elasticjob.spring.core.scanner.ElasticJobScan; 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 4d9860908c..4decf24348 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 @@ -19,10 +19,10 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.JobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobScheduler; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduler; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl.CustomTestJob; import org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java index 49a570005a..ac3bfea062 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot; -import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; +import org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java index f17f70badb..a811f4b843 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java @@ -19,7 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java index 7ea11d493a..69f9e80eeb 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProvider; +import org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProvider; import org.apache.shardingsphere.elasticjob.spring.core.util.AopTargetUtils; import org.springframework.aop.support.AopUtils; diff --git a/spring/core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProvider b/spring/core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProvider similarity index 100% rename from spring/core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProvider rename to spring/core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProvider diff --git a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java index 2aab5fed07..aa073a278f 100644 --- a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java +++ b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.core.setup; -import org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProviderFactory; +import org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProviderFactory; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java index c7da27b158..335deb77de 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java @@ -19,8 +19,8 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.spring.namespace.job.tag.JobBeanDefinitionTag; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java index bcc4efd400..a61504fa69 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.parser; -import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; +import org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.tag.SnapshotBeanDefinitionTag; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; 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 58a9b7cf8a..8336f7ecda 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 @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.apache.shardingsphere.elasticjob.engine.api.listener.AbstractDistributeOnceElasticJobListener; +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/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java index 9278d7f688..0fe0e9f515 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.DataflowElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.FooSimpleElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java index 7ba171ff51..d690c6b49b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.DataflowElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.FooSimpleElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java index 9d64011a41..3443e123f2 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java index 55a28af43c..e33cd687c7 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java index 36d5417fc5..c2e5c17d31 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java index 153c52bdb0..784cbada79 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.job; -import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java index abe9ec754b..a28f60b4cc 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.scanner; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.annotation.AnnotationSimpleJob; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java index 38d79cea6b..126a792343 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot; -import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; +import org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration;