Better Null handling, ACE-4246

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2015-09-22 15:29:30 +00:00
parent d6b3f5acd3
commit 410c24d2d1
6 changed files with 103 additions and 14 deletions

View File

@@ -405,7 +405,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_LOCKABLE));
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE));
}
public void testGetAndGetAllWithNoActions()
{
assertNull(this.actionService.getAction(this.nodeRef, AddFeaturesActionExecuter.NAME));
@@ -413,6 +413,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertNotNull(actions);
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

View File

@@ -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;
}
}