优化模板

Signed-off-by: AE86 <836391306@qq.com>

dbsyncer-manager/src/main/java/org/dbsyncer/manager/config/OperationCallBack.java

@@ -6,7 +6,7 @@ import org.dbsyncer.storage.enums.StorageEnum;
 
 import java.util.Map;
 
-public class OperationCallBack implements Callback {
+public class OperationCallBack extends Callback {
 
     private StorageService storageService;
 
@@ -20,12 +20,14 @@ public class OperationCallBack implements Callback {
         this.params = params;
     }
 
-    public void add() {
+    public boolean add() {
         storageService.add(type, params);
+        return true;
     }
 
-    public void edit() {
+    public boolean edit() {
         storageService.edit(type, params);
+        return true;
     }
 
 }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/config/PreloadCallBack.java

@@ -4,7 +4,7 @@ import org.dbsyncer.manager.template.Callback;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.model.*;
 
-public class PreloadCallBack implements Callback {
+public class PreloadCallBack extends Callback {
 
     private Parser parser;
 

dbsyncer-manager/src/main/java/org/dbsyncer/manager/enums/HandlerEnum.java

@@ -2,8 +2,6 @@ package org.dbsyncer.manager.enums;
 
 import org.dbsyncer.manager.config.OperationCallBack;
 import org.dbsyncer.manager.config.PreloadCallBack;
-import org.dbsyncer.manager.handler.AbstractOperationHandler;
-import org.dbsyncer.manager.handler.AbstractPreloadHandler;
 import org.dbsyncer.manager.template.Handler;
 import org.dbsyncer.storage.constant.ConfigConstant;
 
@@ -17,29 +15,29 @@ public enum HandlerEnum {
     /**
      * 添加
      */
-    OPR_ADD("add", new AbstractOperationHandler() {
+    OPR_ADD("add", new Handler<OperationCallBack>() {
         @Override
-        protected void handle(OperationCallBack operationCallBack) {
-            operationCallBack.add();
+        public Object execute(OperationCallBack operationCallBack) {
+            return operationCallBack.add();
         }
     }),
 
     /**
      * 修改
      */
-    OPR_EDIT("edit", new AbstractOperationHandler() {
+    OPR_EDIT("edit", new Handler<OperationCallBack>() {
         @Override
-        protected void handle(OperationCallBack operationCallBack) {
-            operationCallBack.edit();
+        public Object execute(OperationCallBack operationCallBack) {
+            return operationCallBack.edit();
         }
     }),
 
     /**
      * 预加载Connector
      */
-    PRELOAD_CONNECTOR(ConfigConstant.CONNECTOR, true, new AbstractPreloadHandler() {
+    PRELOAD_CONNECTOR(ConfigConstant.CONNECTOR, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseConnector();
         }
     }),
@@ -47,9 +45,9 @@ public enum HandlerEnum {
     /**
      * 预加载Mapping
      */
-    PRELOAD_MAPPING(ConfigConstant.MAPPING, true, new AbstractPreloadHandler() {
+    PRELOAD_MAPPING(ConfigConstant.MAPPING, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseMapping();
         }
     }),
@@ -57,9 +55,9 @@ public enum HandlerEnum {
     /**
      * 预加载TableGroup
      */
-    PRELOAD_TABLE_GROUP(ConfigConstant.TABLE_GROUP, true, new AbstractPreloadHandler() {
+    PRELOAD_TABLE_GROUP(ConfigConstant.TABLE_GROUP, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseTableGroup();
         }
     }, GroupStrategyEnum.TABLE),
@@ -67,9 +65,9 @@ public enum HandlerEnum {
     /**
      * 预加载Meta
      */
-    PRELOAD_META(ConfigConstant.META, true, new AbstractPreloadHandler() {
+    PRELOAD_META(ConfigConstant.META, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseMeta();
         }
     }),
@@ -77,9 +75,9 @@ public enum HandlerEnum {
     /**
      * 预加载Config
      */
-    PRELOAD_CONFIG(ConfigConstant.CONFIG, true, new AbstractPreloadHandler() {
+    PRELOAD_CONFIG(ConfigConstant.CONFIG, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseConfig();
         }
     }),
@@ -87,9 +85,9 @@ public enum HandlerEnum {
     /**
      * 预加载ProjectGroup
      */
-    PRELOAD_PROJECT_GROUP(ConfigConstant.PROJECT_GROUP, true, new AbstractPreloadHandler(){
+    PRELOAD_PROJECT_GROUP(ConfigConstant.PROJECT_GROUP, true, new Handler<PreloadCallBack>() {
         @Override
-        protected Object preload(PreloadCallBack preloadCallBack) {
+        public Object execute(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseProjectGroup();
         }
     });
@@ -100,7 +98,7 @@ public enum HandlerEnum {
     private GroupStrategyEnum groupStrategyEnum;
 
     HandlerEnum(String modelType, Handler handler) {
-        this(modelType, false, handler, null);
+        this(modelType, false, handler);
     }
 
     HandlerEnum(String modelType, boolean preload, Handler handler) {
@@ -129,4 +127,4 @@ public enum HandlerEnum {
     public GroupStrategyEnum getGroupStrategyEnum() {
         return groupStrategyEnum;
     }
-}
+}

dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/Callback.java

@@ -1,4 +1,4 @@
 package org.dbsyncer.manager.template;
 
-public interface Callback {
+public abstract class Callback {
 }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/Handler.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.manager.template;
 
-public interface Handler {
-
-    Object execute(Callback call);
+public interface Handler<C extends Callback> {
 
+    Object execute(C callback);
 }