From cf74040e9aab1d565177781e9d2b00fea8006d01 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 14:03:26 +0800 Subject: [PATCH] Refactor elasticjob-spring module --- distribution/bin/pom.xml | 4 ++-- .../configuration/spring-boot-starter.cn.md | 8 +++---- .../configuration/spring-boot-starter.en.md | 8 +++---- .../configuration/spring-namespace.cn.md | 4 ++-- .../configuration/spring-namespace.en.md | 4 ++-- .../usage/job-api/spring-boot-starter.cn.md | 2 +- .../usage/job-api/spring-boot-starter.en.md | 2 +- .../usage/tracing/spring-boot-starter.cn.md | 2 +- .../usage/tracing/spring-boot-starter.en.md | 2 +- .../usage/tracing/spring-namespace.cn.md | 4 ++-- .../usage/tracing/spring-namespace.en.md | 2 +- .../elasticjob-example-lite-spring/pom.xml | 2 +- .../pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- examples/pom.xml | 2 +- spring/boot-starter/README.md | 4 ++-- spring/boot-starter/pom.xml | 6 ++--- .../job/ElasticJobBootstrapConfiguration.java | 4 ++-- .../ElasticJobConfigurationProperties.java | 2 +- .../job/ElasticJobLiteAutoConfiguration.java | 8 +++---- .../spring/boot/job/ElasticJobProperties.java | 2 +- .../ScheduleJobBootstrapStartupRunner.java | 2 +- ...ElasticJobRegistryCenterConfiguration.java | 2 +- .../spring/boot/reg/ZookeeperProperties.java | 2 +- ...lasticJobSnapshotServiceConfiguration.java | 2 +- .../snapshot/SnapshotServiceProperties.java | 2 +- .../ElasticJobTracingConfiguration.java | 2 +- .../boot/tracing/TracingProperties.java | 2 +- ...itional-spring-configuration-metadata.json | 22 +++++++++---------- .../main/resources/META-INF/spring.factories | 2 +- .../main/resources/META-INF/spring.provides | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...ElasticJobConfigurationPropertiesTest.java | 2 +- .../job/ElasticJobSpringBootScannerTest.java | 10 ++++----- .../boot/job/ElasticJobSpringBootTest.java | 12 +++++----- .../executor/CustomClassedJobExecutor.java | 4 ++-- .../boot/job/executor/PrintJobExecutor.java | 2 +- .../boot/job/executor/PrintJobProperties.java | 2 +- .../boot/job/fixture/EmbedTestingServer.java | 2 +- .../boot/job/fixture/job/CustomJob.java | 2 +- .../fixture/job/impl/AnnotationCustomJob.java | 4 ++-- .../job/fixture/job/impl/CustomTestJob.java | 6 ++--- .../listener/LogElasticJobListener.java | 2 +- .../listener/NoopElasticJobListener.java | 2 +- .../boot/job/repository/BarRepository.java | 2 +- .../repository/impl/BarRepositoryImpl.java | 4 ++-- .../boot/reg/ZookeeperPropertiesTest.java | 2 +- ...icJobSnapshotServiceConfigurationTest.java | 4 ++-- .../tracing/TracingConfigurationTest.java | 4 ++-- ....executor.item.impl.ClassedJobItemExecutor | 2 +- ...ob.executor.item.impl.TypedJobItemExecutor | 2 +- ...asticjob.infra.listener.ElasticJobListener | 4 ++-- .../test/resources/application-elasticjob.yml | 6 ++--- .../test/resources/application-snapshot.yml | 2 +- .../test/resources/application-tracing.yml | 2 +- spring/core/pom.xml | 4 ++-- .../core/scanner/ClassPathJobScanner.java | 2 +- .../spring/core/scanner/ElasticJobScan.java | 2 +- .../core/scanner/ElasticJobScanRegistrar.java | 2 +- .../core/scanner/JobScannerConfiguration.java | 2 +- .../SpringProxyJobClassNameProvider.java | 4 ++-- .../spring/core/util/AopTargetUtils.java | 2 +- ...engine.internal.setup.JobClassNameProvider | 2 +- .../JobClassNameProviderFactoryTest.java | 2 +- .../spring/core/util/AopTargetUtilsTest.java | 2 +- .../spring/core/util/TargetJob.java | 2 +- spring/namespace/pom.xml | 6 ++--- .../namespace/ElasticJobNamespaceHandler.java | 12 +++++----- .../job/parser/JobBeanDefinitionParser.java | 4 ++-- .../job/tag/JobBeanDefinitionTag.java | 2 +- .../parser/ZookeeperBeanDefinitionParser.java | 4 ++-- .../reg/tag/ZookeeperBeanDefinitionTag.java | 2 +- .../JobScannerBeanDefinitionParser.java | 6 ++--- .../tag/JobScannerBeanDefinitionTag.java | 2 +- .../parser/SnapshotBeanDefinitionParser.java | 4 ++-- .../tag/SnapshotBeanDefinitionTag.java | 2 +- .../parser/TracingBeanDefinitionParser.java | 4 ++-- .../tracing/tag/TracingBeanDefinitionTag.java | 2 +- .../main/resources/META-INF/spring.handlers | 2 +- .../fixture/aspect/SimpleAspect.java | 4 ++-- .../fixture/job/DataflowElasticJob.java | 2 +- .../fixture/job/FooSimpleElasticJob.java | 2 +- .../job/annotation/AnnotationSimpleJob.java | 2 +- .../job/ref/RefFooDataflowElasticJob.java | 4 ++-- .../job/ref/RefFooSimpleElasticJob.java | 4 ++-- .../fixture/listener/SimpleCglibListener.java | 2 +- .../SimpleJdkDynamicProxyListener.java | 2 +- .../fixture/listener/SimpleListener.java | 2 +- .../fixture/listener/SimpleOnceListener.java | 4 ++-- .../namespace/fixture/service/FooService.java | 2 +- .../fixture/service/FooServiceImpl.java | 2 +- .../job/AbstractJobSpringIntegrateTest.java | 8 +++---- .../AbstractOneOffJobSpringIntegrateTest.java | 8 +++---- ...bSpringNamespaceWithEventTraceRdbTest.java | 2 +- .../JobSpringNamespaceWithJobHandlerTest.java | 2 +- ...ringNamespaceWithListenerAndCglibTest.java | 2 +- ...aceWithListenerAndJdkDynamicProxyTest.java | 2 +- .../JobSpringNamespaceWithListenerTest.java | 2 +- .../job/JobSpringNamespaceWithRefTest.java | 6 ++--- .../job/JobSpringNamespaceWithTypeTest.java | 4 ++-- ...JobSpringNamespaceWithoutListenerTest.java | 2 +- ...bSpringNamespaceWithEventTraceRdbTest.java | 2 +- ...fJobSpringNamespaceWithJobHandlerTest.java | 2 +- ...ringNamespaceWithListenerAndCglibTest.java | 2 +- ...aceWithListenerAndJdkDynamicProxyTest.java | 2 +- ...OffJobSpringNamespaceWithListenerTest.java | 2 +- .../OneOffJobSpringNamespaceWithRefTest.java | 6 ++--- .../OneOffJobSpringNamespaceWithTypeTest.java | 4 ++-- ...JobSpringNamespaceWithoutListenerTest.java | 2 +- .../AbstractJobSpringIntegrateTest.java | 6 ++--- .../namespace/scanner/JobScannerTest.java | 2 +- .../SnapshotSpringNamespaceDisableTest.java | 4 ++-- .../SnapshotSpringNamespaceEnableTest.java | 4 ++-- .../namespace/snapshot/SocketUtils.java | 2 +- ...okeeperJUnitJupiterSpringContextTests.java | 2 +- .../EmbedZookeeperTestExecutionListener.java | 2 +- .../src/test/resources/META-INF/job/base.xml | 2 +- .../META-INF/job/oneOffWithEventTraceRdb.xml | 4 ++-- .../META-INF/job/oneOffWithJobHandler.xml | 4 ++-- .../META-INF/job/oneOffWithJobRef.xml | 4 ++-- .../META-INF/job/oneOffWithListener.xml | 4 ++-- .../job/oneOffWithListenerAndCglib.xml | 6 ++--- .../oneOffWithListenerAndJdkDynamicProxy.xml | 6 ++--- .../META-INF/job/oneOffWithoutListener.xml | 4 ++-- .../META-INF/job/withEventTraceRdb.xml | 4 ++-- .../resources/META-INF/job/withJobHandler.xml | 4 ++-- .../resources/META-INF/job/withJobRef.xml | 4 ++-- .../resources/META-INF/job/withListener.xml | 4 ++-- .../META-INF/job/withListenerAndCglib.xml | 6 ++--- .../job/withListenerAndJdkDynamicProxy.xml | 6 ++--- .../META-INF/job/withoutListener.xml | 4 ++-- .../META-INF/scanner/jobScannerContext.xml | 2 +- ...asticjob.infra.listener.ElasticJobListener | 8 +++---- .../test/resources/conf/job/conf.properties | 4 ++-- spring/pom.xml | 2 +- 135 files changed, 238 insertions(+), 238 deletions(-) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobBootstrapConfiguration.java (98%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobConfigurationProperties.java (97%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobLiteAutoConfiguration.java (82%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobProperties.java (94%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ScheduleJobBootstrapStartupRunner.java (95%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java (95%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/ZookeeperProperties.java (97%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java (96%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/snapshot/SnapshotServiceProperties.java (93%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/tracing/ElasticJobTracingConfiguration.java (97%) rename spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/tracing/TracingProperties.java (94%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobConfigurationPropertiesTest.java (98%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobSpringBootScannerTest.java (84%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/ElasticJobSpringBootTest.java (94%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/executor/CustomClassedJobExecutor.java (90%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/executor/PrintJobExecutor.java (95%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/executor/PrintJobProperties.java (92%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/EmbedTestingServer.java (98%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/job/CustomJob.java (93%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java (91%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/job/impl/CustomTestJob.java (86%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/listener/LogElasticJobListener.java (94%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/fixture/listener/NoopElasticJobListener.java (94%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/repository/BarRepository.java (92%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/job/repository/impl/BarRepositoryImpl.java (86%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/ZookeeperPropertiesTest.java (97%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java (91%) rename spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/boot/tracing/TracingConfigurationTest.java (92%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/scanner/ClassPathJobScanner.java (98%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/scanner/ElasticJobScan.java (95%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/scanner/ElasticJobScanRegistrar.java (97%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/scanner/JobScannerConfiguration.java (96%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/setup/SpringProxyJobClassNameProvider.java (91%) rename spring/core/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/util/AopTargetUtils.java (97%) rename spring/core/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/setup/JobClassNameProviderFactoryTest.java (94%) rename spring/core/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/util/AopTargetUtilsTest.java (96%) rename spring/core/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/core/util/TargetJob.java (94%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/ElasticJobNamespaceHandler.java (70%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/parser/JobBeanDefinitionParser.java (97%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/tag/JobBeanDefinitionTag.java (97%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java (95%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java (95%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java (85%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java (92%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java (90%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java (93%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java (90%) rename spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java (92%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/aspect/SimpleAspect.java (92%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/job/DataflowElasticJob.java (95%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/job/FooSimpleElasticJob.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java (95%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java (90%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java (88%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/listener/SimpleCglibListener.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/listener/SimpleListener.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/listener/SimpleOnceListener.java (92%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/service/FooService.java (91%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/fixture/service/FooServiceImpl.java (91%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/AbstractJobSpringIntegrateTest.java (87%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java (89%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithListenerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithRefTest.java (88%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithTypeTest.java (92%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java (90%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java (92%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java (94%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java (88%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/scanner/JobScannerTest.java (93%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java (87%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java (86%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/snapshot/SocketUtils.java (95%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java (95%) rename spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/spring/namespace/test/EmbedZookeeperTestExecutionListener.java (98%) diff --git a/distribution/bin/pom.xml b/distribution/bin/pom.xml index 9d33cc341e..ff1e411467 100644 --- a/distribution/bin/pom.xml +++ b/distribution/bin/pom.xml @@ -35,12 +35,12 @@ org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${project.version} org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${project.version} 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 f4f8f405be..c0de545e29 100644 --- a/docs/content/user-manual/configuration/spring-boot-starter.cn.md +++ b/docs/content/user-manual/configuration/spring-boot-starter.cn.md @@ -4,12 +4,12 @@ weight = 2 chapter = true +++ -使用 Spring-boot 需在 pom.xml 文件中添加 elasticjob-engine-spring-boot-starter 模块的依赖。 +使用 Spring-boot 需在 pom.xml 文件中添加 elasticjob-spring-boot-starter 模块的依赖。 ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${latest.release.version} ``` @@ -38,12 +38,12 @@ chapter = true elasticjob: regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot ``` **Properties** ``` -elasticjob.reg-center.namespace=elasticjob-engine-springboot +elasticjob.reg-center.namespace=elasticjob-springboot elasticjob.reg-center.server-lists=localhost:6181 ``` 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 ae7afd8a72..b294ca11cb 100644 --- a/docs/content/user-manual/configuration/spring-boot-starter.en.md +++ b/docs/content/user-manual/configuration/spring-boot-starter.en.md @@ -4,12 +4,12 @@ weight = 2 chapter = true +++ -To use the Spring boot, user need to add the dependency of the `elasticjob-engine-spring-boot-starter` module in the `pom.xml` file. +To use the Spring boot, user need to add the dependency of the `elasticjob-spring-boot-starter` module in the `pom.xml` file. ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${latest.release.version} ``` @@ -38,12 +38,12 @@ Reference: elasticjob: regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot ``` **Properties** ``` -elasticjob.reg-center.namespace=elasticjob-engine-springboot +elasticjob.reg-center.namespace=elasticjob-springboot elasticjob.reg-center.server-lists=localhost:6181 ``` diff --git a/docs/content/user-manual/configuration/spring-namespace.cn.md b/docs/content/user-manual/configuration/spring-namespace.cn.md index af51309b20..8744645027 100644 --- a/docs/content/user-manual/configuration/spring-namespace.cn.md +++ b/docs/content/user-manual/configuration/spring-namespace.cn.md @@ -4,12 +4,12 @@ weight = 3 chapter = true +++ -使用 Spring 命名空间需在 pom.xml 文件中添加 elasticjob-engine-spring 模块的依赖。 +使用 Spring 命名空间需在 pom.xml 文件中添加 elasticjob-spring 模块的依赖。 ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${latest.release.version} ``` diff --git a/docs/content/user-manual/configuration/spring-namespace.en.md b/docs/content/user-manual/configuration/spring-namespace.en.md index 4ece71528e..28e91b4dd5 100644 --- a/docs/content/user-manual/configuration/spring-namespace.en.md +++ b/docs/content/user-manual/configuration/spring-namespace.en.md @@ -4,12 +4,12 @@ weight = 2 chapter = true +++ -To use the Spring namespace, user need to add the dependency of the `elasticjob-engine-spring` module in the `pom.xml` file. +To use the Spring namespace, user need to add the dependency of the `elasticjob-spring` module in the `pom.xml` file. ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${latest.release.version} ``` diff --git a/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md b/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md index 1ae7a81ef2..e21e6f849d 100644 --- a/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md +++ b/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md @@ -48,7 +48,7 @@ Starter 会根据该配置自动创建 `OneOffJobBootstrap` 或 `ScheduleJobBoot elasticjob: regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot jobs: dataflowJob: elasticJobClass: org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob diff --git a/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md b/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md index 3a54a8c019..2592c27092 100644 --- a/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md +++ b/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md @@ -49,7 +49,7 @@ Configuration reference: elasticjob: regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot jobs: dataflowJob: elasticJobClass: org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob diff --git a/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md b/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md index 4bc5980511..e817e106df 100644 --- a/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md +++ b/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md @@ -37,5 +37,5 @@ elasticjob: ## 作业启动 -指定事件追踪数据源类型为 RDB，TracingConfiguration 会自动注册到容器中，如果与 elasticjob-engine-spring-boot-starter 配合使用， +指定事件追踪数据源类型为 RDB，TracingConfiguration 会自动注册到容器中，如果与 elasticjob-spring-boot-starter 配合使用， 开发者无需进行其他额外的操作，作业启动器会自动使用创建的 TracingConfiguration。 diff --git a/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md b/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md index bb38e471cf..2b2e9619fa 100644 --- a/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md +++ b/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md @@ -38,5 +38,5 @@ elasticjob: ## Job Start TracingConfiguration will be registered into the IoC container imperceptibly after setting tracing type to RDB. -If elasticjob-engine-spring-boot-starter was imported, developers need to do nothing else. +If elasticjob-spring-boot-starter was imported, developers need to do nothing else. The instances of JobBootstrap will use the TracingConfiguration automatically. diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.cn.md b/docs/content/user-manual/usage/tracing/spring-namespace.cn.md index 810c05cd57..bb5c497ef2 100644 --- a/docs/content/user-manual/usage/tracing/spring-namespace.cn.md +++ b/docs/content/user-manual/usage/tracing/spring-namespace.cn.md @@ -6,12 +6,12 @@ chapter = true ## 引入 Maven 依赖 -引入 elasticjob-engine-spring +引入 elasticjob-spring ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${elasticjob.latest.version} ``` diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.en.md b/docs/content/user-manual/usage/tracing/spring-namespace.en.md index e36bd0434c..d5f68f07f1 100644 --- a/docs/content/user-manual/usage/tracing/spring-namespace.en.md +++ b/docs/content/user-manual/usage/tracing/spring-namespace.en.md @@ -9,7 +9,7 @@ chapter = true ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${elasticjob.latest.version} ``` diff --git a/examples/elasticjob-example-lite-spring/pom.xml b/examples/elasticjob-example-lite-spring/pom.xml index 6c01294512..4f3b2043f7 100644 --- a/examples/elasticjob-example-lite-spring/pom.xml +++ b/examples/elasticjob-example-lite-spring/pom.xml @@ -57,7 +57,7 @@ org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace diff --git a/examples/elasticjob-example-lite-springboot/pom.xml b/examples/elasticjob-example-lite-springboot/pom.xml index 009b9b6535..125be9b2e8 100644 --- a/examples/elasticjob-example-lite-springboot/pom.xml +++ b/examples/elasticjob-example-lite-springboot/pom.xml @@ -46,7 +46,7 @@ org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${project.version} 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 11c5c0b6df..f3be9ed814 100644 --- a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml +++ b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml @@ -7,7 +7,7 @@ elasticjob: type: RDB regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot jobs: simpleJob: elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob diff --git a/examples/pom.xml b/examples/pom.xml index 3dd7543f30..15918249c6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -63,7 +63,7 @@ org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${revision} diff --git a/spring/boot-starter/README.md b/spring/boot-starter/README.md index a113684e3d..4634008ebe 100644 --- a/spring/boot-starter/README.md +++ b/spring/boot-starter/README.md @@ -7,7 +7,7 @@ ```xml org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${latest.version} ``` @@ -52,7 +52,7 @@ elasticjob: type: RDB regCenter: serverLists: localhost:6181 - namespace: elasticjob-engine-springboot + namespace: elasticjob-springboot jobs: classed: org.apache.shardingsphere.elasticjob.simple.job.SimpleJob: diff --git a/spring/boot-starter/pom.xml b/spring/boot-starter/pom.xml index dfbd074fe2..805c895f81 100644 --- a/spring/boot-starter/pom.xml +++ b/spring/boot-starter/pom.xml @@ -20,16 +20,16 @@ 4.0.0 org.apache.shardingsphere.elasticjob - elasticjob-engine-spring + elasticjob-spring 3.1.0-SNAPSHOT - elasticjob-engine-spring-boot-starter + elasticjob-spring-boot-starter ${project.artifactId} org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-core + elasticjob-spring-core ${project.parent.version} diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobBootstrapConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java similarity index 98% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobBootstrapConfiguration.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java index 096537171b..2895efde50 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobBootstrapConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -25,7 +25,7 @@ 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.engine.spring.boot.tracing.TracingProperties; +import org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.springframework.beans.factory.BeanCreationException; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationProperties.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationProperties.java similarity index 97% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationProperties.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationProperties.java index 93ff44cc31..f3ef7bceac 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationProperties.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import lombok.Getter; import lombok.Setter; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobLiteAutoConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobLiteAutoConfiguration.java similarity index 82% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobLiteAutoConfiguration.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobLiteAutoConfiguration.java index 5adc514479..d6ed04b500 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobLiteAutoConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobLiteAutoConfiguration.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ElasticJobRegistryCenterConfiguration; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot.ElasticJobSnapshotServiceConfiguration; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing.ElasticJobTracingConfiguration; +import org.apache.shardingsphere.elasticjob.spring.boot.reg.ElasticJobRegistryCenterConfiguration; +import org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot.ElasticJobSnapshotServiceConfiguration; +import org.apache.shardingsphere.elasticjob.spring.boot.tracing.ElasticJobTracingConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobProperties.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobProperties.java similarity index 94% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobProperties.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobProperties.java index 75c3cc508c..4c1d2e8a3b 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobProperties.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import lombok.Getter; import lombok.Setter; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ScheduleJobBootstrapStartupRunner.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java similarity index 95% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ScheduleJobBootstrapStartupRunner.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java index fd4768481e..423f37e7eb 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ScheduleJobBootstrapStartupRunner.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ScheduleJobBootstrapStartupRunner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java similarity index 95% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java index ed980afe1d..c6b749c344 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg; +package org.apache.shardingsphere.elasticjob.spring.boot.reg; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperProperties.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperProperties.java similarity index 97% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperProperties.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperProperties.java index 6af78fa634..8267a42950 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperProperties.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg; +package org.apache.shardingsphere.elasticjob.spring.boot.reg; import lombok.Getter; import lombok.Setter; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java similarity index 96% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java index 809b4dacbb..1fdaf4dc0a 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot; +package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot; import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/SnapshotServiceProperties.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/SnapshotServiceProperties.java similarity index 93% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/SnapshotServiceProperties.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/SnapshotServiceProperties.java index 61bd7550eb..11fc54877e 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/SnapshotServiceProperties.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/SnapshotServiceProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot; +package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot; import lombok.Getter; import lombok.Setter; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/ElasticJobTracingConfiguration.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java similarity index 97% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/ElasticJobTracingConfiguration.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java index 1536b584f9..86233220c1 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/ElasticJobTracingConfiguration.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing; +package org.apache.shardingsphere.elasticjob.spring.boot.tracing; import com.zaxxer.hikari.HikariDataSource; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; diff --git a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingProperties.java b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingProperties.java similarity index 94% rename from spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingProperties.java rename to spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingProperties.java index 333b8bce2f..d34fc18cb9 100644 --- a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingProperties.java +++ b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing; +package org.apache.shardingsphere.elasticjob.spring.boot.tracing; import lombok.Getter; import lombok.Setter; diff --git a/spring/boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring/boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 99940422d8..5dcbcc73a6 100644 --- a/spring/boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring/boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -19,7 +19,7 @@ "groups": [ { "name": "elasticjob.reg-center", - "type": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties", + "type": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties", "description": "Registry Center configurations." }, { @@ -36,52 +36,52 @@ "name": "elasticjob.reg-center.server-lists", "type": "java.lang.String", "description": "Include IP addresses and ports. Multiple IP address split by comma.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.namespace", "type": "java.lang.String", "description": "Namespace.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.base-sleep-time-milliseconds", "type": "java.lang.Integer", "defaultValue": 1000, "description": "Base sleep time milliseconds.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.max-sleep-time-milliseconds", "type": "java.lang.Integer", "defaultValue": 3000, "description": "Max sleep time milliseconds.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.max-retries", "type": "java.lang.Integer", "defaultValue": 3, "description": "Max retry times.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.session-timeout-milliseconds", "type": "java.lang.Integer", "description": "Session timeout milliseconds.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.connection-timeout-milliseconds", "type": "java.lang.Integer", "description": "Connection timeout milliseconds.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.reg-center.digest", "type": "java.lang.String", "description": "Zookeeper digest.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties" }, { "name": "elasticjob.tracing.type", @@ -102,13 +102,13 @@ }, { "name": "elasticjob.jobs", - "type": "java.util.Map" + "type": "java.util.Map" }, { "name": "elasticjob.dump.port", "type": "java.lang.Integer", "description": "A port for configuring SnapshotService.", - "sourceType": "org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot.SnapshotServiceProperties" + "sourceType": "org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot.SnapshotServiceProperties" }, { "name": "elasticjob.dump.enabled", diff --git a/spring/boot-starter/src/main/resources/META-INF/spring.factories b/spring/boot-starter/src/main/resources/META-INF/spring.factories index 318d6fed79..72ca9c32e4 100644 --- a/spring/boot-starter/src/main/resources/META-INF/spring.factories +++ b/spring/boot-starter/src/main/resources/META-INF/spring.factories @@ -15,4 +15,4 @@ # limitations under the License. # org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.apache.shardingsphere.elasticjob.engine.spring.boot.job.ElasticJobLiteAutoConfiguration + org.apache.shardingsphere.elasticjob.spring.boot.job.ElasticJobLiteAutoConfiguration diff --git a/spring/boot-starter/src/main/resources/META-INF/spring.provides b/spring/boot-starter/src/main/resources/META-INF/spring.provides index 8d0b5bb9b2..366410bf30 100644 --- a/spring/boot-starter/src/main/resources/META-INF/spring.provides +++ b/spring/boot-starter/src/main/resources/META-INF/spring.provides @@ -15,4 +15,4 @@ # limitations under the License. # -provides: elasticjob-engine-spring-boot-starter +provides: elasticjob-spring-boot-starter diff --git a/spring/boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring/boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c38136983e..c008333f6b 100644 --- a/spring/boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring/boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.spring.boot.job.ElasticJobLiteAutoConfiguration +org.apache.shardingsphere.elasticjob.spring.boot.job.ElasticJobLiteAutoConfiguration diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationPropertiesTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationPropertiesTest.java similarity index 98% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationPropertiesTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationPropertiesTest.java index 6c68a8a875..19f2e81a62 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobConfigurationPropertiesTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobConfigurationPropertiesTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootScannerTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java similarity index 84% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootScannerTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java index 91bf473921..a8e2984215 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootScannerTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootScannerTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl.AnnotationCustomJob; -import org.apache.shardingsphere.elasticjob.engine.spring.core.scanner.ElasticJobScan; +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; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ @SpringBootTest @ActiveProfiles("elasticjob") -@ElasticJobScan(basePackages = "org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl") +@ElasticJobScan(basePackages = "org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl") class ElasticJobSpringBootScannerTest { @Autowired diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java similarity index 94% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java index 0e72713573..4d9860908c 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/ElasticJobSpringBootTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; @@ -23,10 +23,10 @@ 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.engine.spring.boot.job.fixture.EmbedTestingServer; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl.CustomTestJob; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ZookeeperProperties; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing.TracingProperties; +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; +import org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.awaitility.Awaitility; @@ -74,7 +74,7 @@ void assertZookeeperProperties() { assertNotNull(applicationContext); ZookeeperProperties actual = applicationContext.getBean(ZookeeperProperties.class); assertThat(actual.getServerLists(), is(EmbedTestingServer.getConnectionString())); - assertThat(actual.getNamespace(), is("elasticjob-engine-spring-boot-starter")); + assertThat(actual.getNamespace(), is("elasticjob-spring-boot-starter")); } @Test diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/CustomClassedJobExecutor.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java similarity index 90% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/CustomClassedJobExecutor.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java index 0c81737e2d..eb558d1a64 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/CustomClassedJobExecutor.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.executor; +package org.apache.shardingsphere.elasticjob.spring.boot.job.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.spring.boot.job.fixture.job.CustomJob; +import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; public final class CustomClassedJobExecutor implements ClassedJobItemExecutor { diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobExecutor.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java similarity index 95% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobExecutor.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java index 077d6da747..35479eb174 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobExecutor.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.executor; +package org.apache.shardingsphere.elasticjob.spring.boot.job.executor; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ElasticJob; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobProperties.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobProperties.java similarity index 92% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobProperties.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobProperties.java index ad60a48e02..2ae9df5c22 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/executor/PrintJobProperties.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.executor; +package org.apache.shardingsphere.elasticjob.spring.boot.job.executor; public final class PrintJobProperties { diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/EmbedTestingServer.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/EmbedTestingServer.java similarity index 98% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/EmbedTestingServer.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/EmbedTestingServer.java index e226e5ea9e..dacd73e0c9 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/EmbedTestingServer.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/EmbedTestingServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/CustomJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java similarity index 93% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/CustomJob.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java index fbfc1669e2..5533160ff8 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/CustomJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java similarity index 91% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java index d388dfdf7f..7ce8dcf247 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobProp; import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.CustomJob; +import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; import org.springframework.transaction.annotation.Transactional; @Slf4j diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/CustomTestJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java similarity index 86% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/CustomTestJob.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java index de81b265e2..19633b9202 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/job/impl/CustomTestJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.CustomJob; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.repository.BarRepository; +import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; +import org.apache.shardingsphere.elasticjob.spring.boot.job.repository.BarRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/LogElasticJobListener.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java similarity index 94% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/LogElasticJobListener.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java index 30025e94c2..b55e1c8d91 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/LogElasticJobListener.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/LogElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.listener; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/NoopElasticJobListener.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java similarity index 94% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/NoopElasticJobListener.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java index 0e36c9d612..cf1940c2eb 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/fixture/listener/NoopElasticJobListener.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/listener/NoopElasticJobListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.listener; +package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/BarRepository.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/BarRepository.java similarity index 92% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/BarRepository.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/BarRepository.java index 31510b3eda..e1a7e620d3 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/BarRepository.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/BarRepository.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.repository; +package org.apache.shardingsphere.elasticjob.spring.boot.job.repository; /** * Bar Repository. diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/impl/BarRepositoryImpl.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/impl/BarRepositoryImpl.java similarity index 86% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/impl/BarRepositoryImpl.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/impl/BarRepositoryImpl.java index 79713c53a6..0d3ce75722 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/job/repository/impl/BarRepositoryImpl.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/repository/impl/BarRepositoryImpl.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.job.repository.impl; +package org.apache.shardingsphere.elasticjob.spring.boot.job.repository.impl; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.repository.BarRepository; +import org.apache.shardingsphere.elasticjob.spring.boot.job.repository.BarRepository; import org.springframework.stereotype.Repository; @Repository diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperPropertiesTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperPropertiesTest.java similarity index 97% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperPropertiesTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperPropertiesTest.java index 133df34a5f..7bf2804fff 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/ZookeeperPropertiesTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperPropertiesTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg; +package org.apache.shardingsphere.elasticjob.spring.boot.reg; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.junit.jupiter.api.Test; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java similarity index 91% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java index ab1ee55647..49a570005a 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot; +package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot; import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingConfigurationTest.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java similarity index 92% rename from spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingConfigurationTest.java rename to spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java index 96832e8f73..89f029a5b8 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/boot/tracing/TracingConfigurationTest.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing; +package org.apache.shardingsphere.elasticjob.spring.boot.tracing; -import org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.EmbedTestingServer; +import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor index bd40a8b132..efdf281e0a 100644 --- a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor +++ b/spring/boot-starter/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.spring.boot.job.executor.CustomClassedJobExecutor +org.apache.shardingsphere.elasticjob.spring.boot.job.executor.CustomClassedJobExecutor diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor index aeb4830459..80cd53a93b 100644 --- a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor +++ b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.spring.boot.job.executor.PrintJobExecutor +org.apache.shardingsphere.elasticjob.spring.boot.job.executor.PrintJobExecutor diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener index 3627b025a3..659237b886 100644 --- a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener +++ b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener @@ -15,5 +15,5 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.listener.NoopElasticJobListener -org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.listener.LogElasticJobListener +org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener.NoopElasticJobListener +org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.listener.LogElasticJobListener diff --git a/spring/boot-starter/src/test/resources/application-elasticjob.yml b/spring/boot-starter/src/test/resources/application-elasticjob.yml index 4c213ec878..204bd0e0f5 100644 --- a/spring/boot-starter/src/test/resources/application-elasticjob.yml +++ b/spring/boot-starter/src/test/resources/application-elasticjob.yml @@ -28,10 +28,10 @@ elasticjob: excludeJobNames: [customTestJob] regCenter: serverLists: localhost:18181 - namespace: elasticjob-engine-spring-boot-starter + namespace: elasticjob-spring-boot-starter jobs: customTestJob: - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl.CustomTestJob + elasticJobClass: org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl.CustomTestJob jobBootstrapBeanName: customTestJobBean shardingTotalCount: 3 jobListenerTypes: @@ -46,7 +46,7 @@ elasticjob: defaultBeanNameClassJob: cron: 0/5 * * * * ? timeZome: GMT+08:00 - elasticJobClass: org.apache.shardingsphere.elasticjob.engine.spring.boot.job.fixture.job.impl.CustomTestJob + elasticJobClass: org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl.CustomTestJob shardingTotalCount: 3 defaultBeanNameTypeJob: cron: 0/5 * * * * ? diff --git a/spring/boot-starter/src/test/resources/application-snapshot.yml b/spring/boot-starter/src/test/resources/application-snapshot.yml index 97aec15057..95e28f1de6 100644 --- a/spring/boot-starter/src/test/resources/application-snapshot.yml +++ b/spring/boot-starter/src/test/resources/application-snapshot.yml @@ -20,4 +20,4 @@ elasticjob: port: 0 regCenter: serverLists: localhost:18181 - namespace: elasticjob-engine-spring-boot-starter + namespace: elasticjob-spring-boot-starter diff --git a/spring/boot-starter/src/test/resources/application-tracing.yml b/spring/boot-starter/src/test/resources/application-tracing.yml index fb344f6025..610a73cf9a 100644 --- a/spring/boot-starter/src/test/resources/application-tracing.yml +++ b/spring/boot-starter/src/test/resources/application-tracing.yml @@ -18,4 +18,4 @@ elasticjob: regCenter: serverLists: localhost:18181 - namespace: elasticjob-engine-spring-boot-starter + namespace: elasticjob-spring-boot-starter diff --git a/spring/core/pom.xml b/spring/core/pom.xml index ef4a2cfa2a..c5dfa1a581 100644 --- a/spring/core/pom.xml +++ b/spring/core/pom.xml @@ -20,10 +20,10 @@ 4.0.0 org.apache.shardingsphere.elasticjob - elasticjob-engine-spring + elasticjob-spring 3.1.0-SNAPSHOT - elasticjob-engine-spring-core + elasticjob-spring-core ${project.artifactId} diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ClassPathJobScanner.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java similarity index 98% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ClassPathJobScanner.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java index 2d0b5c77dd..f17f70badb 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ClassPathJobScanner.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ClassPathJobScanner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.scanner; +package org.apache.shardingsphere.elasticjob.spring.core.scanner; import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScan.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScan.java similarity index 95% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScan.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScan.java index 0df4f06e6b..b571c0fd38 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScan.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScan.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.scanner; +package org.apache.shardingsphere.elasticjob.spring.core.scanner; import org.springframework.context.annotation.Import; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScanRegistrar.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScanRegistrar.java similarity index 97% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScanRegistrar.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScanRegistrar.java index d0d3d18cec..7cdcb03cf5 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/ElasticJobScanRegistrar.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/ElasticJobScanRegistrar.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.scanner; +package org.apache.shardingsphere.elasticjob.spring.core.scanner; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/JobScannerConfiguration.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/JobScannerConfiguration.java similarity index 96% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/JobScannerConfiguration.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/JobScannerConfiguration.java index 7f4404da6f..7cba1854b1 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/scanner/JobScannerConfiguration.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/scanner/JobScannerConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.scanner; +package org.apache.shardingsphere.elasticjob.spring.core.scanner; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/SpringProxyJobClassNameProvider.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java similarity index 91% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/SpringProxyJobClassNameProvider.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java index 88b66090a9..7ea11d493a 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/SpringProxyJobClassNameProvider.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/setup/SpringProxyJobClassNameProvider.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.setup; +package org.apache.shardingsphere.elasticjob.spring.core.setup; 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.engine.spring.core.util.AopTargetUtils; +import org.apache.shardingsphere.elasticjob.spring.core.util.AopTargetUtils; import org.springframework.aop.support.AopUtils; /** diff --git a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtils.java b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java similarity index 97% rename from spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtils.java rename to spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java index d019d51de9..6410b752a8 100644 --- a/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtils.java +++ b/spring/core/src/main/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.util; +package org.apache.shardingsphere.elasticjob.spring.core.util; import java.lang.reflect.Field; import lombok.AccessLevel; 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.engine.internal.setup.JobClassNameProvider index 2971f53f21..f94da17ec1 100644 --- 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.engine.internal.setup.JobClassNameProvider @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.spring.core.setup.SpringProxyJobClassNameProvider +org.apache.shardingsphere.elasticjob.spring.core.setup.SpringProxyJobClassNameProvider diff --git a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/JobClassNameProviderFactoryTest.java b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java similarity index 94% rename from spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/JobClassNameProviderFactoryTest.java rename to spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java index 97325cd185..2aab5fed07 100644 --- a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/setup/JobClassNameProviderFactoryTest.java +++ b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/setup/JobClassNameProviderFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.setup; +package org.apache.shardingsphere.elasticjob.spring.core.setup; import org.apache.shardingsphere.elasticjob.engine.internal.setup.JobClassNameProviderFactory; import org.junit.jupiter.api.Test; diff --git a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtilsTest.java b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtilsTest.java similarity index 96% rename from spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtilsTest.java rename to spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtilsTest.java index 3d4c6e56be..b516b66c6b 100644 --- a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/AopTargetUtilsTest.java +++ b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/AopTargetUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.util; +package org.apache.shardingsphere.elasticjob.spring.core.util; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.junit.jupiter.api.Test; diff --git a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/TargetJob.java b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java similarity index 94% rename from spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/TargetJob.java rename to spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java index 6f2aa795e0..cb71cde0ed 100644 --- a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/core/util/TargetJob.java +++ b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.core.util; +package org.apache.shardingsphere.elasticjob.spring.core.util; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/spring/namespace/pom.xml b/spring/namespace/pom.xml index a51a6a2247..53a038bb7d 100644 --- a/spring/namespace/pom.xml +++ b/spring/namespace/pom.xml @@ -20,16 +20,16 @@ 4.0.0 org.apache.shardingsphere.elasticjob - elasticjob-engine-spring + elasticjob-spring 3.1.0-SNAPSHOT - elasticjob-engine-spring-namespace + elasticjob-spring-namespace ${project.artifactId} org.apache.shardingsphere.elasticjob - elasticjob-engine-spring-core + elasticjob-spring-core ${project.parent.version} diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/ElasticJobNamespaceHandler.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/ElasticJobNamespaceHandler.java similarity index 70% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/ElasticJobNamespaceHandler.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/ElasticJobNamespaceHandler.java index b2328008e8..1bd7f226f0 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/ElasticJobNamespaceHandler.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/ElasticJobNamespaceHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace; +package org.apache.shardingsphere.elasticjob.spring.namespace; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner.parser.JobScannerBeanDefinitionParser; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.job.parser.JobBeanDefinitionParser; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.reg.parser.ZookeeperBeanDefinitionParser; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot.parser.SnapshotBeanDefinitionParser; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.tracing.parser.TracingBeanDefinitionParser; +import org.apache.shardingsphere.elasticjob.spring.namespace.scanner.parser.JobScannerBeanDefinitionParser; +import org.apache.shardingsphere.elasticjob.spring.namespace.job.parser.JobBeanDefinitionParser; +import org.apache.shardingsphere.elasticjob.spring.namespace.reg.parser.ZookeeperBeanDefinitionParser; +import org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.parser.SnapshotBeanDefinitionParser; +import org.apache.shardingsphere.elasticjob.spring.namespace.tracing.parser.TracingBeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; /** diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/parser/JobBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java similarity index 97% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/parser/JobBeanDefinitionParser.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java index d1dbe0b900..c7da27b158 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/parser/JobBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/parser/JobBeanDefinitionParser.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job.parser; +package org.apache.shardingsphere.elasticjob.spring.namespace.job.parser; 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.engine.spring.namespace.job.tag.JobBeanDefinitionTag; +import org.apache.shardingsphere.elasticjob.spring.namespace.job.tag.JobBeanDefinitionTag; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/tag/JobBeanDefinitionTag.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/tag/JobBeanDefinitionTag.java similarity index 97% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/tag/JobBeanDefinitionTag.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/tag/JobBeanDefinitionTag.java index fffccdeea9..a74c2d3115 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/tag/JobBeanDefinitionTag.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/tag/JobBeanDefinitionTag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job.tag; +package org.apache.shardingsphere.elasticjob.spring.namespace.job.tag; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java similarity index 95% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java index 0cb29198f9..435ca0e574 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/parser/ZookeeperBeanDefinitionParser.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.reg.parser; +package org.apache.shardingsphere.elasticjob.spring.namespace.reg.parser; import com.google.common.base.Strings; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.reg.tag.ZookeeperBeanDefinitionTag; +import org.apache.shardingsphere.elasticjob.spring.namespace.reg.tag.ZookeeperBeanDefinitionTag; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java similarity index 95% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java index f46f41cbf7..7f2a470380 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/reg/tag/ZookeeperBeanDefinitionTag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.reg.tag; +package org.apache.shardingsphere.elasticjob.spring.namespace.reg.tag; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java similarity index 85% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java index e257727606..b41f44f9d8 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/parser/JobScannerBeanDefinitionParser.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner.parser; +package org.apache.shardingsphere.elasticjob.spring.namespace.scanner.parser; -import org.apache.shardingsphere.elasticjob.engine.spring.core.scanner.JobScannerConfiguration; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner.tag.JobScannerBeanDefinitionTag; +import org.apache.shardingsphere.elasticjob.spring.core.scanner.JobScannerConfiguration; +import org.apache.shardingsphere.elasticjob.spring.namespace.scanner.tag.JobScannerBeanDefinitionTag; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java similarity index 92% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java index 37d28431a1..b3f4879d73 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/tag/JobScannerBeanDefinitionTag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner.tag; +package org.apache.shardingsphere.elasticjob.spring.namespace.scanner.tag; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java similarity index 90% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java index 9bae04e155..bcc4efd400 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/parser/SnapshotBeanDefinitionParser.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot.parser; +package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.parser; import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot.tag.SnapshotBeanDefinitionTag; +import org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.tag.SnapshotBeanDefinitionTag; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java similarity index 93% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java index 30eb33a4f7..5f93214f4e 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/tag/SnapshotBeanDefinitionTag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot.tag; +package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot.tag; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java similarity index 90% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java index 8645f3c519..1111f03d12 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.tracing.parser; +package org.apache.shardingsphere.elasticjob.spring.namespace.tracing.parser; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.tracing.tag.TracingBeanDefinitionTag; +import org.apache.shardingsphere.elasticjob.spring.namespace.tracing.tag.TracingBeanDefinitionTag; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java similarity index 92% rename from spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java rename to spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java index a288cdf20e..68b78929d5 100644 --- a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java +++ b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/tag/TracingBeanDefinitionTag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.tracing.tag; +package org.apache.shardingsphere.elasticjob.spring.namespace.tracing.tag; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/main/resources/META-INF/spring.handlers b/spring/namespace/src/main/resources/META-INF/spring.handlers index 58639891d2..7d4a1bc7e5 100644 --- a/spring/namespace/src/main/resources/META-INF/spring.handlers +++ b/spring/namespace/src/main/resources/META-INF/spring.handlers @@ -15,4 +15,4 @@ # limitations under the License. # -http\://shardingsphere.apache.org/schema/elasticjob=org.apache.shardingsphere.elasticjob.engine.spring.namespace.ElasticJobNamespaceHandler +http\://shardingsphere.apache.org/schema/elasticjob=org.apache.shardingsphere.elasticjob.spring.namespace.ElasticJobNamespaceHandler diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/aspect/SimpleAspect.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/aspect/SimpleAspect.java similarity index 92% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/aspect/SimpleAspect.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/aspect/SimpleAspect.java index 1672fca67e..59f8e5e986 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/aspect/SimpleAspect.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/aspect/SimpleAspect.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.aspect; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.aspect; import org.aspectj.lang.JoinPoint; import org.springframework.stereotype.Component; @@ -30,7 +30,7 @@ public class SimpleAspect { /** * Aspect. */ - @Pointcut("execution(* org.apache.shardingsphere.elasticjob.engine.spring.fixture..*(..))") + @Pointcut("execution(* org.apache.shardingsphere.elasticjob.spring.fixture..*(..))") public void aspect() { } diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/DataflowElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java similarity index 95% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/DataflowElasticJob.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java index 138d758315..6693833b52 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/DataflowElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/FooSimpleElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/FooSimpleElasticJob.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java index d9b8570f1d..1bbcb567aa 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/FooSimpleElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job; import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ShardingContext; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java similarity index 95% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java index 089cba9534..67fcdb6413 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.annotation; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.annotation; import lombok.Getter; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java similarity index 90% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java index c0bb9892b8..d607a29072 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.ref; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.ref; import lombok.Getter; import lombok.Setter; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.service.FooService; +import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; import java.util.Collections; import java.util.List; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java similarity index 88% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java index 5964c53d23..4ad7fdf0c4 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.ref; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job.ref; import lombok.Getter; import lombok.Setter; import org.apache.shardingsphere.elasticjob.api.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.service.FooService; +import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; public class RefFooSimpleElasticJob implements SimpleJob { diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleCglibListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleCglibListener.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java index 6dc2dc8fe7..2ff8f3a8ae 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleCglibListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleCglibListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java index a656454b23..91be80eee8 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleJdkDynamicProxyListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleListener.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java index 000a8f9952..52bf6ff235 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener; import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleOnceListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java similarity index 92% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleOnceListener.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java index 7df627eb7b..58a9b7cf8a 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/listener/SimpleOnceListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/listener/SimpleOnceListener.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener; +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.engine.spring.namespace.fixture.service.FooService; +import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; import org.springframework.beans.factory.annotation.Autowired; import static org.hamcrest.CoreMatchers.is; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooService.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooService.java similarity index 91% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooService.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooService.java index 1a35de7581..3a8e7f692b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooService.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.service; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service; public interface FooService { diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooServiceImpl.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooServiceImpl.java similarity index 91% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooServiceImpl.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooServiceImpl.java index a9e0d05df3..eb1c1ef37d 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/fixture/service/FooServiceImpl.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/service/FooServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.service; +package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service; public class FooServiceImpl implements FooService { diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java similarity index 87% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractJobSpringIntegrateTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java index eb10c0b6aa..9278d7f688 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractJobSpringIntegrateTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +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.engine.spring.namespace.fixture.job.DataflowElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.FooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java similarity index 89% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java index d672a55ef6..7ba171ff51 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +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.engine.spring.namespace.fixture.job.DataflowElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.FooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +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; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java index de4b47314f..ad287e64f3 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithEventTraceRdbTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java index 97d17f80c5..ff5648da5e 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithJobHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java index 2f64a6ae1f..33daaaa94e 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndCglibTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java index 19ebb96870..a9cc9b403a 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerTest.java index 24c81dfafa..29d699046f 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithListenerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithListenerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithRefTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java similarity index 88% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithRefTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java index 21b729cc81..9d64011a41 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithRefTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithRefTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +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; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithTypeTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java similarity index 92% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithTypeTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java index 61f4d5e9b3..55a28af43c 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithTypeTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithTypeTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.apache.shardingsphere.elasticjob.engine.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java index 7016acd6f4..56d5b369e0 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/JobSpringNamespaceWithoutListenerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java index 98ab3a44ba..219d2c63cf 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithEventTraceRdbTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java index 7053ac2cbd..71b3bdbda7 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithJobHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java index f650ec78e1..beffed9971 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndCglibTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java index 6c1ff0f1b6..ef3dc52f97 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerAndJdkDynamicProxyTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java index 87f41f7a95..30b875461b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithListenerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java similarity index 90% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java index eac01a5da4..36d5417fc5 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +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.engine.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +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; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java similarity index 92% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java index 760d75dec2..153c52bdb0 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +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.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java similarity index 94% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java index d779191235..676fafc50e 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/job/OneOffJobSpringNamespaceWithoutListenerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.job; +package org.apache.shardingsphere.elasticjob.spring.namespace.job; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java similarity index 88% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java index 6ca0928044..abe9ec754b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner; +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.engine.spring.namespace.fixture.job.annotation.AnnotationSimpleJob; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +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; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/JobScannerTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/JobScannerTest.java similarity index 93% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/JobScannerTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/JobScannerTest.java index ce2b34530c..a031576468 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/JobScannerTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/scanner/JobScannerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.scanner; +package org.apache.shardingsphere.elasticjob.spring.namespace.scanner; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java similarity index 87% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java index 7b1da87381..38d79cea6b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot; +package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot; import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java similarity index 86% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java index 108c37aa7e..a52e334832 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot; +package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot; -import org.apache.shardingsphere.elasticjob.engine.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.apache.shardingsphere.elasticjob.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SocketUtils.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SocketUtils.java similarity index 95% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SocketUtils.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SocketUtils.java index 8ceec037f1..cd6fe1735a 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/snapshot/SocketUtils.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/snapshot/SocketUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.snapshot; +package org.apache.shardingsphere.elasticjob.spring.namespace.snapshot; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java similarity index 95% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java index 74fce8e4a2..bde8ca1248 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.test; +package org.apache.shardingsphere.elasticjob.spring.namespace.test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.TestExecutionListeners; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/EmbedZookeeperTestExecutionListener.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/EmbedZookeeperTestExecutionListener.java similarity index 98% rename from spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/EmbedZookeeperTestExecutionListener.java rename to spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/EmbedZookeeperTestExecutionListener.java index efbdb9da1c..f79ac9100b 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/test/EmbedZookeeperTestExecutionListener.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/test/EmbedZookeeperTestExecutionListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.spring.namespace.test; +package org.apache.shardingsphere.elasticjob.spring.namespace.test; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/spring/namespace/src/test/resources/META-INF/job/base.xml b/spring/namespace/src/test/resources/META-INF/job/base.xml index d9c1ff679c..b2b83c4509 100644 --- a/spring/namespace/src/test/resources/META-INF/job/base.xml +++ b/spring/namespace/src/test/resources/META-INF/job/base.xml @@ -40,5 +40,5 @@ - + diff --git a/spring/namespace/src/test/resources/META-INF/job/oneOffWithEventTraceRdb.xml b/spring/namespace/src/test/resources/META-INF/job/oneOffWithEventTraceRdb.xml index 4248c702e8..d9e91ab7ab 100644 --- a/spring/namespace/src/test/resources/META-INF/job/oneOffWithEventTraceRdb.xml +++ b/spring/namespace/src/test/resources/META-INF/job/oneOffWithEventTraceRdb.xml @@ -26,8 +26,8 @@ "> - - + + - - + + - + - + diff --git a/spring/namespace/src/test/resources/META-INF/job/oneOffWithListener.xml b/spring/namespace/src/test/resources/META-INF/job/oneOffWithListener.xml index a5a0c18358..02aaed04fa 100644 --- a/spring/namespace/src/test/resources/META-INF/job/oneOffWithListener.xml +++ b/spring/namespace/src/test/resources/META-INF/job/oneOffWithListener.xml @@ -26,8 +26,8 @@ "> - - + + - + - - + + - + - - + + - - + + - - + + - - + + - + - + diff --git a/spring/namespace/src/test/resources/META-INF/job/withListener.xml b/spring/namespace/src/test/resources/META-INF/job/withListener.xml index 44aaecfcf8..d0807358fc 100644 --- a/spring/namespace/src/test/resources/META-INF/job/withListener.xml +++ b/spring/namespace/src/test/resources/META-INF/job/withListener.xml @@ -26,8 +26,8 @@ "> - - + + - + - - + + - + - - + + - - + + - + diff --git a/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener index b8e125cef7..8c9292ec19 100644 --- a/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener +++ b/spring/namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener @@ -15,7 +15,7 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener.SimpleCglibListener -org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener.SimpleJdkDynamicProxyListener -org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener.SimpleListener -org.apache.shardingsphere.elasticjob.engine.spring.namespace.fixture.listener.SimpleOnceListener +org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener.SimpleCglibListener +org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener.SimpleJdkDynamicProxyListener +org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener.SimpleListener +org.apache.shardingsphere.elasticjob.spring.namespace.fixture.listener.SimpleOnceListener diff --git a/spring/namespace/src/test/resources/conf/job/conf.properties b/spring/namespace/src/test/resources/conf/job/conf.properties index 55154f9077..4f09309e23 100644 --- a/spring/namespace/src/test/resources/conf/job/conf.properties +++ b/spring/namespace/src/test/resources/conf/job/conf.properties @@ -16,7 +16,7 @@ # regCenter.serverLists=localhost:3181 -regCenter.namespace=elasticjob-engine-spring-test +regCenter.namespace=elasticjob-spring-test regCenter.baseSleepTimeMilliseconds=1000 regCenter.maxSleepTimeMilliseconds=3000 regCenter.maxRetries=3 @@ -39,5 +39,5 @@ dataflowJob.overwrite=true dataflowJob.streamingProcess=true # need absolute path -#script.scriptCommandLine=your_path/elasticjob/elasticjob-engine-spring/src/test/resources/script/demo.sh +#script.scriptCommandLine=your_path/elasticjob/elasticjob-spring/src/test/resources/script/demo.sh script.scriptCommandLine=echo test diff --git a/spring/pom.xml b/spring/pom.xml index 581f0dc97e..6357ab8d90 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ elasticjob 3.1.0-SNAPSHOT - elasticjob-engine-spring + elasticjob-spring pom ${project.artifactId}