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

Moer RM-2113 review comments. Renaming SecurityClearance.getClassificationLevel to getClearanceLevel

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2015-05-06 16:26:50 +00:00
parent 0fbe2e59b0
commit 47c161da65
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearance.java
View File

@@ -33,30 +33,31 @@ public final class SecurityClearance implements Serializable
{
/** Serial version uid */
private static final long serialVersionUID = 8410664575120817707L;
private final PersonInfo personInfo;
private final ClassificationLevel classificationLevel;
public SecurityClearance(final PersonInfo personInfo, final ClassificationLevel classificationLevel)
private final PersonInfo personInfo;
private final ClassificationLevel clearanceLevel;
public SecurityClearance(final PersonInfo personInfo, final ClassificationLevel clearanceLevel)
{
Objects.requireNonNull(personInfo);
Objects.requireNonNull(classificationLevel);
Objects.requireNonNull(clearanceLevel);
this.personInfo = personInfo;
this.classificationLevel = classificationLevel;
this.personInfo = personInfo;
this.clearanceLevel = clearanceLevel;
}
/** Returns the {@link PersonInfo} for this security clearance. */
public PersonInfo getPersonInfo() { return this.personInfo; }
/** Returns the {@link ClassificationLevel} for this security clearance. */
public ClassificationLevel getClassificationLevel() { return this.classificationLevel; }
public ClassificationLevel getClearanceLevel() { return this.clearanceLevel; }
@Override public String toString()
{
StringBuilder msg = new StringBuilder();
msg.append(SecurityClearance.class.getSimpleName())
.append(':').append(personInfo.getUserName())
.append(" [").append(classificationLevel).append(']');
.append(" [").append(clearanceLevel).append(']');
return msg.toString();
}
@@ -69,8 +70,8 @@ public final class SecurityClearance implements Serializable
SecurityClearance that = (SecurityClearance) o;
return this.personInfo.equals(that.personInfo) &&
this.classificationLevel.equals(that.classificationLevel);
this.clearanceLevel.equals(that.clearanceLevel);
}
@Override public int hashCode() { return Objects.hash(personInfo, classificationLevel); }
@Override public int hashCode() { return Objects.hash(personInfo, clearanceLevel); }
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImpl.java
View File

@@ -68,7 +68,7 @@ public class SecurityClearanceServiceImpl extends ServiceBaseImpl implements Sec
if (nodeService.hasAspect(personNode, ASPECT_SECURITY_CLEARANCE))
{
final String clearanceLevel = (String)nodeService.getProperty(personNode, PROP_CLEARANCE_LEVEL);
// TODO Should we fall back to a default here or give an error?
classificationLevel = clearanceLevel == null ? classificationService.getDefaultClassificationLevel() :
classificationService.getClassificationLevelById(clearanceLevel);
}