From f2eca8cbc30ba54a49c56d15573e43d6b09edbc6 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Sun, 22 Jun 2014 15:13:30 +0000 Subject: [PATCH] Fixed major bugs (Avoid commented-out lines of code) reported in Sonar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@74411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../RecordsManagementActionServiceImpl.java | 1 - ...spositionActionDefinitionUpdateAction.java | 90 ------------------- .../RecordsManagementAdminServiceImpl.java | 11 --- .../capability/RMAfterInvocationProvider.java | 21 ----- .../caveat/RMCaveatConfigComponentImpl.java | 5 -- .../caveat/RMListOfValuesConstraint.java | 1 - .../DispositionActionDefinitionImpl.java | 1 - .../freeze/FreezeServiceImpl.java | 1 - .../model/rma/type/RecordFolderType.java | 3 +- .../script/slingshot/RMSavedSearchesGet.java | 40 ++++----- .../script/slingshot/RMSavedSearchesPost.java | 10 --- .../requestInfo/RequestInfoNotifier.java | 51 ----------- 12 files changed, 17 insertions(+), 218 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index 432fbba486..ad57844141 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -182,7 +182,6 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi @SuppressWarnings("unused") public List getDispositionActions(NodeRef nodeRef) { - //String userName = AuthenticationUtil.getFullyAuthenticatedUser(); List result = new ArrayList(this.rmActions.size()); for (RecordsManagementAction action : this.rmActions.values()) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java index 1f5a595096..a1597f2e36 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java @@ -258,96 +258,6 @@ public class BroadcastDispositionActionDefinitionUpdateAction extends RMActionEx nodeService.setProperty(nextAction.getNodeRef(), PROP_DISPOSITION_AS_OF, newAsOfDate); } - /** - * Persists any changes made to the events on the given disposition action - * definition on the given next action. - * - * @param dispositionActionDef The disposition action definition node - * @param nextAction The next disposition action - */ -// @SuppressWarnings("unchecked") -// private void persistEventChanges(NodeRef dispositionActionDef, DispositionAction nextAction) -// { -// // go through the current events on the next action and remove any that are not present any more -// List stepEvents = (List) nodeService.getProperty(dispositionActionDef, PROP_DISPOSITION_EVENT); -// List eventsList = nextAction.getEventCompletionDetails(); -// List nextActionEvents = new ArrayList(eventsList.size()); -// for (EventCompletionDetails event : eventsList) -// { -// // take note of the event names present on the next action -// String eventName = event.getEventName(); -// nextActionEvents.add(eventName); -// -// // if the event has been removed delete from next action -// if (stepEvents != null && !stepEvents.contains(event.getEventName())) -// { -// // remove the child association representing the event -// nodeService.removeChild(nextAction.getNodeRef(), event.getNodeRef()); -// -// if (logger.isDebugEnabled()) -// { -// logger.debug("Removed '" + eventName + "' from next action '" + nextAction.getName() + -// "' (" + nextAction.getNodeRef() + ")"); -// } -// } -// } -// -// // go through the disposition action definition step events and add any new ones -// if (stepEvents != null) -// { -// for (String eventName : stepEvents) -// { -// if (!nextActionEvents.contains(eventName)) -// { -// createEvent(recordsManagementEventService.getEvent(eventName), nextAction.getNodeRef()); -// -// if (logger.isDebugEnabled()) -// { -// logger.debug("Added '" + eventName + "' to next action '" + nextAction.getName() + -// "' (" + nextAction.getNodeRef() + ")"); -// } -// } -// } -// } -// -// // NOTE: eventsList contains all the events that have been updated! -// // TODO: manually update the search properties for the parent node! -// -// // finally since events may have changed re-calculate the events eligible flag -// boolean eligible = updateEventEligible(nextAction); -// -// if (logger.isDebugEnabled()) -// { -// logger.debug("Set events eligible flag to '" + eligible + "' for next action '" + nextAction.getName() + -// "' (" + nextAction.getNodeRef() + ")"); -// } -// } - -// /** -// * Creates the given records management event for the given 'next action'. -// * -// * @param event The event to create -// * @param nextActionNodeRef The next action node -// * @return The created event NodeRef -// */ -// protected NodeRef createEvent(RecordsManagementEvent event, NodeRef nextActionNodeRef) -// { -// NodeRef eventNodeRef = null; -// -// Map eventProps = new HashMap(7); -// eventProps.put(PROP_EVENT_EXECUTION_NAME, event.getName()); -// // TODO display label -// RecordsManagementEventType eventType = recordsManagementEventService.getEventType(event.getType()); -// eventProps.put(PROP_EVENT_EXECUTION_AUTOMATIC, eventType.isAutomaticEvent()); -// eventProps.put(PROP_EVENT_EXECUTION_COMPLETE, false); -// -// // Create the event execution object -// this.nodeService.createNode(nextActionNodeRef, ASSOC_EVENT_EXECUTIONS, -// ASSOC_EVENT_EXECUTIONS, TYPE_EVENT_EXECUTION, eventProps); -// -// return eventNodeRef; -// } - @Override protected void addParameterDefinitions(List paramList) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java index bf46516dab..2a35b12038 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java @@ -1167,9 +1167,6 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin if (assocDef.isChild()) { - // TODO: Ask for a more efficient method such as - // nodeService.removeChildAssociation(fromNode, toNode, chRef.getTypeQName(), null); - AuthenticationUtil.runAsSystem(new RunAsWork() { @Override @@ -1307,7 +1304,6 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin if (existsLabel(compoundID)) { return null; - //throw new IllegalArgumentException(I18NUtil.getMessage(MSG_REF_LABEL_IN_USE, compoundID)); } // defaults to RM_CUSTOM_URI @@ -1448,13 +1444,6 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin } } - /* - public void addCustomConstraintDefinition(QName constraintName, String description, Map parameters) - { - // TODO Auto-generated method stub - } - */ - public void changeCustomConstraintValues(QName constraintName, List newAllowedValues) { ParameterCheck.mandatory("constraintName", constraintName); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index a6fad995bd..541b97087a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -446,18 +446,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon maxSize = Integer.valueOf(maxSize + returnedObject.getResultSetMetaData().getSearchParameters().getSkipCount()); } -// int maxChecks = maxPermissionChecks; -// if (returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionChecks() >= 0) -// { -// maxChecks = returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionChecks(); -// } - -// long maxCheckTime = maxPermissionCheckTimeMillis; -// if (returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionCheckTimeMillis() >= 0) -// { -// maxCheckTime = returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionCheckTimeMillis(); -// } - if (supportedDefinitions.size() == 0) { if (maxSize == null) @@ -505,15 +493,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon for (int i = 0; i < returnedObject.length(); i++) { long currentTimeMillis = System.currentTimeMillis(); -// if (i >= maxChecks || (currentTimeMillis - startTimeMillis) > maxCheckTime) -// { -// filteringResultSet.setResultSetMetaData( -// new SimpleResultSetMetaData( -// LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, -// PermissionEvaluationMode.EAGER, -// returnedObject.getResultSetMetaData().getSearchParameters())); -// break; -// } // All permission checks must pass inclusionMask.set(i, true); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java index 08cf3b1e10..ea46bcbe21 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java @@ -383,11 +383,6 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon } } - //if (! found) - //{ - //throw new AlfrescoRuntimeException("Constraint does not exist (or is not used): "+conStr); - //} - if (allowedValues != null) { if (logger.isInfoEnabled()) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java index 80489faabb..356ac485bc 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java @@ -44,7 +44,6 @@ import org.springframework.extensions.surf.util.I18NUtil; */ public class RMListOfValuesConstraint extends ListOfValuesConstraint { - //private static final String ERR_NO_VALUES = "d_dictionary.constraint.list_of_values.no_values"; private static final String ERR_NON_STRING = "d_dictionary.constraint.string_length.non_string"; private static final String ERR_INVALID_VALUE = "d_dictionary.constraint.list_of_values.invalid_value"; private static final String LOV_CONSTRAINT_VALUE = "listconstraint"; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java index ab18a19ba7..9e4865d904 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java @@ -75,7 +75,6 @@ public class DispositionActionDefinitionImpl implements DispositionActionDefinit */ public DispositionActionDefinitionImpl(RecordsManagementEventService recordsManagementEventService, RecordsManagementActionService recordsManagementActionService, NodeService nodeService, NodeRef nodeRef, int index) { - //this.services = services; this.recordsManagementEventService = recordsManagementEventService; this.recordsManagementActionService = recordsManagementActionService; this.nodeService = nodeService; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java index 6976433dd2..b646125ea8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java @@ -49,7 +49,6 @@ public class FreezeServiceImpl extends ServiceBaseImpl RecordsManagementModel { /** I18N */ - //private static final String MSG_FREEZE_ONLY_RECORDS_FOLDERS = "rm.action.freeze-only-records-folders"; private static final String MSG_HOLD_NAME = "rm.hold.name"; /** File Plan Service */ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 54c6d399ee..89802c2b62 100755 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -105,7 +105,6 @@ public class RecordFolderType extends AbstractDisposableItem { if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef())) { - //final NodeRef oldNodeRef = oldChildAssocRef.getChildRef(); final NodeRef newNodeRef = newChildAssocRef.getChildRef(); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() @@ -127,7 +126,7 @@ public class RecordFolderType extends AbstractDisposableItem // Re-initiate the records in the new folder. recordService.file(record); } - + return null; } }, AuthenticationUtil.getSystemUserName()); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java index c26646c2fb..5ef072a309 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java @@ -34,17 +34,17 @@ import org.springframework.extensions.webscripts.WebScriptRequest; /** * RM saved searches GET web script - * + * * @author Roy Wetherall */ public class RMSavedSearchesGet extends DeclarativeWebScript { /** Records management search service */ protected RecordsManagementSearchService recordsManagementSearchService; - + /** Site service */ protected SiteService siteService; - + /** * @param recordsManagementSearchService records management search service */ @@ -52,7 +52,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript { this.recordsManagementSearchService = recordsManagementSearchService; } - + /** * @param siteService site service */ @@ -60,7 +60,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript { this.siteService = siteService; } - + /* * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache) */ @@ -71,7 +71,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript Map model = new HashMap(13); // Get the site id and confirm it is valid - Map templateVars = req.getServiceMatch().getTemplateVars(); + Map templateVars = req.getServiceMatch().getTemplateVars(); String siteId = templateVars.get("site"); if (siteId == null || siteId.length() == 0) { @@ -81,15 +81,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript { throw new WebScriptException(Status.STATUS_NOT_FOUND, "Site not found."); } - - // TODO determine whether this is still relevant -// String isPublicString = req.getParameter("p"); -// boolean isPublic = false; -// if (isPublicString != null && isPublicString.length() != 0) -// { -// isPublic = Boolean.parseBoolean(isPublicString); -// } - + // Get the saved search details List details = recordsManagementSearchService.getSavedSearches(siteId); List items = new ArrayList(); @@ -100,15 +92,15 @@ public class RMSavedSearchesGet extends DeclarativeWebScript String query = savedSearchDetails.getCompatibility().getQuery(); String params = savedSearchDetails.getCompatibility().getParams(); String sort = savedSearchDetails.getCompatibility().getSort(); - + Item item = new Item(name, description, query, params, sort); items.add(item); } - + model.put("savedSearches", items); return model; } - + /** * Item class to contain information about items being placed in model. */ @@ -119,7 +111,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript private String query; private String params; private String sort; - + public Item(String name, String description, String query, String params, String sort) { this.name = name; @@ -128,27 +120,27 @@ public class RMSavedSearchesGet extends DeclarativeWebScript this.params = params; this.sort = sort; } - + public String getName() { return name; } - + public String getDescription() { return description; } - + public String getQuery() { return query; } - + public String getParams() { return params; } - + public String getSort() { return sort; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java index 5754734688..aef0fa4dd3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java @@ -94,16 +94,6 @@ public class RMSavedSearchesPost extends DeclarativeWebScript throw new WebScriptException(Status.STATUS_NOT_FOUND, "Site not found."); } - // Example format of posted Saved Search JSON: - // { - // "name": "search name", - // "description": "the search description", - // "query": "the complete search query string", - // "public": boolean, - // "params": "terms=keywords:xyz&undeclared=true", - // "sort": "cm:name/asc" - //} - try { // Parse the JSON passed in the request diff --git a/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java index ad27c11d48..e087e2af5e 100644 --- a/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java +++ b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java @@ -52,21 +52,6 @@ public class RequestInfoNotifier implements TaskListener // Assign the task to the initiator String initiator = RequestInfoUtils.getInitiator(delegateTask); delegateTask.setAssignee(initiator); - - // FIXME: Is sending an email required? - // At the moment we do not use email templates - /* - // Create the context and send an email to the initiator - NotificationContext notificationContext = new NotificationContext(); - notificationContext.setAsyncNotification(true); - notificationContext.setIgnoreNotificationFailure(true); - notificationContext.addTo(initiator); - notificationContext.setSubject(getEmailSubject(recordName)); - notificationContext.setBody(getEmailBody(recordName)); - - // Send the email - RequestInfoUtils.getServiceRegistry().getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext); - */ } /** @@ -84,40 +69,4 @@ public class RequestInfoNotifier implements TaskListener sb.append("'"); return sb.toString(); } - - /** - * Helper method for building the email subject - * - * @param recordName The name of the record - * @return Returns the email subject - */ -// private String getEmailSubject(String recordName) -// { -// StringBuilder sb = new StringBuilder(); -// sb.append(I18NUtil.getMessage("activitiReviewPooled.workflow.email.subject")); -// sb.append(" '"); -// sb.append(recordName); -// sb.append("'"); -// return sb.toString(); -// } - - /** - * Helper method for building the email body - * - * @param recordName The name of the record - * @return Returns the email body - */ -// private String getEmailBody(String recordName) -// { -// StringBuilder sb = new StringBuilder(); -// sb.append(I18NUtil.getMessage("activitiReviewPooled.workflow.email.body1")); -// sb.append(" '"); -// sb.append(AuthenticationUtil.getFullyAuthenticatedUser()); -// sb.append("' "); -// sb.append(I18NUtil.getMessage("activitiReviewPooled.workflow.email.body2")); -// sb.append(" '"); -// sb.append(recordName); -// sb.append("'."); -// return sb.toString(); -// } }