保存策略修改,

Author: longforus

src/main/java/com/longforus/apidebugger/ui/DefaultParamsDialog.java

@@ -14,13 +14,15 @@
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
+import org.apache.commons.lang3.StringUtils;
 
 public class DefaultParamsDialog extends JDialog {
     private JPanel contentPane;
@@ -106,14 +108,12 @@ private void onOK() {
         //    bean.setId(bean.hashCode());
         //    result.add(bean);
         //}
-        List<TableBean> data = mModel.getData();
-        for (TableBean bean : data) {
-            bean.setId(bean.hashCode());
-        }
-        MyValueHandler.INSTANCE.getCurProject().setDefaultParams(data);
+        List<TableBean> collect = mModel.getData();
+        collect.forEach(tableBean -> tableBean.setId(tableBean.hashCode()));
+        MyValueHandler.INSTANCE.getCurProject().setDefaultParams(collect);
         OB.paramsBox.remove(OB.paramsBox.query().equal(TableBean_.projectId, MyValueHandler.INSTANCE.getCurProject().getId()).build().find());
-        if (data.size() > 0) {
-            OB.paramsBox.put(data);
+        if (collect.size() > 0) {
+            OB.paramsBox.put(collect);
         }
         dispose();
     }

src/main/java/com/longforus/apidebugger/ui/MyParamsTableModel.java

@@ -3,11 +3,13 @@
 import com.longforus.apidebugger.bean.TableBean;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.swing.table.AbstractTableModel;
+import org.apache.commons.lang3.StringUtils;
 
 public class MyParamsTableModel extends AbstractTableModel {
     //单元格元素类型
-    private Class[] cellType = { Boolean.class, String.class, String.class};
+    private Class[] cellType = { Boolean.class, String.class, String.class };
     //表头
     private String title[] = { "select", "key", "value" };
     //模拟数据
@@ -22,7 +24,7 @@ public MyParamsTableModel() {
     }
 
     public List<TableBean> getData() {
-        return data;
+        return data.stream().filter(tableBean -> StringUtils.isNotEmpty(tableBean.getKey()) && StringUtils.isNotEmpty(tableBean.getValue())).collect(Collectors.toList());
     }
 
     public void setData(List<TableBean> data) {
@@ -34,15 +36,14 @@ public void setData(List<TableBean> data) {
     public void clear() {
         int size = this.data.size();
         this.data.clear();
-        fireTableRowsDeleted(0,size);
+        fireTableRowsDeleted(0, size);
     }
 
     public void addEmptyRow() {
         data.add(new TableBean(true, "", ""));
-        fireTableRowsInserted(data.size()-1,data.size()-1);
+        fireTableRowsInserted(data.size() - 1, data.size() - 1);
     }
 
-
     public void removeRow(int row) {
         if (row > -1 && row < data.size()) {
             data.remove(row);
@@ -72,7 +73,7 @@ public int getRowCount() {
 
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
-        if (rowIndex<data.size()) {
+        if (rowIndex < data.size()) {
             switch (columnIndex) {
                 case 0:
                     return data.get(rowIndex).getSelected();
@@ -96,7 +97,7 @@ public boolean isCellEditable(int rowIndex, int columnIndex) {
 
     @Override
     public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-        if (rowIndex<data.size()) {
+        if (rowIndex < data.size()) {
             switch (columnIndex) {
                 case 0:
                     data.get(rowIndex).setSelected((Boolean) aValue);
@@ -111,6 +112,4 @@ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
         }
         this.fireTableCellUpdated(rowIndex, columnIndex);
     }
-
-
 }

src/main/kotlin/com/longforus/apidebugger/HttpManage.kt

@@ -27,7 +27,7 @@ object HttpManage {
         if (url.isEmpty()) {
             return
         }
-        val request = buildRequest(url, UIActionHandler.getParamsMap(mainPanel.tbParams, false), mainPanel.curMethod, mainPanel.curEncryptCode)
+        val request = buildRequest(url, UIActionHandler.getParamsMap(mainPanel.myParamsTableModel, false), mainPanel.curMethod, mainPanel.curEncryptCode)
         doRequest(request)
     }
 

src/main/kotlin/com/longforus/apidebugger/UIActionHandler.kt

@@ -1,8 +1,8 @@
 package com.longforus.apidebugger
 
 import com.longforus.apidebugger.bean.ApiBean
+import com.longforus.apidebugger.ui.MyParamsTableModel
 import javax.swing.DefaultComboBoxModel
-import javax.swing.JTable
 
 /**
  * Created by XQ Yang on 8/31/2018  11:21 AM.
@@ -32,7 +32,7 @@ object UIActionHandler {
                 if (!it.apis.contains(apiBean)) {
                     apiBean.encryptType = mainPanel.selectedEncryptID
                     apiBean.method = mainPanel.selectedMethodType
-                    apiBean.paramsMap = getParamsMap(mainPanel.tbParams)
+                    apiBean.paramsMap = getParamsMap(mainPanel.myParamsTableModel)
                     it.apis.add(0, apiBean)
                     val model = mainPanel.cbApiUrl.model as DefaultComboBoxModel
                     model.insertElementAt(apiBean, 0)
@@ -43,20 +43,17 @@ object UIActionHandler {
                 apiBean = selectedItem as ApiBean
                 apiBean.encryptType = mainPanel.selectedEncryptID
                 apiBean.method = mainPanel.selectedMethodType
-                apiBean.paramsMap = getParamsMap(mainPanel.tbParams)
+                apiBean.paramsMap = getParamsMap(mainPanel.myParamsTableModel)
             }
             OB.apiBox.put(apiBean)
         }
     }
 
-    fun getParamsMap(jTable: JTable, isSave: Boolean = true): MutableMap<String, String> {
+    fun getParamsMap(model: MyParamsTableModel, isSave: Boolean = true): MutableMap<String, String> {
         val map = HashMap<String, String>()
-        for (i in 0..jTable.rowCount) {
-            if (jTable.getValueAt(i, 1) == null) {
-                break
-            }
-            if (jTable.getValueAt(i, 0) as Boolean || isSave) {
-                map[jTable.getValueAt(i, 1) as String] = jTable.getValueAt(i, 2) as String
+        for (bean in model.data) {
+            if (bean.selected || isSave) {
+                    map[bean.key] = bean.value
             }
         }
         return map

src/main/kotlin/com/longforus/apidebugger/UILifecycleHandler.kt

@@ -68,7 +68,6 @@ object UILifecycleHandler {
         item.addActionListener {
             val projectName = JOptionPane.showInputDialog("Input Project Name")
             if (projectName.isNullOrEmpty()) {
-                JOptionPane.showMessageDialog(mainPanel, "input error")
                 return@addActionListener
             }
             val count = OB.projectBox.query {