fixed some code smells

Author: dprzybyl

app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java

@@ -20,12 +20,7 @@
 package com.cognifide.apm.checks.utils;
 
 import com.cognifide.apm.api.actions.ActionResult;
-import com.cognifide.apm.api.exceptions.ActionExecutionException;
-import java.util.Iterator;
 import java.util.List;
-import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
 
 public final class ActionUtils {
 
@@ -35,43 +30,6 @@ private ActionUtils() {
     // intentionally empty
   }
 
-  /**
-   * Adding group to another group may result in cyclic relation. Let current group be the group where we
-   * want to add current authorizable to. If current authorizable contains group such that current group
-   * belongs to, then we prevent such operation.
-   *
-   * @param currentGroup   The group where we want to add current authorizable
-   * @param groupToBeAdded Authorizable we want to add
-   * @throws ActionExecutionException Throw exception, if adding operation results in cyclic relation
-   */
-  public static void checkCyclicRelations(Group currentGroup, Group groupToBeAdded)
-      throws ActionExecutionException {
-    try {
-      if (groupToBeAdded.getID().equals(currentGroup.getID())) {
-        throw new ActionExecutionException(MessagingUtils.addingGroupToItself(currentGroup.getID()));
-      }
-      Iterator<Group> parents = currentGroup.memberOf();
-      while (parents.hasNext()) {
-        Group currentParent = parents.next();
-        // Is added group among my parents?
-        if (currentParent.getID().equals(groupToBeAdded.getID())) {
-          throw new ActionExecutionException(MessagingUtils.cyclicRelationsForbidden(
-              currentGroup.getID(), groupToBeAdded.getID()));
-        }
-        // ... and are its children among my parents?
-        for (Iterator<Authorizable> children = groupToBeAdded.getMembers(); children.hasNext(); ) {
-          Authorizable currentChild = children.next();
-          if (currentParent.getID().equals(currentChild.getID())) {
-            throw new ActionExecutionException(MessagingUtils.cyclicRelationsForbidden(
-                currentChild.getID(), groupToBeAdded.getID()));
-          }
-        }
-      }
-    } catch (RepositoryException e) {
-      throw new ActionExecutionException(MessagingUtils.createMessage(e));
-    }
-  }
-
   public static void logErrors(List<String> errors, ActionResult actionResult) {
     for (String error : errors) {
       actionResult.logError(error);

app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java

@@ -31,16 +31,7 @@ public static String createMessage(Exception e) {
     return StringUtils.isBlank(e.getMessage()) ? "Internal error: " + e.getClass() : e.getMessage();
   }
 
-  public static String addingGroupToItself(String groupId) {
-    return "You can not add group " + groupId + " to itself";
-  }
-
   public static String authorizableNotExists(String authorizableId) {
     return "Authorizable with id: " + authorizableId + " does not exists";
   }
-
-  public static String cyclicRelationsForbidden(String currentGroup, String groupToBeAdded) {
-    return "Cannot add group " + groupToBeAdded + " to group " + currentGroup
-        + " due to resulting cyclic relation";
-  }
 }

app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java

@@ -19,10 +19,8 @@
  */
 package com.cognifide.apm.main.utils;
 
-import com.cognifide.apm.api.actions.ActionResult;
 import com.cognifide.apm.api.exceptions.ActionExecutionException;
 import java.util.Iterator;
-import java.util.List;
 import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -71,10 +69,4 @@ public static void checkCyclicRelations(Group currentGroup, Group groupToBeAdded
       throw new ActionExecutionException(MessagingUtils.createMessage(e));
     }
   }
-
-  public static void logErrors(List<String> errors, ActionResult actionResult) {
-    for (String error : errors) {
-      actionResult.logError(error);
-    }
-  }
 }