Pull request #8398: REPORT-68607 数据连接全量保存改为增量保存 11

Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0

* commit '8beb5b7c88dff3096052ea17cdeeaa9331b4ccd2':
  REPORT-68607 数据连接全量保存改为增量保存 11

designer-base/src/main/java/com/fr/design/data/MapCompareUtils.java

@@ -0,0 +1,53 @@
+package com.fr.design.data;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author rinoux
+ * @version 10.0
+ * Created by rinoux on 2022/3/28
+ */
+public final class MapCompareUtils {
+
+
+    /**
+     * 对比两个map 查找出相比orig，other中有哪些是新增的、删除的或者被修改的，并分别进行处理
+     *
+     * @param orig         原始map
+     * @param other        参考的新map
+     * @param eventHandler 有区别时的事件处理器
+     * @param <K>          K
+     * @param <V>          V
+     */
+    public static <K, V> void contrastMapEntries(@NotNull Map<K, V> orig, @NotNull Map<K, V> other, @NotNull EventHandler<K, V> eventHandler) {
+
+        Map<K, V> copiedOrig = new LinkedHashMap<>(orig);
+
+        other.forEach((k, v) -> {
+            V existedV = copiedOrig.remove(k);
+            if (existedV != null) {
+                if (!v.equals(existedV)) {
+                    eventHandler.on(EntryEventKind.UPDATED, k, v);
+                }
+            } else {
+                eventHandler.on(EntryEventKind.ADDED, k, v);
+            }
+        });
+
+        copiedOrig.forEach((k, v) -> eventHandler.on(EntryEventKind.REMOVED, k, v));
+    }
+
+
+    public interface EventHandler<K, V> {
+        void on(EntryEventKind entryEventKind, K k, V v);
+    }
+
+    public enum EntryEventKind {
+        ADDED,
+        REMOVED,
+        UPDATED;
+    }
+}

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -6,6 +6,7 @@ import com.fr.data.impl.ConnectionBean;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.data.MapCompareUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -16,21 +17,21 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.file.ConnectionOperator;
-import com.fr.file.ConnectionOperatorImpl;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
-import com.fr.rpc.ExceptionHandler;
-import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
-import com.fr.third.org.apache.commons.collections4.MapUtils;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 
 import java.awt.Window;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -42,7 +43,8 @@ import java.util.UUID;
 public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
     public static final String TITLE_NAME = Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection");
     private boolean isNamePermitted = true;
-    private HashMap<String, String> renameMap = new HashMap<String, String>();
+    private final HashMap<String, String> renameMap = new HashMap<>();
+    private final Map<String, Connection> populatedConnectionsSnapshot = new LinkedHashMap<>();
 
     public ConnectionListPane() {
         renameMap.clear();
@@ -149,11 +151,16 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
      */
     public void populate(ConnectionConfig connectionConfig) {
         List<NameObject> nameObjectList = new ArrayList<NameObject>();
+        populatedConnectionsSnapshot.clear();
         for (Map.Entry<String, Connection> entry : connectionConfig.getConnections().entrySet()) {
             nameObjectList.add(new NameObject(entry.getKey(), entry.getValue()));
+            try {
+                populatedConnectionsSnapshot.put(entry.getKey(), (Connection) entry.getValue().clone());
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
         }
         this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
-
     }
 
     /**
@@ -162,23 +169,36 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     public void update(ConnectionConfig connectionConfig) {
         // Nameable[]居然不能强转成NameObject[],一定要这么写...
         Nameable[] res = this.update();
-        List<ConnectionBean> connectionBeans = new ArrayList<>();
+        Map<String, Connection> updatedMap = new LinkedHashMap<>();
-        Map<String, String> map = MapUtils.invertMap(getRenameMap());
+        Arrays.stream(res).map(n -> (NameObject) n).forEach(no -> updatedMap.put(no.getName(), (Connection) no.getObject()));
-        for (int i = 0; i < res.length; i++) {
+
-            NameObject nameObject = (NameObject) res[i];
+        List<String> removedConnNames = new ArrayList<>();
-            String oldName = map.get(nameObject.getName());
+        List<ConnectionBean> addedOrUpdatedConnections = new ArrayList<>();
-            if (oldName == null) {
+
-                oldName = StringUtils.EMPTY;
+        MapCompareUtils.contrastMapEntries(populatedConnectionsSnapshot, updatedMap, (entryEventKind, s, connection) -> {
+            switch (entryEventKind) {
+                case REMOVED:
+                    removedConnNames.add(s);
+                    break;
+                case ADDED:
+                case UPDATED:
+                    addedOrUpdatedConnections.add(new ConnectionBean(s, StringUtils.EMPTY, connection));
+                default:
+                    break;
             }
-            connectionBeans.add(new ConnectionBean(nameObject.getName(), oldName, (Connection) nameObject.getObject()));
+        });
+
+
+        this.alterConnections(removedConnNames, addedOrUpdatedConnections);
     }
+
+    private void alterConnections(List<String> removedConnNames, List<ConnectionBean> addedOrUpdatedConnections) {
+
         try {
-            WorkContext.getCurrent().get(ConnectionOperator.class, new ExceptionHandler() {
+            WorkContext.getCurrent().get(ConnectionOperator.class, exceptionInfo -> saveByOldWay(removedConnNames, addedOrUpdatedConnections))
-                @Override
+                    .saveConnection(removedConnNames, addedOrUpdatedConnections);
-                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+
-                    return saveByOldWay(connectionBeans);
+            // hades：远程环境时，由于时直接RPC调用远程修改，因此设计器本地配置需要失效
-                }
-            }).saveConnection(new ArrayList<>(connectionConfig.getConnections().keySet()), connectionBeans);
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.getInstance().getNameSpace());
             }
@@ -187,13 +207,20 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         }
     }
 
-    private boolean saveByOldWay(List<ConnectionBean> connectionBeans) {
+    private boolean saveByOldWay(List<String> removedConnNames, List<ConnectionBean> addedOrUpdatedConnections) {
         try {
-            return ConnectionOperatorImpl.getInstance().saveConnection(connectionBeans);
+            return Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
+                @Override
+                public void run() {
+                    removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n));
+                    addedOrUpdatedConnections.forEach(cb -> ConnectionConfig.getInstance().addConnection(cb.getName(), cb.getConnection()));
+                }
+            });
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return false;
         }
+
+        return false;
     }
 
     public static void showDialog(Window parent) {

designer-base/src/test/java/com/fr/design/data/MapCompareUtilsTest.java

@@ -0,0 +1,57 @@
+package com.fr.design.data;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author rinoux
+ * @version 10.0
+ * Created by rinoux on 2022/3/28
+ */
+public class MapCompareUtilsTest {
+
+    @Test
+    public void contrastMapEntries() {
+
+
+        Map<String, String> orig = new LinkedHashMap<>();
+
+        orig.put("aaa", "aaa");
+        orig.put("bbb", "bbb");
+        orig.put("ccc", "ccc");
+        orig.put("ddd", "ddd");
+
+
+        Map<String, String> other = new LinkedHashMap<>();
+
+        other.put("aaa", "111");
+        other.put("bbb", "bbb");
+        other.put("ccc", "ccc");
+        other.put("eee", "eee");
+
+
+        MapCompareUtils.contrastMapEntries(orig, other, new MapCompareUtils.EventHandler<String, String>() {
+            @Override
+            public void on(MapCompareUtils.EntryEventKind entryEventKind, String s, String s2) {
+                switch (entryEventKind) {
+                    case UPDATED:
+                        Assert.assertEquals(s, "aaa");
+                        Assert.assertEquals(s2, "111");
+                        break;
+                    case REMOVED:
+                        Assert.assertEquals(s, "ddd");
+                        break;
+                    case ADDED:
+                        Assert.assertEquals(s, "eee");
+                        Assert.assertEquals(s2, "eee");
+                        break;
+                    default:
+                        Assert.fail();
+                }
+            }
+        });
+    }
+}