Issue 52614: AssertionError deleting site group from its details page (#343)

Author: labkey-jeckels

OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java

@@ -6,6 +6,7 @@
 import org.labkey.api.audit.AuditTypeProvider;
 import org.labkey.api.audit.query.AbstractAuditDomainKind;
 import org.labkey.api.audit.query.DefaultAuditTypeTable;
+import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.MutableColumnInfo;
@@ -121,7 +122,7 @@ public <K extends AuditTypeEvent> Class<K> getEventClass()
     public static void addAuditEntry(User user, int usersAdded, int usersRemoved, int usersInactivated, int usersModified, int groupsAdded, int groupsRemoved, int membershipsAdded, int membershipsRemoved)
     {
         String comment = String.format("LDAP Sync Summary: users added: %s, users removed: %s, users inactivated: %s, users modified: %s, groups added: %s, groups removed: %s, memberships added: %s, memberships removed: %s", usersAdded, usersRemoved, usersInactivated, usersModified, groupsAdded, groupsRemoved, membershipsAdded, membershipsRemoved);
-        LdapSyncAuditProvider.LdapSyncAuditEvent event = new LdapSyncAuditProvider.LdapSyncAuditEvent(ContainerManager.getRoot().getId(), comment);
+        LdapSyncAuditProvider.LdapSyncAuditEvent event = new LdapSyncAuditProvider.LdapSyncAuditEvent(ContainerManager.getRoot(), comment);
 
         event.setTotalUsersAndGroupsAdded(usersAdded + groupsAdded);
         event.setTotalUsersAndGroupsRemoved(usersRemoved + groupsRemoved);
@@ -141,7 +142,7 @@ public LdapSyncAuditEvent()
             super();
         }
 
-        public LdapSyncAuditEvent(String container, String comment)
+        public LdapSyncAuditEvent(Container container, String comment)
         {
             super(LdapSyncRunner.AUDIT_EVENT_TYPE, container, comment);
         }

OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncRunner.java

@@ -40,7 +40,6 @@
 import org.labkey.security.xml.GroupEnumType;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -99,7 +98,7 @@ public LdapSyncRunner()
     }
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException
+    public void execute(JobExecutionContext context)
     {
         try
         {
@@ -284,7 +283,7 @@ private void setUserActive(User u, boolean active, String reason)
         }
     }
 
-    private void handleGroupsRemovedFromLdap() throws LdapException
+    private void handleGroupsRemovedFromLdap()
     {
         //find any previously synced groups that are no longer present
         List<LdapSyncModel> records = getPreviouslySyncedRecords(PrincipalType.GROUP);
@@ -522,7 +521,7 @@ private void deactivatePrincipalsPreviouslySynced()
             previouslySynced.remove(syncedUser);
         }
 
-        if (previouslySynced.size() > 0)
+        if (!previouslySynced.isEmpty())
         {
             //TODO: determine whether to delete/deactive, etc?
             for (Integer userId : previouslySynced)
@@ -543,7 +542,7 @@ private void deactivatePrincipalsPreviouslySynced()
             previouslySyncedGroups.remove(syncedGroup);
         }
 
-        if (previouslySyncedGroups.size() > 0)
+        if (!previouslySyncedGroups.isEmpty())
         {
             //TODO: determine whether to delete/deactive, etc
             for (Integer groupId : previouslySyncedGroups)
@@ -569,14 +568,7 @@ private void initPreviouslySyncedRecords()
         SimpleFilter filter = new SimpleFilter(FieldKey.fromString("provider"), _wrapper.getProviderName(), CompareType.EQUAL);
         TableSelector ts = new TableSelector(ti, filter, null);
 
-        ts.forEach(LdapSyncModel.class, new Selector.ForEachBlock<LdapSyncModel>()
-        {
-            @Override
-            public void exec(LdapSyncModel model)
-            {
-                _syncedRecordMap.put(model.getSourceId(), model);
-            }
-        });
+        ts.forEach(LdapSyncModel.class, model -> _syncedRecordMap.put(model.getSourceId(), model));
     }
 
     private User createUser(LdapEntry ldapEntry) throws LdapException
@@ -702,7 +694,7 @@ private Group createGroup(String groupName)
 
         if (!_previewOnly)
         {
-            return SecurityManager.createGroup(getUserGroupContainer(), groupName);
+            return SecurityManager.createGroup(getUserGroupContainer(), groupName, _settings.getLabKeyAdminUser());
         }
         else
         {
@@ -712,11 +704,11 @@ private Group createGroup(String groupName)
 
     private void deleteGroup(Group g)
     {
-        log("Deleteing LabKey group: " + g.getName());
+        log("Deleting LabKey group: " + g.getName());
         _groupsRemoved++;
 
         if (!_previewOnly)
-            SecurityManager.deleteGroup(g);
+            SecurityManager.deleteGroup(g, _settings.getLabKeyAdminUser());
     }
 
     private void deleteUser(User u) throws LdapException
@@ -894,8 +886,7 @@ public void doSetup() throws Exception
             if (project == null)
             {
                 project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME, TestContext.get().getUser());
-                Set<Module> modules = new HashSet<>();
-                modules.addAll(project.getActiveModules());
+                Set<Module> modules = new HashSet<>(project.getActiveModules());
                 modules.add(ModuleLoader.getInstance().getModule(OpenLdapSyncModule.NAME));
                 project.setActiveModules(modules);
             }
@@ -962,7 +953,7 @@ private void cleanUsersAndGroups() throws Exception
                 _log.info("Cleaning up group: "+ groupName);
                 Group g = GroupManager.getGroup(getProject(), groupName, GroupEnumType.PROJECT);
                 if (g != null)
-                    SecurityManager.deleteGroup(g);
+                    SecurityManager.deleteGroup(g, TestContext.get().getUser());
             }
         }