Merge branch 'master' into add-data-source-support

wttech · Nov 2, 2023 · b708388 · b708388
2 parents 3596774 + 2611bb3
commit b708388
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 22 deletions.
diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java
@@ -66,6 +66,7 @@ private ActionResult process(Context context, boolean execute) {
       LOGGER.info("Adding authorizables {} to group with id={}", String.join(", ", authorizableIds), group.getID());
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
       return actionResult;
     }
 
@@ -101,7 +102,7 @@ private ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java
@@ -65,6 +65,7 @@ private ActionResult process(Context context, boolean execute) {
       actionResult.setAuthorizable(authorizable.getID());
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
       return actionResult;
     }
 
@@ -101,7 +102,7 @@ private ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java
@@ -27,6 +27,7 @@
 import com.cognifide.apm.main.permissions.PermissionActionHelper;
 import com.cognifide.apm.main.permissions.Restrictions;
 import com.cognifide.apm.main.permissions.exceptions.PermissionException;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import com.cognifide.apm.main.utils.PathUtils;
 import java.util.Collections;
@@ -103,11 +104,14 @@ private ActionResult process(Context context, boolean simulate) {
         actionResult.logWarning("Path " + path + " not found");
       } else {
         actionResult.logError("Path " + path + " not found");
-        return actionResult;
       }
     } catch (RepositoryException | PermissionException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java b/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.actions.Message;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import com.cognifide.apm.main.utils.PathUtils;
 import java.util.HashSet;
@@ -87,6 +88,9 @@ private ActionResult process(Context context, boolean execute) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
 
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/...actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java b/...actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.status.Status;
 import com.cognifide.apm.main.permissions.utils.JackrabbitAccessControlListUtil;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import com.cognifide.apm.main.utils.PathUtils;
 import java.security.Principal;
@@ -73,6 +74,10 @@ private ActionResult process(final Context context, boolean execute) {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/...n/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java b/...n/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java
@@ -24,6 +24,7 @@
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.status.Status;
 import com.cognifide.apm.main.actions.forauthorizable.ForAuthorizable;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -83,6 +84,8 @@ public ActionResult process(Context context, boolean simulate) {
     if (actionResult.getStatus() != Status.ERROR) {
       ActionResult forAuthorizableActionResult = new ForAuthorizable(id, false, createStrategy == CreateAuthorizableStrategy.GROUP).process(context);
       actionResult.changeStatus(forAuthorizableActionResult.getStatus(), forAuthorizableActionResult.getMessages().get(0).getText());
+    } else {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
 import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.List;
 import javax.jcr.RepositoryException;
@@ -72,7 +73,7 @@ private ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java b/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java
@@ -24,8 +24,10 @@
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
+import com.cognifide.apm.api.status.Status;
 import com.cognifide.apm.main.actions.clearpermissions.Purge;
 import com.cognifide.apm.main.actions.removeparents.RemoveParents;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -67,6 +69,10 @@ public ActionResult simulate(Context context) {
       actionResult = context.createActionResult();
       actionResult.logWarning(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 
@@ -91,6 +97,10 @@ public ActionResult execute(Context context) {
       actionResult = context.createActionResult();
       actionResult.logWarning(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
 import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.List;
 import javax.jcr.RepositoryException;
@@ -71,7 +72,7 @@ private ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java
@@ -27,6 +27,7 @@
 import com.cognifide.apm.main.permissions.PermissionActionHelper;
 import com.cognifide.apm.main.permissions.Restrictions;
 import com.cognifide.apm.main.permissions.exceptions.PermissionException;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import com.cognifide.apm.main.utils.PathUtils;
 import java.util.ArrayList;
@@ -108,6 +109,10 @@ private ActionResult process(Context context, boolean simulate) {
     } catch (RepositoryException | PermissionException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/...ns.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java b/...ns.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java
@@ -24,6 +24,8 @@
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -76,6 +78,10 @@ public ActionResult process(Context context) {
         actionResult.logError(MessagingUtils.createMessage(e));
       }
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }
diff --git a/...ions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java b/...ions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
 import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.List;
 import javax.jcr.RepositoryException;
@@ -62,6 +63,7 @@ private ActionResult process(Context context, boolean execute) {
       LOGGER.info("Removing authorizables {} from group with id={}", String.join(", ", authorizableIds), group.getID());
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
       return actionResult;
     }
 
@@ -82,7 +84,7 @@ private ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/...main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java b/...main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java
@@ -22,6 +22,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.Iterator;
 import javax.jcr.RepositoryException;
@@ -61,6 +63,10 @@ public ActionResult detachMembersFromGroup() {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 
@@ -76,6 +82,10 @@ public ActionResult detachAuthorizableFromParents() {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 

diff --git a/...ctions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java b/...ctions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java
@@ -25,6 +25,7 @@
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException;
 import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import java.util.List;
 import javax.jcr.RepositoryException;
@@ -65,6 +66,7 @@ public ActionResult process(Context context, boolean execute) {
       LOGGER.info("Removing authorizable with id={} from groups {}", authorizable.getID(), String.join(", ", groupIds));
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
       return actionResult;
     }
 
@@ -89,7 +91,7 @@ public ActionResult process(Context context, boolean execute) {
     }
 
     if (actionResult.getStatus() == Status.ERROR) {
-      actionResult.logError("Execution interrupted");
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
     }
     return actionResult;
   }

diff --git a/...ions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java b/...ions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java
@@ -23,6 +23,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -64,6 +66,10 @@ private ActionResult process(final Context context, boolean simulate) {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }
diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java
@@ -23,6 +23,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.actions.SessionSavingMode;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 
@@ -49,6 +51,10 @@ private ActionResult process(final Context context, boolean execute) {
     } catch (final RepositoryException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }
diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java
@@ -24,6 +24,8 @@
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.actions.SessionSavingMode;
 import com.cognifide.apm.api.actions.SessionSavingPolicy;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 
 public class SessionSave implements Action {
@@ -56,6 +58,10 @@ private ActionResult process(final Context context, boolean execute) {
         actionResult.logError(MessagingUtils.createMessage(e));
       }
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }
diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java
@@ -23,6 +23,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.api.security.user.User;
@@ -62,6 +64,10 @@ private ActionResult process(final Context context, boolean execute) {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }
diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java
@@ -23,6 +23,8 @@
 import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.actions.Context;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
+import com.cognifide.apm.api.status.Status;
+import com.cognifide.apm.main.utils.ActionUtils;
 import com.cognifide.apm.main.utils.MessagingUtils;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
@@ -72,6 +74,10 @@ private ActionResult process(final Context context, boolean simulate) {
     } catch (RepositoryException | ActionExecutionException e) {
       actionResult.logError(MessagingUtils.createMessage(e));
     }
+
+    if (actionResult.getStatus() == Status.ERROR) {
+      actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG);
+    }
     return actionResult;
   }
 }