This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new b80c9da Spring core proxy job (#1932)
b80c9da is described below
commit b80c9daba06aea48b4d357eec6d2c8f252e6aa3a
Author: skai <[email protected]>
AuthorDate: Sat Jul 17 22:21:02 2021 +0800
Spring core proxy job (#1932)
* create elasticjob-lite-spring-core project
* elasticjob-lite-spring-boot-starter import elasticjob-lite-spring-core
* elasticjob-lite-spring-namespace import elasticjob-lite-spring-code &&
remove SpringProxyJobClassNameProvider, AopTargetUtils code and tests
Co-authored-by: 蔡顺铠 <[email protected]>
---
.../elasticjob-lite-spring-boot-starter/pom.xml | 5 +++
.../boot/job/fixture/job/impl/CustomTestJob.java | 2 +
.../pom.xml | 45 +---------------------
.../setup/SpringProxyJobClassNameProvider.java | 12 ++++--
.../lite/spring/core}/util/AopTargetUtils.java | 5 +--
...ticjob.lite.internal.setup.JobClassNameProvider | 2 +-
.../setup/JobClassNameProviderFactoryTest.java | 8 ++--
.../lite/spring/core}/util/AopTargetUtilsTest.java | 12 +++---
.../lite/spring/core}/util/TargetJob.java | 2 +-
.../src/test/resources/META-INF/logback-test.xml | 40 +++++++++++++++++++
.../elasticjob-lite-spring-namespace/pom.xml | 7 +++-
elasticjob-lite/elasticjob-lite-spring/pom.xml | 1 +
12 files changed, 79 insertions(+), 62 deletions(-)
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
index 7d97010..6c6ed7b 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml
@@ -39,6 +39,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-lite-spring-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
index b9a8872..4d805ac 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
@@ -23,12 +23,14 @@ import
org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.job.Cus
import
org.apache.shardingsphere.elasticjob.lite.spring.boot.job.repository.BarRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Component
@Slf4j
+@Transactional(rollbackFor = Exception.class)
public class CustomTestJob implements CustomJob {
@Autowired
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
similarity index 64%
copy from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
copy to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
index 21d6674..1d70059 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +23,7 @@
<artifactId>elasticjob-lite-spring</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <artifactId>elasticjob-lite-spring-namespace</artifactId>
+ <artifactId>elasticjob-lite-spring-core</artifactId>
<name>${project.artifactId}</name>
<dependencies>
@@ -31,7 +32,6 @@
<artifactId>elasticjob-lite-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -46,35 +46,11 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-email</artifactId>
- <version>${project.parent.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-wechat</artifactId>
- <version>${project.parent.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-dingtalk</artifactId>
- <version>${project.parent.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -83,14 +59,6 @@
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
@@ -105,14 +73,5 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/SpringProxyJobClassNameProvider.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/SpringProxyJobClassNameProvider.java
similarity index 82%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/SpringProxyJobClassNameProvider.java
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/SpringProxyJobClassNameProvider.java
index 6b0b0a8..06f312f 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/SpringProxyJobClassNameProvider.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/SpringProxyJobClassNameProvider.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.spring.namespace.setup;
+package org.apache.shardingsphere.elasticjob.lite.spring.core.setup;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.api.ElasticJob;
import
org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider;
-import
org.apache.shardingsphere.elasticjob.lite.spring.namespace.job.util.AopTargetUtils;
+import
org.apache.shardingsphere.elasticjob.lite.spring.core.util.AopTargetUtils;
import org.springframework.aop.support.AopUtils;
/**
@@ -29,8 +30,13 @@ import org.springframework.aop.support.AopUtils;
* Consider the proxy object that generated by cglib or jdk dynamic proxy.
* </p>
*/
+@Slf4j
public final class SpringProxyJobClassNameProvider implements
JobClassNameProvider {
-
+
+ public SpringProxyJobClassNameProvider() {
+ log.info("create SpringProxyJobClassNameProvider");
+ }
+
@Override
public String getJobClassName(final ElasticJob elasticJob) {
return AopUtils.isAopProxy(elasticJob) ?
AopTargetUtils.getTarget(elasticJob).getClass().getName() :
elasticJob.getClass().getName();
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtils.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtils.java
similarity index 97%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtils.java
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtils.java
index b09228f..f21e2d6 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtils.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtils.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.spring.namespace.job.util;
+package org.apache.shardingsphere.elasticjob.lite.spring.core.util;
+import java.lang.reflect.Field;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
import org.springframework.aop.framework.AdvisedSupport;
import org.springframework.aop.support.AopUtils;
-import java.lang.reflect.Field;
-
/**
* Aop target Utility.
*/
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
similarity index 89%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
index cdb594a..a46bdde 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.lite.spring.namespace.setup.SpringProxyJobClassNameProvider
+org.apache.shardingsphere.elasticjob.lite.spring.core.setup.SpringProxyJobClassNameProvider
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/JobClassNameProviderFactoryTest.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java
similarity index 94%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/JobClassNameProviderFactoryTest.java
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java
index 652af54..a7370f3 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/setup/JobClassNameProviderFactoryTest.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.spring.namespace.setup;
-
-import
org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProviderFactory;
-import org.junit.Test;
+package org.apache.shardingsphere.elasticjob.lite.spring.core.setup;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
+import
org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProviderFactory;
+import org.junit.Test;
+
public final class JobClassNameProviderFactoryTest {
@Test
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtilsTest.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java
similarity index 96%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtilsTest.java
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java
index 7d77363..35e2957 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/AopTargetUtilsTest.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.spring.namespace.job.util;
-
-import org.apache.shardingsphere.elasticjob.api.ElasticJob;
-import org.junit.Test;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.support.AopUtils;
+package org.apache.shardingsphere.elasticjob.lite.spring.core.util;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import org.apache.shardingsphere.elasticjob.api.ElasticJob;
+import org.junit.Test;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.support.AopUtils;
+
public final class AopTargetUtilsTest {
@Test
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/TargetJob.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/TargetJob.java
similarity index 93%
rename from
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/TargetJob.java
rename to
elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/TargetJob.java
index 6b861b8..2672775 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/util/TargetJob.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/TargetJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.spring.namespace.job.util;
+package org.apache.shardingsphere.elasticjob.lite.spring.core.util;
import org.apache.shardingsphere.elasticjob.api.ElasticJob;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/resources/META-INF/logback-test.xml
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/resources/META-INF/logback-test.xml
new file mode 100644
index 0000000..9d1601c
--- /dev/null
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/resources/META-INF/logback-test.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <property name="log.context.name" value="elastic-job" />
+ <property name="log.charset" value="UTF-8" />
+ <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
+
+ <contextName>${log.context.name}</contextName>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder charset="${log.charset}">
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="WARN" />
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <logger name="org.apache.zookeeper" level="ERROR" />
+ <logger name="org.apache.curator" level="ERROR" />
+ <logger
name="org.apache.shardingsphere.elasticjob.error.handler.general.LogJobErrorHandler"
level="OFF" />
+</configuration>
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
index 21d6674..9fbfe32 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml
@@ -31,7 +31,12 @@
<artifactId>elasticjob-lite-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-lite-spring-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/elasticjob-lite/elasticjob-lite-spring/pom.xml
b/elasticjob-lite/elasticjob-lite-spring/pom.xml
index 064f3bc..be810c3 100644
--- a/elasticjob-lite/elasticjob-lite-spring/pom.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/pom.xml
@@ -28,6 +28,7 @@
<name>${project.artifactId}</name>
<modules>
+ <module>elasticjob-lite-spring-core</module>
<module>elasticjob-lite-spring-boot-starter</module>
<module>elasticjob-lite-spring-namespace</module>
</modules>
