Merged HEAD (5.1) to 5.1.N (5.1.1)

112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/action/ActionServiceImpl.java

@@ -828,11 +828,10 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
     public void directActionExecution(Action action, NodeRef actionedUponNodeRef)
     {
         // Debug output
-        if (logger.isDebugEnabled() == true)
+        if (logger.isDebugEnabled())
         {
-            logger
-                        .debug("The action is being executed as the user: "
-                                    + this.authenticationContext.getCurrentUserName());
+            logger.debug("The action is being executed as the user: "
+                         + this.authenticationContext.getCurrentUserName());
         }
 
         // Get the action executer and execute

source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java

@@ -211,19 +211,23 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
 	protected void checkMandatoryProperties(ParameterizedItem ruleItem, ParameterizedItemDefinition ruleItemDefinition)
 	{
         List<ParameterDefinition> definitions = ruleItemDefinition.getParameterDefinitions();
-        for (ParameterDefinition definition : definitions)
+        if (definitions!= null && definitions.size()>0)
         {
-            if (definition.isMandatory() == true)
+            for (ParameterDefinition definition : definitions)
             {
-                // Check that a value has been set for the mandatory parameter
-                if (ruleItem.getParameterValue(definition.getName()) == null)
+                if (definition.isMandatory() == true)
                 {
-                    // Error since a mandatory parameter has a null value
-                   throw new RuleServiceException(
-                          MessageFormat.format(ERR_MAND_PROP, new Object[]{definition.getName(), ruleItemDefinition.getName()}));
+                    // Check that a value has been set for the mandatory parameter
+                    if (ruleItem.getParameterValue(definition.getName()) == null)
+                    {
+                        // Error since a mandatory parameter has a null value
+                        throw new RuleServiceException(
+                                MessageFormat.format(ERR_MAND_PROP, new Object[]{definition.getName(), ruleItemDefinition.getName()}));
+                    }
                 }
             }
         }
 
+        
 	}
 }

source/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java

@@ -191,9 +191,12 @@ public abstract class ParameterizedItemDefinitionImpl implements ParameterizedIt
 
             List<ParameterDefinition> localizedDefinitions = this.parameterDefinitions.get(locale);
 
-            for (ParameterDefinition definition : localizedDefinitions)
+            if (localizedDefinitions!= null && localizedDefinitions.size()>0)
             {
-                namedDefinitions.put(definition.getName(), definition);
+                for (ParameterDefinition definition : localizedDefinitions)
+                {
+                    namedDefinitions.put(definition.getName(), definition);
+                }
             }
         }
     }

source/test-java/org/alfresco/repo/action/ActionServiceImplTest.java

@@ -414,6 +414,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
         assertEquals(0, actions.size());
     }
 	
+    public void testExecuteActionWithNoParameterDef()
+    {
+        Action action = this.actionService.createAction("empty-action");
+        this.actionService.executeAction(action, this.nodeRef);
+        assertTrue("If we got here then the test is successful", true);
+    }
+    
     /**
      * Test saving an action with no conditions.  Includes testing storage and retrieval 
      * of compensating actions.

source/test-java/org/alfresco/repo/action/executer/EmptyActionExecutor.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.action.executer;
+
+import org.alfresco.repo.action.ActionDefinitionImpl;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionDefinition;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.List;
+
+/**
+ * An action executor that really does nothing.
+ *
+ * @author Gethin James
+ */
+public class EmptyActionExecutor extends ActionExecuterAbstractBase
+{
+    private static Log logger = LogFactory.getLog(EmptyActionExecutor.class);
+
+    @Override
+    protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
+    {
+        logger.info("I did nothing of interest.");
+    }
+
+    @Override
+    protected void addParameterDefinitions(List<ParameterDefinition> paramList)
+    {
+        //No Op
+    }
+
+    @Override
+    public ActionDefinition getActionDefinition()
+    {
+        if (this.actionDefinition == null)
+        {
+            this.actionDefinition = createActionDefinition(this.name);
+            ((ActionDefinitionImpl)this.actionDefinition).setTitleKey(getTitleKey());
+            ((ActionDefinitionImpl)this.actionDefinition).setDescriptionKey(getDescriptionKey());
+            ((ActionDefinitionImpl)this.actionDefinition).setTrackStatus(getTrackStatus());
+            ((ActionDefinitionImpl)this.actionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed());
+            ((ActionDefinitionImpl)this.actionDefinition).setRuleActionExecutor(this.name);
+            ((ActionDefinitionImpl)this.actionDefinition).setApplicableTypes(this.applicableTypes);
+            ((ActionDefinitionImpl) this.actionDefinition).setParameterDefinitions(null);
+        }
+        return this.actionDefinition;
+
+    }
+}

source/test-resources/org/alfresco/repo/action/test-action-services-context.xml

@@ -21,6 +21,13 @@
        </property>
    </bean>
 
+    <bean id="empty-action" class="org.alfresco.repo.action.executer.EmptyActionExecutor" parent="action-executer">
+        <property name="publicAction">
+            <value>false</value>
+        </property>
+    </bean>
+
+   
    <bean id="transient-fail-action"
          class="org.alfresco.repo.action.ActionServiceImplTest$TransientFailActionExecuter"
          parent="action-executer" />