inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-6836_SonarFixes' into 'master'

Browse Source 
Resolve RM-6836 "Feature/ sonarfixes"

Closes RM-6836

See merge request records-management/records-management!1170
This commit is contained in:
Ross Gale
2019-05-09 13:12:46 +01:00
parent 709588ff42 8515b9c2f8
commit 493821f1c2
26 changed files with 195 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java
View File

@@ -170,7 +170,7 @@ public class ScriptConstraint implements Serializable
*/
public void deleteAuthority(String authority)
{
//Do nothing
}
/**
@@ -179,7 +179,7 @@ public class ScriptConstraint implements Serializable
*/
public void deleteValue(String value)
{
//Do nothing
}

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java
View File

@@ -43,7 +43,7 @@ public interface RecordsManagementActionCondition
*
* @return String action condition name
*/
String getName();
String getBeanName();
/**
* Get the label of the action condition

14
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
View File

@@ -56,7 +56,7 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte
private FilePlanService filePlanService;
/** bean name */
private String name;
private String beanName;
/** public condition */
private boolean publicCondition = true;
@@ -145,16 +145,16 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte
@Override
public void setBeanName(String name)
{
this.name = name;
this.beanName = name;
super.setBeanName(name);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getName()
* @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getBeanName()
*/
public String getName()
public String getBeanName()
{
return this.name;
return this.beanName;
}
/**
@@ -184,11 +184,11 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte
{
if (this.actionConditionDefinition == null)
{
this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(name);
this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(beanName);
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setTitleKey(getTitleKey());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setDescriptionKey(getDescriptionKey());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(name);
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(beanName);
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setLocalizedParameterDefinitions(getLocalizedParameterDefinitions());
}
return this.actionConditionDefinition;

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
View File

@@ -142,9 +142,9 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi
public void register(RecordsManagementActionCondition rmCondition)
{
if (!rmConditions.containsKey(rmCondition.getName()))
if (!rmConditions.containsKey(rmCondition.getBeanName()))
{
rmConditions.put(rmCondition.getName(), rmCondition);
rmConditions.put(rmCondition.getBeanName(), rmCondition);
}
}

1
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
View File

@@ -55,6 +55,7 @@ public final class RecordsManagementAuditQueryParameters
*/
public RecordsManagementAuditQueryParameters()
{
//Default constructor
}
/**

27
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
View File

@@ -28,6 +28,7 @@
package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
import java.io.Serializable;
import java.util.Objects;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -124,4 +125,30 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra
// Done
return sb.toString();
}
@Override
public boolean equals(Object o)
{
if (this == o)
{
return true;
}
if (o == null || getClass() != o.getClass())
{
return false;
}
if (!super.equals(o))
{
return false;
}
AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(filePlanRoleService, that.filePlanRoleService);
}
@Override
public int hashCode()
{
return Objects.hash(nodeService, filePlanService, filePlanRoleService);
}
}

26
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
View File

@@ -28,6 +28,7 @@
package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
import java.io.Serializable;
import java.util.Objects;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.audit.extractor.AbstractDataExtractor;
@@ -76,4 +77,29 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor
// Done
return identifier;
}
@Override
public boolean equals(Object o)
{
if (this == o)
{
return true;
}
if (o == null || getClass() != o.getClass())
{
return false;
}
if (!super.equals(o))
{
return false;
}
FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o;
return Objects.equals(nodeService, that.nodeService);
}
@Override
public int hashCode()
{
return Objects.hash(nodeService);
}
}

27
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
View File

@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -126,4 +127,30 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
return extractedData;
}
@Override
public boolean equals(Object o)
{
if (this == o)
{
return true;
}
if (o == null || getClass() != o.getClass())
{
return false;
}
if (!super.equals(o))
{
return false;
}
FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(ruleService, that.ruleService);
}
@Override
public int hashCode()
{
return Objects.hash(nodeService, filePlanService, ruleService);
}
}

27
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
View File

@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
@@ -112,4 +113,30 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto
return extractedData;
}
@Override
public boolean equals(Object o)
{
if (this == o)
{
return true;
}
if (o == null || getClass() != o.getClass())
{
return false;
}
if (!super.equals(o))
{
return false;
}
FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o;
return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
&& Objects.equals(ruleService, that.ruleService);
}
@Override
public int hashCode()
{
return Objects.hash(nodeService, filePlanService, ruleService);
}
}

1
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
View File

@@ -98,6 +98,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
public void afterPropertiesSet()
{
//Do nothing
}
/**

125
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
View File

@@ -258,67 +258,75 @@ public class RMEntryVoter extends RMSecurityCommon
}
else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM_CAP))
{
switch(checkCapability(invocation, params, cad))
{
case AccessDecisionVoter.ACCESS_DENIED:
{
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_ABSTAIN:
{
if(logger.isDebugEnabled())
{
if(logger.isTraceEnabled())
{
logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException());
}
else
{
logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod());
}
}
// abstain denies
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_GRANTED:
{
break;
}
}
switch (checkCapability(invocation, params, cad))
{
case AccessDecisionVoter.ACCESS_DENIED:
{
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_ABSTAIN:
{
if (logger.isDebugEnabled())
{
if (logger.isTraceEnabled())
{
logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException());
}
else
{
logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod());
}
}
// abstain denies
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_GRANTED:
{
break;
}
default:
{
//do nothing
}
}
}
else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM))
{
switch(checkPolicy(invocation, params, cad))
{
case AccessDecisionVoter.ACCESS_DENIED:
{
// log message
RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied.");
{
switch (checkPolicy(invocation, params, cad))
{
case AccessDecisionVoter.ACCESS_DENIED:
{
// log message
RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied.");
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_ABSTAIN:
{
if(logger.isDebugEnabled())
{
if(logger.isTraceEnabled())
{
logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException());
}
else
{
logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod());
}
}
// abstain denies
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_GRANTED:
{
break;
}
}
}
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_ABSTAIN:
{
if (logger.isDebugEnabled())
{
if (logger.isTraceEnabled())
{
logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException());
}
else
{
logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod());
}
}
// abstain denies
return AccessDecisionVoter.ACCESS_DENIED;
}
case AccessDecisionVoter.ACCESS_GRANTED:
{
break;
}
default:
{
//do nothing
}
}
}
}
}
finally
@@ -385,6 +393,7 @@ public class RMEntryVoter extends RMSecurityCommon
*/
public void afterPropertiesSet()
{
//Do nothing
}
/**

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java
View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -39,17 +38,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class HasDispositionDateCapabilityCondition extends AbstractCapabilityCondition
{
/** Disposition service */
private DispositionService dispositionService;
/**
* @param dispositionService disposition service
*/
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java
View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -39,17 +38,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class HasEventsCapabilityCondition extends AbstractCapabilityCondition
{
/** Disposition service */
private DispositionService dispositionService;
/**
* @param dispositionService disposition service
*/
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java
View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -40,17 +39,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class IsClassifiedCapabilityCondition extends AbstractCapabilityCondition
{
/** Disposition service */
private DispositionService dispositionService;
/**
* @param dispositionService disposition service
*/
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java
View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -42,9 +41,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition
/** Disposition action */
private String dispositionAction;
/** Disposition service */
private DispositionService dispositionService;
/**
* @param dispositionAction disposition action
*/
@@ -53,14 +49,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition
this.dispositionAction = dispositionAction;
}
/**
* @param dispositionService disposition service
*/
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/

7
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -39,15 +38,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class LastDispositionActionCondition extends AbstractCapabilityCondition
{
private DispositionService dispositionService;
private String dispositionActionName;
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
public void setDispositionActionName(String dispositionActionName)
{
this.dispositionActionName = dispositionActionName;

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java
View File

@@ -30,7 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -43,9 +42,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi
/** Disposition action */
private String dispositionAction;
/** Disposition service */
private DispositionService dispositionService;
/**
* @param dispositionAction disposition action
*/
@@ -54,14 +50,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi
this.dispositionAction = dispositionAction;
}
/**
* @param dispositionService disposition service
*/
public void setDispositionService(DispositionService dispositionService)
{
this.dispositionService = dispositionService;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
View File

@@ -118,7 +118,7 @@ public class DispositionScheduleImpl implements DispositionSchedule,
{
return value.booleanValue();
}
return null;
return false;
}
});
}

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
View File

@@ -83,9 +83,6 @@ public class FilePlanComponentAspect extends BaseBehaviourBean
/** file plan service */
private FilePlanService filePlanService;
/** rendition service */
private RenditionService renditionService;
/**
* @param scriptService set script service
*/

8
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java
View File

@@ -36,7 +36,6 @@ import org.alfresco.repo.policy.annotation.Behaviour;
import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
/**
@@ -49,13 +48,6 @@ import org.alfresco.service.namespace.QName;
@BehaviourBean(defaultType = "qshare:shared")
public class QShareAspect extends BaseBehaviourBean implements NodeServicePolicies.BeforeAddAspectPolicy
{
private NodeService nodeService;
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* Behaviour to prevent sharing a record
*

1
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java
View File

@@ -48,6 +48,7 @@ public class RecordCategoryChild extends RMNode
public RecordCategoryChild()
{
//Default constructor
}
public Boolean getIsRecordCategory()

1
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java
View File

@@ -39,6 +39,7 @@ public class TargetContainer
public TargetContainer()
{
//Default constructor
}
public String getTargetParentId()

1
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java
View File

@@ -67,6 +67,7 @@ public class Transfer
public Transfer()
{
//Default constructor
}
@JsonProperty ("id")

1
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java
View File

@@ -45,6 +45,7 @@ public class TransferChild extends RMNode
public TransferChild()
{
//Default constructor
}
public Boolean getIsClosed()

1
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java
View File

@@ -60,6 +60,7 @@ public class TransferContainer
public TransferContainer()
{
//Default constructor
}
@JsonProperty ("id")

2
rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java
View File

@@ -72,7 +72,7 @@ public enum SortDirection
if (sortDirection == null)
{
throw new AlfrescoRuntimeException("Sort direction '" + sortDirection +"' unknown.");
throw new AlfrescoRuntimeException("Sort direction unknown.");
}
return sortDirection;