Bug fix: Saved Session groups management dialog: Fixed IllegalArgumentException when empty was deleted.

Author: GWA

sql12/core/doc/changes.txt

@@ -65,6 +65,8 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+Saved Session groups management dialog: Fixed IllegalArgumentException when empty was deleted.
+
 Fixed StringIndexOutOfBoundsException when executed SQL contains the German Umlaut sz.
 
 Change tracking, left gutter popup to show deleted changes:

sql12/core/src/net/sourceforge/squirrel_sql/client/session/action/savedsession/SavedSessionsManager.java

@@ -1,5 +1,17 @@
 package net.sourceforge.squirrel_sql.client.session.action.savedsession;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.client.session.action.savedsession.savedsessionsgroup.SavedSessionGrouped;
@@ -16,17 +28,6 @@
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
 public class SavedSessionsManager
 {
    private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SavedSessionsManager.class);
@@ -257,9 +258,24 @@ else if(null != group)
 
    public SavedSessionGrouped getSavedSessionGrouped(String groupId)
    {
-      return getSavedSessionsGrouped().stream()
-                                      .filter(g -> null != g.getGroup() && StringUtils.equals(g.getGroup().getGroupId(), groupId))
-                                      .findFirst().orElseThrow(() -> new IllegalArgumentException("Failed to find group by groupId=" + groupId));
+      return getSavedSessionGrouped(groupId, true);
+   }
+
+   public SavedSessionGrouped getSavedSessionGrouped(String groupId, boolean throwIfNotExisting)
+   {
+      Optional<SavedSessionGrouped> res =
+            getSavedSessionsGrouped().stream().filter(g -> null != g.getGroup() && StringUtils.equals(g.getGroup().getGroupId(), groupId)).findFirst();
+
+      if(res.isEmpty())
+      {
+         if(throwIfNotExisting)
+         {
+            throw new IllegalArgumentException("Failed to find group by groupId=" + groupId);
+         }
+         return null;
+      }
+
+      return res.get();
    }
 
    public SavedSessionGrouped getSavedSessionGrouped(SavedSessionJsonBean savedSession)

sql12/core/src/net/sourceforge/squirrel_sql/client/session/action/savedsession/savedsessionsgroup/SavedSessionsGroupCtrl.java

@@ -1,5 +1,18 @@
 package net.sourceforge.squirrel_sql.client.session.action.savedsession.savedsessionsgroup;
 
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.client.session.action.savedsession.SaveSessionResult;
@@ -12,18 +25,6 @@
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
 import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
 
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 public class SavedSessionsGroupCtrl
 {
    private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SavedSessionsGroupCtrl.class);
@@ -229,8 +230,11 @@ private void onDelete()
 
       if(null != _groupBeingEdited)
       {
-         SavedSessionGrouped groupBeingEdited = Main.getApplication().getSavedSessionsManager().getSavedSessionGrouped(_groupBeingEdited.getGroupId());
-         Main.getApplication().getSavedSessionsManager().delete(List.of(groupBeingEdited));
+         SavedSessionGrouped groupBeingEdited = Main.getApplication().getSavedSessionsManager().getSavedSessionGrouped(_groupBeingEdited.getGroupId(), false);
+         if( null != groupBeingEdited )
+         {
+            Main.getApplication().getSavedSessionsManager().delete(List.of(groupBeingEdited));
+         }
       }
 
       String groupNameForMessagePanel = null != _groupBeingEdited ? _groupBeingEdited.getGroupName() : _dlg.txtGroupName.getText();