AE86 1 rok pred
rodič
commit
3918facce6
24 zmenil súbory, kde vykonal 35 pridanie a 35 odobranie
  1. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/AbstractChecker.java
  2. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java
  3. 2 3
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java
  4. 2 2
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java
  5. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/ScheduledTaskJob.java
  6. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/ScheduledTaskService.java
  7. 3 3
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/impl/ScheduledTaskServiceImpl.java
  8. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java
  9. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java
  10. 2 2
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java
  11. 2 2
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/AbstractBufferActuator.java
  12. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/FlushServiceImpl.java
  13. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/TableGroupBufferActuator.java
  14. 3 2
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/LogServiceImpl.java
  15. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/DefaultGroupStrategy.java
  16. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/PreloadTableGroupStrategy.java
  17. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/TableGroupStrategy.java
  18. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/client/RemoteClient.java
  19. 1 1
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/StorageSupportConfiguration.java
  20. 3 3
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/binlog/AbstractBinlogService.java
  21. 1 1
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/DiskStorageServiceImpl.java
  22. 2 2
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/MySQLStorageServiceImpl.java
  23. 1 1
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/SnowflakeIdWorker.java
  24. 1 1
      dbsyncer-web/src/main/java/org/dbsyncer/web/controller/config/ConfigController.java

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/AbstractChecker.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.checker;
 
 import org.dbsyncer.biz.enums.SafeInfoEnum;
-import org.dbsyncer.common.snowflake.SnowflakeIdWorker;
+import org.dbsyncer.storage.impl.SnowflakeIdWorker;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.StringUtil;

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

@@ -9,7 +9,7 @@ import org.dbsyncer.biz.checker.impl.mapping.MappingChecker;
 import org.dbsyncer.biz.vo.ConnectorVo;
 import org.dbsyncer.biz.vo.MappingVo;
 import org.dbsyncer.biz.vo.MetaVo;
-import org.dbsyncer.common.snowflake.SnowflakeIdWorker;
+import org.dbsyncer.storage.impl.SnowflakeIdWorker;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.StringUtil;

+ 2 - 3
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.biz.impl;
 
 import org.dbsyncer.biz.enums.BufferActuatorMetricEnum;
-import org.dbsyncer.biz.enums.MetricEnum;
 import org.dbsyncer.biz.enums.StatisticEnum;
 import org.dbsyncer.biz.enums.ThreadPoolMetricEnum;
 import org.dbsyncer.biz.model.AppReportMetric;
@@ -10,8 +9,8 @@ import org.dbsyncer.biz.model.MetricResponse;
 import org.dbsyncer.biz.model.MetricResponseInfo;
 import org.dbsyncer.biz.model.Sample;
 import org.dbsyncer.common.model.Paging;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.constant.ConnectorConstant;

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

@@ -17,8 +17,8 @@ import org.dbsyncer.biz.vo.MetaVo;
 import org.dbsyncer.biz.vo.MetricResponseVo;
 import org.dbsyncer.manager.event.PreloadCompletedEvent;
 import org.dbsyncer.common.model.Paging;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.NumberUtil;

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/scheduled/ScheduledTaskJob.java → dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/ScheduledTaskJob.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.scheduled;
+package org.dbsyncer.connector.scheduled;
 
 /**
  * @version 1.0.0

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/scheduled/ScheduledTaskService.java → dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/ScheduledTaskService.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.scheduled;
+package org.dbsyncer.connector.scheduled;
 
 public interface ScheduledTaskService {
 

+ 3 - 3
dbsyncer-common/src/main/java/org/dbsyncer/common/scheduled/impl/ScheduledTaskServiceImpl.java → dbsyncer-connector/src/main/java/org/dbsyncer/connector/scheduled/impl/ScheduledTaskServiceImpl.java

@@ -1,8 +1,8 @@
-package org.dbsyncer.common.scheduled.impl;
+package org.dbsyncer.connector.scheduled.impl;
 
 import org.dbsyncer.common.CommonException;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.UUIDUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.listener;
 
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.listener.model.ChangedOffset;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.constant.ConnectorConstant;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java

@@ -2,7 +2,7 @@ package org.dbsyncer.listener.quartz;
 
 import org.dbsyncer.listener.event.ScanChangedEvent;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.common.util.UUIDUtil;

+ 2 - 2
dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java

@@ -3,8 +3,8 @@ 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;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.model.Table;

+ 2 - 2
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/AbstractBufferActuator.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.parser.flush;
 
 import org.dbsyncer.common.config.BufferActuatorConfig;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.parser.enums.MetaEnum;
 import org.dbsyncer.parser.model.Meta;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/FlushServiceImpl.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.parser.flush.impl;
 
 import org.dbsyncer.common.config.StorageConfig;
-import org.dbsyncer.common.snowflake.SnowflakeIdWorker;
+import org.dbsyncer.storage.impl.SnowflakeIdWorker;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.parser.flush.BufferActuator;
 import org.dbsyncer.parser.flush.FlushService;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/TableGroupBufferActuator.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.parser.flush.impl;
 
 import org.dbsyncer.common.config.TableGroupBufferConfig;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.common.util.ThreadPoolUtil;
 import org.dbsyncer.common.util.UUIDUtil;

+ 3 - 2
dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/LogServiceImpl.java

@@ -3,9 +3,10 @@ package org.dbsyncer.parser.impl;
 import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.flush.FlushService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 /**
  * @version 1.0.0
  * @Author AE86
@@ -14,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class LogServiceImpl implements LogService {
 
-    @Autowired
+    @Resource
     private FlushService flushService;
 
     @Override

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/DefaultGroupStrategy.java

@@ -11,7 +11,7 @@ import org.dbsyncer.parser.strategy.GroupStrategy;
  * @version 1.0.0
  * @date 2019/12/2 22:53
  */
-public class DefaultGroupStrategy implements GroupStrategy {
+public final class DefaultGroupStrategy implements GroupStrategy {
 
     @Override
     public String getGroupId(ConfigModel model) {

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/PreloadTableGroupStrategy.java

@@ -12,7 +12,7 @@ import org.dbsyncer.storage.constant.ConfigConstant;
  * @version 1.0.0
  * @date 2019/12/2 22:53
  */
-public class PreloadTableGroupStrategy implements GroupStrategy<Mapping> {
+public final class PreloadTableGroupStrategy implements GroupStrategy<Mapping> {
 
     @Override
     public String getGroupId(Mapping model) {

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/strategy/impl/TableGroupStrategy.java

@@ -12,7 +12,7 @@ import org.dbsyncer.storage.constant.ConfigConstant;
  * @version 1.0.0
  * @date 2019/12/2 22:53
  */
-public class TableGroupStrategy implements GroupStrategy<TableGroup> {
+public final class TableGroupStrategy implements GroupStrategy<TableGroup> {
 
     @Override
     public String getGroupId(TableGroup model) {

+ 1 - 1
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/RemoteClient.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/client/RemoteClient.java

@@ -1,7 +1,7 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk;
+package org.dbsyncer.sdk.client;
 
 /**
  * @Version 1.0.0

+ 1 - 1
dbsyncer-storage/src/main/java/org/dbsyncer/storage/StorageSupportConfiguration.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.storage;
 
-import org.dbsyncer.storage.support.DiskStorageServiceImpl;
+import org.dbsyncer.storage.impl.DiskStorageServiceImpl;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 3 - 3
dbsyncer-storage/src/main/java/org/dbsyncer/storage/binlog/AbstractBinlogService.java

@@ -3,9 +3,9 @@ package org.dbsyncer.storage.binlog;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.dbsyncer.common.config.BinlogRecorderConfig;
 import org.dbsyncer.common.model.Paging;
-import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.scheduled.ScheduledTaskService;
-import org.dbsyncer.common.snowflake.SnowflakeIdWorker;
+import org.dbsyncer.storage.impl.SnowflakeIdWorker;
+import org.dbsyncer.connector.scheduled.ScheduledTaskJob;
+import org.dbsyncer.connector.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.enums.FilterEnum;
 import org.dbsyncer.connector.enums.OperationEnum;

+ 1 - 1
dbsyncer-storage/src/main/java/org/dbsyncer/storage/support/DiskStorageServiceImpl.java → dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/DiskStorageServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.storage.support;
+package org.dbsyncer.storage.impl;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.document.Document;

+ 2 - 2
dbsyncer-storage/src/main/java/org/dbsyncer/storage/support/MysqlStorageServiceImpl.java → dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/MySQLStorageServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.storage.support;
+package org.dbsyncer.storage.impl;
 
 import org.apache.commons.io.IOUtils;
 import org.dbsyncer.common.model.Paging;
@@ -58,7 +58,7 @@ import java.util.stream.Stream;
 @Component
 @ConditionalOnProperty(value = "dbsyncer.storage.support.mysql.enabled", havingValue = "true")
 @ConfigurationProperties(prefix = "dbsyncer.storage.support.mysql")
-public class MysqlStorageServiceImpl extends AbstractStorageService {
+public class MySQLStorageServiceImpl extends AbstractStorageService {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/snowflake/SnowflakeIdWorker.java → dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/SnowflakeIdWorker.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.snowflake;
+package org.dbsyncer.storage.impl;
 
 import org.dbsyncer.common.CommonException;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
dbsyncer-web/src/main/java/org/dbsyncer/web/controller/config/ConfigController.java

@@ -6,7 +6,7 @@ import org.dbsyncer.biz.SystemConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.common.config.AppConfig;
-import org.dbsyncer.common.snowflake.SnowflakeIdWorker;
+import org.dbsyncer.storage.impl.SnowflakeIdWorker;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;