Merge kernel and infra module

apache · Oct 30, 2023 · 1cfc7c2 · 1cfc7c2
1 parent e7f1a7f
commit 1cfc7c2
Show file tree

Hide file tree

Showing 184 changed files with 298 additions and 514 deletions.
diff --git a/.../org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/.../org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
@@ -29,8 +29,8 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -48,7 +48,7 @@
 import java.util.Properties;
 
 /**
- * Job error handler for send error message via dingtalk.
+ * Job error handler for send error message via Dingtalk.
  */
 @Slf4j
 public final class DingtalkJobErrorHandler implements JobErrorHandler {

diff --git a/...gsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java b/...gsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java
@@ -17,13 +17,13 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.dingtalk;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
-import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 
 import java.util.Properties;
 
 /**
- * Job error handler properties validator for dingtalk.
+ * Job error handler properties validator for Dingtalk.
  */
 public final class DingtalkJobErrorHandlerPropertiesValidator implements JobErrorHandlerPropertiesValidator {
 

diff --git a/.../apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java b/.../apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.elasticjob.error.handler.dingtalk;
 
 /**
- * Job error handler properties constants for send error message via dingtalk.
+ * Job error handler properties constants for send error message via Dingtalk.
  */
 public final class DingtalkPropertiesConstants {
 

diff --git a/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler b/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler
diff --git a/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator b/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator
diff --git a/...ere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java b/...ere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.dingtalk;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.Test;
 

diff --git a/.../apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/.../apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
@@ -20,8 +20,8 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
 import org.apache.shardingsphere.elasticjob.error.handler.dingtalk.fixture.DingtalkInternalController;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration;
 import org.apache.shardingsphere.elasticjob.restful.RestfulService;

diff --git a/.../shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java b/.../shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
@@ -21,7 +21,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 import org.apache.shardingsphere.elasticjob.restful.Http;
 import org.apache.shardingsphere.elasticjob.restful.RestfulController;
 import org.apache.shardingsphere.elasticjob.restful.annotation.Mapping;

diff --git a/...n/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/...n/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 
 import javax.mail.Authenticator;
 import javax.mail.BodyPart;

diff --git a/...hardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java b/...hardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.email;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
-import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 
 import java.util.Properties;
 

diff --git a/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler b/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler
diff --git a/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator b/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator
diff --git a/...ingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java b/...ingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.email;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.Test;
 

diff --git a/...va/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/...va/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
@@ -20,7 +20,7 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java b/...java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
@@ -28,8 +28,8 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/...rdingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java b/...rdingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.wechat;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
-import org.apache.shardingsphere.elasticjob.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 
 import java.util.Properties;
 

diff --git a/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler b/....elasticjob.error.handler.JobErrorHandler → ...al.executor.error.handler.JobErrorHandler
diff --git a/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator b/...andler.JobErrorHandlerPropertiesValidator → ...andler.JobErrorHandlerPropertiesValidator
diff --git a/...gsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java b/...gsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.elasticjob.error.handler.wechat;
 
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandlerPropertiesValidator;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.Test;
 

diff --git a/.../org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/.../org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
@@ -20,8 +20,8 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
 import org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture.WechatInternalController;
+import org.apache.shardingsphere.elasticjob.kernel.internal.executor.error.handler.JobErrorHandler;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration;
 import org.apache.shardingsphere.elasticjob.restful.RestfulService;

diff --git a/...ache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java b/...ache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 import org.apache.shardingsphere.elasticjob.restful.Http;
 import org.apache.shardingsphere.elasticjob.restful.RestfulController;
 import org.apache.shardingsphere.elasticjob.restful.annotation.Mapping;

diff --git a/...ttp/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java b/...ttp/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java
@@ -26,9 +26,9 @@
 import org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor;
 import org.apache.shardingsphere.elasticjob.http.pojo.HttpParam;
 import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionException;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java b/...src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java
@@ -23,8 +23,8 @@
 import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService;
 import org.apache.shardingsphere.elasticjob.http.executor.fixture.InternalController;
 import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionException;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService;
 import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration;
 import org.apache.shardingsphere.elasticjob.restful.RestfulService;

diff --git a/...src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java b/...src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java
@@ -25,9 +25,9 @@
 import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext;
 import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService;
 import org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
-import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory;
 import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties;
 
 import java.io.IOException;

diff --git a/...ript/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java b/...ript/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java
@@ -22,8 +22,8 @@
 import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
 import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext;
 import org.apache.shardingsphere.elasticjob.spi.param.JobRuntimeService;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException;
-import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException;
+import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException;
 import org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor;
 import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/ecosystem/tracing/api/pom.xml b/ecosystem/tracing/api/pom.xml
diff --git a/ecosystem/tracing/api/src/test/resources/logback-test.xml b/ecosystem/tracing/api/src/test/resources/logback-test.xml
diff --git a/ecosystem/tracing/pom.xml b/ecosystem/tracing/pom.xml
@@ -28,7 +28,6 @@
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>api</module>
         <module>rdb</module>
     </modules>
 </project>
diff --git a/ecosystem/tracing/rdb/pom.xml b/ecosystem/tracing/rdb/pom.xml
@@ -29,7 +29,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-tracing-api</artifactId>
+            <artifactId>elasticjob-kernel</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 

diff --git a/.../org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java b/.../org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java
@@ -24,7 +24,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 
 import javax.sql.DataSource;

diff --git a/.../java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java b/.../java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
@@ -19,14 +19,13 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration;
 
 import javax.sql.DataSource;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 /**
- * Mapping {@link TracingStorageConfiguration} to {@link DataSource}.
+ * Mapping tracing storage configuration} to data source.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DataSourceRegistry {

diff --git a/...e/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java b/...e/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.elasticjob.tracing.api.TracingStorageConfiguration;
-import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter;
-import org.apache.shardingsphere.elasticjob.tracing.exception.TracingStorageUnavailableException;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.api.TracingStorageConfiguration;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingStorageUnavailableException;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.storage.TracingStorageConverter;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

diff --git a/...in/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java b/...in/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
@@ -17,9 +17,9 @@
 
 package org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
 
-import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent;
-import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
-import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobExecutionEvent;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.event.JobStatusTraceEvent;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener;
 import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage;
 
 import javax.sql.DataSource;

diff --git a/...pache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java b/...pache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfiguration.java
@@ -17,9 +17,9 @@
 
 package org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
 
-import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException;
-import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListener;
-import org.apache.shardingsphere.elasticjob.tracing.listener.TracingListenerConfiguration;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.exception.TracingConfigurationException;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListener;
+import org.apache.shardingsphere.elasticjob.kernel.internal.tracing.listener.TracingListenerConfiguration;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;