feat: refactor Environment class to remove deprecated variables handling and streamline variable management

Author: lakernote

src/main/java/com/laker/postman/common/component/table/EasyPostmanEnvironmentTablePanel.java

@@ -16,9 +16,7 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Postman 环境变量表格面板
@@ -48,9 +46,6 @@ public class EasyPostmanEnvironmentTablePanel extends JPanel {
     private static final int COL_VALUE = 2;
     private static final int COL_DELETE = 3;
 
-    private final String nameCol;
-    private final String valueCol;
-
     /**
      * Flag to track if dragging is in progress
      */
@@ -77,8 +72,6 @@ public EasyPostmanEnvironmentTablePanel() {
      * @param autoAppendRowEnabled 是否启用自动补空行
      */
     public EasyPostmanEnvironmentTablePanel(String nameCol, String valueCol, boolean popupMenuEnabled, boolean autoAppendRowEnabled) {
-        this.nameCol = nameCol;
-        this.valueCol = valueCol;
         this.columns = new String[]{"", nameCol, valueCol, ""};
         initializeComponents();
         initializeTableUI();
@@ -826,100 +819,6 @@ private void scrollToLastRow() {
         });
     }
 
-    /**
-     * 获取所有行数据
-     */
-    public List<Map<String, Object>> getRows() {
-        List<Map<String, Object>> rows = new ArrayList<>();
-
-        for (int i = 0; i < tableModel.getRowCount(); i++) {
-            Map<String, Object> row = new LinkedHashMap<>();
-            row.put("Enabled", tableModel.getValueAt(i, COL_DRAG_ENABLE));
-            row.put(nameCol, tableModel.getValueAt(i, COL_KEY));
-            row.put(valueCol, tableModel.getValueAt(i, COL_VALUE));
-            rows.add(row);
-        }
-
-        return rows;
-    }
-
-    /**
-     * Set all rows from a list of maps
-     */
-    public void setRows(List<Map<String, Object>> rows) {
-        stopCellEditing();
-
-        suppressAutoAppendRow = true;
-        try {
-            tableModel.setRowCount(0);
-
-            if (rows != null) {
-                for (Map<String, Object> row : rows) {
-                    Object enabled = row.get("Enabled");
-                    if (enabled == null) {
-                        enabled = true;
-                    }
-                    Object key = row.get(nameCol);
-                    Object value = row.get(valueCol);
-
-                    tableModel.addRow(new Object[]{enabled, key, value, ""});
-                }
-            }
-
-            if (tableModel.getRowCount() == 0 || hasContentInLastRow()) {
-                tableModel.addRow(new Object[]{true, "", "", ""});
-            }
-        } finally {
-            suppressAutoAppendRow = false;
-        }
-    }
-
-    /**
-     * 获取表格内容为Map（第一列为key，第二列为value）- 仅返回已启用的行
-     * 保持向后兼容性
-     */
-    public Map<String, String> getMap() {
-        Map<String, String> map = new LinkedHashMap<>();
-        for (int i = 0; i < tableModel.getRowCount(); i++) {
-            Object enabledObj = tableModel.getValueAt(i, COL_DRAG_ENABLE);
-            Object keyObj = tableModel.getValueAt(i, COL_KEY);
-            Object valueObj = tableModel.getValueAt(i, COL_VALUE);
-
-            boolean enabled = enabledObj instanceof Boolean ? (Boolean) enabledObj : true;
-            String key = keyObj == null ? "" : keyObj.toString().trim();
-            String value = valueObj == null ? "" : valueObj.toString().trim();
-
-            if (enabled && !key.isEmpty()) {
-                map.put(key, value);
-            }
-        }
-        return map;
-    }
-
-    /**
-     * 用Map数据填充表格（兼容旧版本，默认全部启用）
-     * 保持向后兼容性
-     */
-    public void setMap(Map<String, String> map) {
-        stopCellEditing();
-
-        suppressAutoAppendRow = true;
-        try {
-            tableModel.setRowCount(0);
-            if (map != null) {
-                for (var e : map.entrySet()) {
-                    tableModel.addRow(new Object[]{true, e.getKey(), e.getValue(), ""});
-                }
-            }
-
-            if (tableModel.getRowCount() == 0 || hasContentInLastRow()) {
-                tableModel.addRow(new Object[]{true, "", "", ""});
-            }
-        } finally {
-            suppressAutoAppendRow = false;
-        }
-    }
-
     /**
      * 获取环境变量列表（新格式）
      */
@@ -1011,6 +910,7 @@ public void stopCellEditing() {
 
     /**
      * Check if table is currently in dragging state
+     *
      * @return true if dragging is in progress
      */
     public boolean isDragging() {

src/main/java/com/laker/postman/panel/env/EnvironmentPanel.java

@@ -40,9 +40,7 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 环境变量管理面板
@@ -131,27 +129,11 @@ private void autoSaveVariables() {
 
         try {
             variablesTablePanel.stopCellEditing();
-
-            // 清空旧格式和新格式数据
-            currentEnvironment.getVariables().clear();
-            currentEnvironment.getVariableList().clear();
-
-            // 保存到新格式 variableList
             List<EnvironmentVariable> variableList = variablesTablePanel.getVariableList();
-            currentEnvironment.setVariableList(variableList);
-
-            // 同时保存已启用的变量到旧格式 variables，保持向后兼容
-            for (EnvironmentVariable var : variableList) {
-                if (var.isEnabled()) {
-                    currentEnvironment.addVariable(var.getKey(), var.getValue());
-                }
-            }
-
-            List<Map<String, Object>> newRows = getRowDatasFromTable();
+            currentEnvironment.setVariableList(new ArrayList<>(variableList)); // 使用副本避免并发修改
             EnvironmentService.saveEnvironment(currentEnvironment);
             // 保存后更新快照
-            originalVariablesSnapshot = JSONUtil.toJsonStr(newRows);
-
+            originalVariablesSnapshot = JSONUtil.toJsonStr(currentEnvironment.getVariableList());
             log.debug("自动保存环境变量: {}", currentEnvironment.getName());
         } catch (Exception ex) {
             log.error("自动保存环境变量失败", ex);
@@ -388,19 +370,8 @@ private void loadVariables(Environment env) {
         variablesTablePanel.clear();
         isLoadingData = true; // 设置标志位，开始加载数据
         if (env != null) {
-            List<Map<String, Object>> rows = new ArrayList<>();
-            if (env.getVariableList() != null && !env.getVariableList().isEmpty()) {
-                for (EnvironmentVariable var : env.getVariableList()) {
-                    Map<String, Object> row = new LinkedHashMap<>();
-                    row.put("Enabled", var.isEnabled());
-                    row.put(COLUMN_NAME, var.getKey());
-                    row.put(COLUMN_VALUE, var.getValue());
-                    rows.add(row);
-                }
-            }
-
-            variablesTablePanel.setRows(rows);
-            originalVariablesSnapshot = JSONUtil.toJsonStr(rows); // 用rows做快照，保证同步
+            variablesTablePanel.setVariableList(env.getVariableList());
+            originalVariablesSnapshot = JSONUtil.toJsonStr(env.getVariableList()); // 用rows做快照，保证同步
         } else {
             variablesTablePanel.clear();
             originalVariablesSnapshot = JSONUtil.toJsonStr(new ArrayList<>()); // 空快照
@@ -415,44 +386,12 @@ public void saveVariables() {
         if (currentEnvironment == null) return;
         variablesTablePanel.stopCellEditing();
 
-        // 清空旧格式和新格式数据
-        currentEnvironment.getVariables().clear();
-        currentEnvironment.getVariableList().clear();
-
         // 保存到新格式 variableList
         List<EnvironmentVariable> variableList = variablesTablePanel.getVariableList();
-        currentEnvironment.setVariableList(variableList);
-
-        // 同时保存已启用的变量到旧格式 variables，保持向后兼容
-        for (EnvironmentVariable var : variableList) {
-            if (var.isEnabled()) {
-                currentEnvironment.addVariable(var.getKey(), var.getValue());
-            }
-        }
-
-        List<Map<String, Object>> newRows = getRowDatasFromTable();
+        currentEnvironment.setVariableList(new ArrayList<>(variableList)); // 使用副本避免并发修改
         EnvironmentService.saveEnvironment(currentEnvironment);
         // 保存后更新快照为json字符串
-        originalVariablesSnapshot = JSONUtil.toJsonStr(newRows);
-
-        // 显示保存成功提示
-        JOptionPane.showMessageDialog(this,
-                I18nUtil.getMessage(MessageKeys.ENV_DIALOG_SAVE_SUCCESS),
-                I18nUtil.getMessage(MessageKeys.ENV_DIALOG_SAVE_SUCCESS_TITLE),
-                JOptionPane.INFORMATION_MESSAGE);
-    }
-
-    private List<Map<String, Object>> getRowDatasFromTable() {
-        List<Map<String, Object>> rows = variablesTablePanel.getRows();
-        List<Map<String, Object>> newRows = new ArrayList<>();
-        for (Map<String, Object> row : rows) {
-            String key = row.get(COLUMN_NAME) == null ? null : row.get(COLUMN_NAME).toString();
-            if (CharSequenceUtil.isBlank(key)) {
-                continue; // 跳过空key
-            }
-            newRows.add(row);
-        }
-        return newRows;
+        originalVariablesSnapshot = JSONUtil.toJsonStr(currentEnvironment.getVariableList());
     }
 
     /**
@@ -684,8 +623,7 @@ public void refreshUI() {
 
     // 判断当前表格内容和快照是否一致，使用JSON序列化比较
     public boolean isVariablesChanged() {
-        List<Map<String, Object>> rows = getRowDatasFromTable();
-        String curJson = JSONUtil.toJsonStr(rows);
+        String curJson = JSONUtil.toJsonStr(variablesTablePanel.getVariableList());
         boolean isVariablesChanged = !CharSequenceUtil.equals(curJson, originalVariablesSnapshot);
         if (isVariablesChanged) {
             log.debug("env name: {}", currentEnvironment != null ? currentEnvironment.getName() : "null");

src/main/java/com/laker/postman/service/EnvironmentService.java

@@ -5,7 +5,6 @@
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.laker.postman.model.Environment;
-import com.laker.postman.model.EnvironmentVariable;
 import com.laker.postman.model.Workspace;
 import com.laker.postman.util.EasyPostmanVariableUtil;
 import com.laker.postman.util.SystemUtil;
@@ -102,27 +101,7 @@ private static void loadEnvironmentsFromPath(String filePath) {
             environments.clear();
             JSONArray array = JSONUtil.readJSONArray(file, StandardCharsets.UTF_8);
             for (Object obj : array) {
-                JSONObject envJson = (JSONObject) obj;
-                Environment env = new Environment();
-                env.setId(envJson.getStr("id"));
-                env.setName(envJson.getStr("name"));
-                env.setActive(envJson.getBool("active", false));
-
-                // 优先加载新格式 variableList
-                JSONArray variableListJson = envJson.getJSONArray("variableList");
-                if (variableListJson != null && !variableListJson.isEmpty()) {
-                    // 使用新格式
-                    List<EnvironmentVariable> varList = new ArrayList<>();
-                    for (Object varObj : variableListJson) {
-                        JSONObject varJson = (JSONObject) varObj;
-                        boolean enabled = varJson.getBool("enabled", true);
-                        String key = varJson.getStr("key");
-                        String value = varJson.getStr("value", "");
-                        varList.add(new EnvironmentVariable(enabled, key, value));
-                    }
-                    env.setVariableList(varList);
-                }
-
+                Environment env = JSONUtil.toBean((JSONObject) obj, Environment.class);
                 environments.put(env.getId(), env);
                 if (env.isActive()) {
                     activeEnvironment = env;
@@ -200,37 +179,10 @@ public static void saveEnvironments() {
                 parentDir.mkdirs();
             }
 
-            JSONArray array = new JSONArray();
-            for (Environment env : environments.values()) {
-                JSONObject envJson = new JSONObject();
-                envJson.set("id", env.getId());
-                envJson.set("name", env.getName());
-                envJson.set("active", env.isActive());
-
-                // 优先保存新格式 variableList
-                if (env.getVariableList() != null && !env.getVariableList().isEmpty()) {
-                    JSONArray varListJson = new JSONArray();
-                    for (com.laker.postman.model.EnvironmentVariable var : env.getVariableList()) {
-                        JSONObject varJson = new JSONObject();
-                        varJson.set("enabled", var.isEnabled());
-                        varJson.set("key", var.getKey());
-                        varJson.set("value", var.getValue());
-                        varListJson.add(varJson);
-                    }
-                    envJson.set("variableList", varListJson);
-                } else {
-                    // 后备方案：保存旧格式 variables（向后兼容）
-                    JSONObject varsJson = new JSONObject();
-                    for (Map.Entry<String, String> entry : env.getVariables().entrySet()) {
-                        varsJson.set(entry.getKey(), entry.getValue());
-                    }
-                    envJson.set("variables", varsJson);
-                }
-
-                array.add(envJson);
-            }
+            List<Environment> envList = new ArrayList<>(environments.values());
+            String jsonStr = JSONUtil.toJsonPrettyStr(envList);
 
-            FileUtil.writeString(array.toStringPretty(), file, StandardCharsets.UTF_8);
+            FileUtil.writeString(jsonStr, file, StandardCharsets.UTF_8);
             log.debug("环境变量已保存到: {}", filePath);
         } catch (Exception e) {
             log.error("保存环境变量失败", e);