fix code

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -11,7 +11,7 @@ import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
 import org.dbsyncer.parser.ProfileComponent;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Meta;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/tablegroup/TableGroupChecker.java

@@ -12,7 +12,7 @@ import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
 import org.dbsyncer.parser.ParserComponent;
 import org.dbsyncer.parser.ProfileComponent;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.FieldMapping;
 import org.dbsyncer.parser.model.Mapping;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/BaseServiceImpl.java

@@ -2,7 +2,7 @@ package org.dbsyncer.biz.impl;
 
 import org.dbsyncer.parser.ProfileComponent;
 import org.dbsyncer.parser.enums.MetaEnum;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.MessageService;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java

@@ -16,7 +16,7 @@ import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.manager.ManagerFactory;
 import org.dbsyncer.parser.ProfileComponent;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Connector;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java

@@ -31,7 +31,7 @@ import org.dbsyncer.biz.model.AppReportMetric;
 import org.dbsyncer.biz.model.MetricResponse;
 import org.dbsyncer.parser.ProfileComponent;
 import org.dbsyncer.parser.enums.MetaEnum;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.Mapping;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/SystemConfigServiceImpl.java

@@ -11,7 +11,7 @@ import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.SystemConfig;
-import org.dbsyncer.manager.template.PreloadTemplate;
+import org.dbsyncer.manager.impl.PreloadTemplate;
 import org.dbsyncer.plugin.enums.FileSuffixEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/AbstractPuller.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/AbstractPuller.java

@@ -1,7 +1,6 @@
-package org.dbsyncer.manager.puller;
+package org.dbsyncer.manager;
 
 import org.dbsyncer.manager.event.ClosedEvent;
-import org.dbsyncer.manager.Puller;
 import org.springframework.context.ApplicationContext;
 
 import javax.annotation.Resource;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/FullPuller.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/FullPuller.java

@@ -1,8 +1,9 @@
-package org.dbsyncer.manager.puller;
+package org.dbsyncer.manager.impl;
 
 import org.dbsyncer.common.util.NumberUtil;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
+import org.dbsyncer.manager.AbstractPuller;
 import org.dbsyncer.parser.ParserComponent;
 import org.dbsyncer.parser.ProfileComponent;
 import org.dbsyncer.parser.enums.ParserEnum;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java

@@ -1,6 +1,7 @@
-package org.dbsyncer.manager.puller;
+package org.dbsyncer.manager.impl;
 
 import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.manager.AbstractPuller;
 import org.dbsyncer.parser.event.RefreshOffsetEvent;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/PreloadTemplate.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/PreloadTemplate.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.manager.template;
+package org.dbsyncer.manager.impl;
 
 import org.dbsyncer.manager.event.PreloadCompletedEvent;
 import org.dbsyncer.common.model.Paging;
@@ -14,7 +14,7 @@ import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Meta;
 import org.dbsyncer.parser.model.OperationConfig;
-import org.dbsyncer.parser.template.OperationTemplate;
+import org.dbsyncer.parser.impl.OperationTemplate;
 import org.dbsyncer.plugin.PluginFactory;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.constant.ConfigConstant;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/template/OperationTemplate.java → dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/OperationTemplate.java

@@ -1,7 +1,7 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.parser.template;
+package org.dbsyncer.parser.impl;
 
 import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.common.util.CollectionUtils;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ProfileComponentImpl.java

@@ -23,7 +23,6 @@ import org.dbsyncer.parser.model.QueryConfig;
 import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.parser.model.UserConfig;
-import org.dbsyncer.parser.template.OperationTemplate;
 import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.storage.enums.StorageDataStatusEnum;
 import org.springframework.stereotype.Component;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Mapping.java

@@ -2,7 +2,7 @@ package org.dbsyncer.parser.model;
 
 import org.dbsyncer.connector.model.Field;
 import org.dbsyncer.listener.config.ListenerConfig;
-import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.List;

dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/PluginFactory.java

@@ -3,13 +3,12 @@ package org.dbsyncer.plugin;
 import org.apache.commons.io.FileUtils;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.plugin.config.Plugin;
-import org.dbsyncer.sdk.model.AbstractConvertContext;
 import org.dbsyncer.sdk.spi.ConvertContext;
 import org.dbsyncer.sdk.spi.ConvertService;
-import org.dbsyncer.sdk.spi.ProxyApplicationContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -55,11 +54,11 @@ public class PluginFactory implements DisposableBean {
     private final Map<String, ConvertService> service = new LinkedHashMap<>();
 
     @Resource
-    private ProxyApplicationContext proxyApplicationContext;
+    private ApplicationContext applicationContext;
 
     @PostConstruct
     private void init() {
-        Map<String, ConvertService> services = proxyApplicationContext.getBeansOfType(ConvertService.class);
+        Map<String, ConvertService> services = applicationContext.getBeansOfType(ConvertService.class);
         if (!CollectionUtils.isEmpty(services)) {
             services.forEach((k, s) -> {
                 String pluginId = createPluginId(s.getClass().getName(), s.getVersion());
@@ -114,13 +113,10 @@ public class PluginFactory implements DisposableBean {
     public void convert(Plugin plugin, ConvertContext context) {
         if (null != plugin) {
             String pluginId = createPluginId(plugin.getClassName(), plugin.getVersion());
-            if (service.containsKey(pluginId)) {
-                if (context instanceof AbstractConvertContext) {
-                    AbstractConvertContext ctx = (AbstractConvertContext) context;
-                    ctx.setContext(proxyApplicationContext);
-                }
-                service.get(pluginId).convert(context);
-            }
+            service.computeIfPresent(pluginId, (k, c) -> {
+                c.convert(context);
+                return c;
+            });
         }
     }
 
@@ -133,9 +129,10 @@ public class PluginFactory implements DisposableBean {
     public void postProcessAfter(Plugin plugin, ConvertContext context) {
         if (null != plugin) {
             String pluginId = createPluginId(plugin.getClassName(), plugin.getVersion());
-            if (service.containsKey(pluginId)) {
-                service.get(pluginId).postProcessAfter(context);
-            }
+            service.computeIfPresent(pluginId, (k, c) -> {
+                c.postProcessAfter(context);
+                return c;
+            });
         }
     }
 

dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/proxy/ProxyApplicationContextImpl.java

@@ -1,268 +0,0 @@
-package org.dbsyncer.plugin.proxy;
-
-import org.dbsyncer.sdk.spi.ProxyApplicationContext;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.MessageSourceResolvable;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.core.ResolvableType;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * @author AE86
- * @version 1.0.0
- * @date 2022/6/30 15:14
- */
-@Component("proxyApplicationContext")
-public class ProxyApplicationContextImpl implements ProxyApplicationContext {
-
-    @Resource
-    private ApplicationContext applicationContext;
-
-    @Override
-    public String getId() {
-        return applicationContext.getId();
-    }
-
-    @Override
-    public String getApplicationName() {
-        return applicationContext.getApplicationName();
-    }
-
-    @Override
-    public String getDisplayName() {
-        return applicationContext.getDisplayName();
-    }
-
-    @Override
-    public long getStartupDate() {
-        return applicationContext.getStartupDate();
-    }
-
-    @Override
-    public ApplicationContext getParent() {
-        return applicationContext.getParent();
-    }
-
-    @Override
-    public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
-        return applicationContext.getAutowireCapableBeanFactory();
-    }
-
-    @Override
-    public BeanFactory getParentBeanFactory() {
-        return applicationContext.getParentBeanFactory();
-    }
-
-    @Override
-    public boolean containsLocalBean(String name) {
-        return applicationContext.containsLocalBean(name);
-    }
-
-    @Override
-    public boolean containsBeanDefinition(String beanName) {
-        return applicationContext.containsBeanDefinition(beanName);
-    }
-
-    @Override
-    public int getBeanDefinitionCount() {
-        return applicationContext.getBeanDefinitionCount();
-    }
-
-    @Override
-    public String[] getBeanDefinitionNames() {
-        return applicationContext.getBeanDefinitionNames();
-    }
-
-    @Override
-    public <T> ObjectProvider<T> getBeanProvider(Class<T> aClass, boolean b) {
-        return applicationContext.getBeanProvider(aClass, b);
-    }
-
-    @Override
-    public <T> ObjectProvider<T> getBeanProvider(ResolvableType resolvableType, boolean b) {
-        return applicationContext.getBeanProvider(resolvableType, b);
-    }
-
-    @Override
-    public String[] getBeanNamesForType(ResolvableType type) {
-        return applicationContext.getBeanNamesForType(type);
-    }
-
-    @Override
-    public String[] getBeanNamesForType(ResolvableType type, boolean includeNonSingletons, boolean allowEagerInit) {
-        return applicationContext.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
-    }
-
-    @Override
-    public String[] getBeanNamesForType(Class<?> type) {
-        return applicationContext.getBeanNamesForType(type);
-    }
-
-    @Override
-    public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
-        return applicationContext.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
-    }
-
-    @Override
-    public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException {
-        return applicationContext.getBeansOfType(type);
-    }
-
-    @Override
-    public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons, boolean allowEagerInit) throws BeansException {
-        return applicationContext.getBeansOfType(type, includeNonSingletons, allowEagerInit);
-    }
-
-    @Override
-    public String[] getBeanNamesForAnnotation(Class<? extends Annotation> annotationType) {
-        return applicationContext.getBeanNamesForAnnotation(annotationType);
-    }
-
-    @Override
-    public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType) throws BeansException {
-        return applicationContext.getBeansWithAnnotation(annotationType);
-    }
-
-    @Override
-    public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) throws NoSuchBeanDefinitionException {
-        return applicationContext.findAnnotationOnBean(beanName, annotationType);
-    }
-
-    @Override
-    public <A extends Annotation> A findAnnotationOnBean(String s, Class<A> aClass, boolean b) throws NoSuchBeanDefinitionException {
-        return applicationContext.findAnnotationOnBean(s, aClass, b);
-    }
-
-    @Override
-    public Object getBean(String name) throws BeansException {
-        return applicationContext.getBean(name);
-    }
-
-    @Override
-    public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
-        return applicationContext.getBean(name, requiredType);
-    }
-
-    @Override
-    public Object getBean(String name, Object... args) throws BeansException {
-        return applicationContext.getBean(name, args);
-    }
-
-    @Override
-    public <T> T getBean(Class<T> requiredType) throws BeansException {
-        return applicationContext.getBean(requiredType);
-    }
-
-    @Override
-    public <T> T getBean(Class<T> requiredType, Object... args) throws BeansException {
-        return applicationContext.getBean(requiredType, args);
-    }
-
-    @Override
-    public <T> ObjectProvider<T> getBeanProvider(Class<T> requiredType) {
-        return applicationContext.getBeanProvider(requiredType);
-    }
-
-    @Override
-    public <T> ObjectProvider<T> getBeanProvider(ResolvableType requiredType) {
-        return applicationContext.getBeanProvider(requiredType);
-    }
-
-    @Override
-    public boolean containsBean(String name) {
-        return applicationContext.containsBean(name);
-    }
-
-    @Override
-    public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-        return applicationContext.isSingleton(name);
-    }
-
-    @Override
-    public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
-        return applicationContext.isPrototype(name);
-    }
-
-    @Override
-    public boolean isTypeMatch(String name, ResolvableType typeToMatch) throws NoSuchBeanDefinitionException {
-        return applicationContext.isTypeMatch(name, typeToMatch);
-    }
-
-    @Override
-    public boolean isTypeMatch(String name, Class<?> typeToMatch) throws NoSuchBeanDefinitionException {
-        return applicationContext.isTypeMatch(name, typeToMatch);
-    }
-
-    @Override
-    public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
-        return applicationContext.getType(name);
-    }
-
-    @Override
-    public Class<?> getType(String name, boolean allowFactoryBeanInit) throws NoSuchBeanDefinitionException {
-        return applicationContext.getType(name, allowFactoryBeanInit);
-    }
-
-    @Override
-    public String[] getAliases(String name) {
-        return applicationContext.getAliases(name);
-    }
-
-    @Override
-    public void publishEvent(Object event) {
-        applicationContext.publishEvent(event);
-    }
-
-    @Override
-    public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
-        return applicationContext.getMessage(code, args, defaultMessage, locale);
-    }
-
-    @Override
-    public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
-        return applicationContext.getMessage(code, args, locale);
-    }
-
-    @Override
-    public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
-        return applicationContext.getMessage(resolvable, locale);
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        return applicationContext.getEnvironment();
-    }
-
-    @Override
-    public org.springframework.core.io.Resource[] getResources(String locationPattern) throws IOException {
-        return applicationContext.getResources(locationPattern);
-    }
-
-    @Override
-    public org.springframework.core.io.Resource getResource(String location) {
-        return applicationContext.getResource(location);
-    }
-
-    @Override
-    public ClassLoader getClassLoader() {
-        return applicationContext.getClassLoader();
-    }
-
-    @Override
-    public void publishEvent(ApplicationEvent event) {
-        applicationContext.publishEvent(event);
-    }
-}

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/SdkException.java

@@ -0,0 +1,30 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
+package org.dbsyncer.sdk;
+
+/**
+ * @Version 1.0.0
+ * @Author AE86
+ * @Date 2023-11-16 00:51
+ */
+public class SdkException extends RuntimeException {
+
+	private static final long serialVersionUID = 1L;
+
+	public SdkException(String message) {
+        super(message);
+    }
+
+    public SdkException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SdkException(Throwable cause) {
+        super(cause);
+    }
+
+    protected SdkException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/ModelEnum.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/ModelEnum.java

@@ -1,14 +1,14 @@
-package org.dbsyncer.parser.enums;
+package org.dbsyncer.sdk.enums;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.parser.ParserException;
+import org.dbsyncer.sdk.SdkException;
 
 /**
  * 驱动同步方式枚举
  *
- * @author AE86
- * @version 1.0.0
- * @date 2020/04/21 16:19
+ * @Version 1.0.0
+ * @Author AE86
+ * @Date 2023-11-16 00:51
  */
 public enum ModelEnum {
 
@@ -29,13 +29,13 @@ public enum ModelEnum {
         this.name = name;
     }
 
-    public static ModelEnum getModelEnum(String code) throws ParserException {
+    public static ModelEnum getModelEnum(String code) throws SdkException {
         for (ModelEnum e : ModelEnum.values()) {
             if (StringUtil.equals(code, e.getCode())) {
                 return e;
             }
         }
-        throw new ParserException(String.format("Model code \"%s\" does not exist.", code));
+        throw new SdkException(String.format("Model code \"%s\" does not exist.", code));
     }
 
     public static boolean isFull(String model) {

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/AbstractConvertContext.java

@@ -2,7 +2,6 @@ package org.dbsyncer.sdk.model;
 
 import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.dbsyncer.sdk.spi.ConvertContext;
-import org.dbsyncer.sdk.spi.ProxyApplicationContext;
 
 import java.util.List;
 import java.util.Map;
@@ -20,11 +19,6 @@ public abstract class AbstractConvertContext implements ConvertContext {
      */
     private boolean terminated;
 
-    /**
-     * Spring上下文
-     */
-    protected ProxyApplicationContext context;
-
     /**
      * 数据源连接实例
      */
@@ -71,10 +65,6 @@ public abstract class AbstractConvertContext implements ConvertContext {
         this.targetList = targetList;
     }
 
-    public void setContext(ProxyApplicationContext context) {
-        this.context = context;
-    }
-
     @Override
     public boolean isTerminated() {
         return terminated;
@@ -85,11 +75,6 @@ public abstract class AbstractConvertContext implements ConvertContext {
         this.terminated = terminated;
     }
 
-    @Override
-    public ProxyApplicationContext getContext() {
-        return context;
-    }
-
     @Override
     public ConnectorMapper getSourceConnectorMapper() {
         return sourceConnectorMapper;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConvertContext.java

@@ -27,11 +27,6 @@ public interface ConvertContext {
      */
     void setTerminated(boolean terminated);
 
-    /**
-     * Spring上下文
-     */
-    ProxyApplicationContext getContext();
-
     /**
      * 数据源连接实例
      */

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ProxyApplicationContext.java

@@ -1,13 +0,0 @@
-package org.dbsyncer.sdk.spi;
-
-import org.springframework.context.ApplicationContext;
-
-/**
- * Spring上下文代理对象
- *
- * @author AE86
- * @version 1.0.0
- * @date 2022/6/30 15:13
- */
-public interface ProxyApplicationContext extends ApplicationContext {
-}