From 9847e15dda942b66faff873e1710fd0ab41dc6c0 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 19 Mar 2014 00:02:52 +0000 Subject: [PATCH] Fixed major issues reported by sonar (Unused formal parameter) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@64829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../audit/RecordsManagementAuditServiceImpl.java | 4 ++-- .../jscript/app/JSONConversionComponent.java | 5 ++--- .../patch/v21/RMv21ReportServicePatch.java | 12 +----------- .../repo/security/authority/RMAuthorityDAOImpl.java | 6 +++--- .../repo/web/scripts/dictionary/RmClassesGet.java | 6 ++---- .../repo/web/scripts/dictionary/RmPropertiesGet.java | 6 ++---- 6 files changed, 12 insertions(+), 27 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index d22575b4eb..239b8fd5ac 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -545,7 +545,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean // Filter out any properties to be audited if specified in the Spring configuration. if (!ignoredAuditProperties.isEmpty()) { - removeAuditProperties(ignoredAuditProperties, propertiesBefore, propertiesAfter); + removeAuditProperties(propertiesBefore, propertiesAfter); } // Property changes @@ -581,7 +581,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean * * @param properties */ - private void removeAuditProperties(List ignoredAuditProperties, Map before, Map after) + private void removeAuditProperties(Map before, Map after) { if (before != null) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 2bf772f303..f9cc30e1e3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -118,19 +118,18 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC if (isFilePlanComponent) { - rootJSONObject.put("rmNode", setRmNodeValues(nodeRef, rootJSONObject, useShortQNames)); + rootJSONObject.put("rmNode", setRmNodeValues(nodeRef, useShortQNames)); } } } /** * @param nodeRef - * @param rootJSONObject * @param useShortQName * @return */ @SuppressWarnings("unchecked") - private JSONObject setRmNodeValues(NodeRef nodeRef, JSONObject rootJSONObject, boolean useShortQName) + private JSONObject setRmNodeValues(NodeRef nodeRef, boolean useShortQName) { JSONObject rmNodeValues = new JSONObject(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java index 7333db8cbb..ba068fbeac 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java @@ -79,15 +79,6 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent logger.debug(" ... adding template root folder"); } - // create report dir - NodeRef templateRoot = createNode(ContentModel.TYPE_FOLDER, - RM_CONFIG_FOLDER, - "rm_report_templates", - "Records Management Report Templates", - "rm_report_templates", - "Records Management Report Templates", - "Records management report templates."); - if (logger.isDebugEnabled()) { logger.debug(" ... adding destruction report template"); @@ -96,7 +87,6 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent // create report templates NodeRef destructionTemplate = createNode( ContentModel.TYPE_CONTENT, - templateRoot, "rmr_destructionReport", "report_rmr_destructionReport.html.ftl", "report_rmr_destructionReport.html.ftl", @@ -114,7 +104,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent } } - private NodeRef createNode(QName type, NodeRef parent, String id, String name, String assocName, String title, String description) + private NodeRef createNode(QName type, String id, String name, String assocName, String title, String description) { Map props = new HashMap(4); props.put(ContentModel.PROP_DESCRIPTION, description); diff --git a/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java index 15bdd092b9..93a6b5a98c 100644 --- a/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java +++ b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java @@ -37,7 +37,7 @@ public class RMAuthorityDAOImpl extends AuthorityDAOImpl { protected void addAuthorityNameIfMatches(Set authorities, String authorityName, AuthorityType type) { - if (isAuthorityNameMatching(authorities, authorityName, type)) + if (isAuthorityNameMatching(authorityName, type)) { authorities.add(authorityName); } @@ -45,7 +45,7 @@ public class RMAuthorityDAOImpl extends AuthorityDAOImpl protected void addAuthorityNameIfMatches(Set authorities, String authorityName, AuthorityType type, Pattern pattern) { - if (isAuthorityNameMatching(authorities, authorityName, type)) + if (isAuthorityNameMatching(authorityName, type)) { if (pattern == null) { @@ -69,7 +69,7 @@ public class RMAuthorityDAOImpl extends AuthorityDAOImpl } } - private boolean isAuthorityNameMatching(Set authorities, String authorityName, AuthorityType type) + private boolean isAuthorityNameMatching(String authorityName, AuthorityType type) { boolean isMatching = false; if (type == null || AuthorityType.getAuthorityType(authorityName).equals(type) && !getAuthorityZones(authorityName).contains("APP.RM")) diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java index 8a55692d24..825a857ea9 100644 --- a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java +++ b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java @@ -75,19 +75,17 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan */ protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - return executeImpl(req, status, cache, RmDictionaryWebServiceUtils.isRmSite(req, siteService)); + return executeImpl(req, RmDictionaryWebServiceUtils.isRmSite(req, siteService)); } /** * Execute custom Java logic * * @param req Web Script request - * @param status Web Script status - * @param cache Web Script cache * @param isRM indicates whether the request comes from an RM site or not * @return custom service model */ - private Map executeImpl(WebScriptRequest req, Status status, Cache cache, boolean isRM) + private Map executeImpl(WebScriptRequest req, boolean isRM) { String classFilter = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_CLASS_FILTER)); String namespacePrefix = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX)); diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java index 93f45057c4..0f6a4c5158 100644 --- a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java +++ b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java @@ -66,19 +66,17 @@ public class RmPropertiesGet extends DictionaryWebServiceBase implements Records */ protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - return executeImpl(req, status, cache, RmDictionaryWebServiceUtils.isRmSite(req, siteService)); + return executeImpl(req, RmDictionaryWebServiceUtils.isRmSite(req, siteService)); } /** * Execute custom Java logic * * @param req Web Script request - * @param status Web Script status - * @param cache Web Script cache * @param isRM indicates whether the request comes from an RM site or not * @return custom service model */ - private Map executeImpl(WebScriptRequest req, Status status, Cache cache, boolean isRM) + private Map executeImpl(WebScriptRequest req, boolean isRM) { QName classQName = null; String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);