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

2
rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/usersecurityclearance.get.json.ftl
View File

@@ -1,7 +1,7 @@
<#import "/org/alfresco/repository/generic-paged-results.lib.ftl" as gen/> <#import "/org/alfresco/repository/generic-paged-results.lib.ftl" as gen/>
<#macro usersecurityclearanceJSON item> <#macro usersecurityclearanceJSON item>
<#local cl=item.classificationLevel> <#local cl=item.clearanceLevel>
<#local pi=item.personInfo> <#local pi=item.personInfo>
<#escape x as jsonUtils.encodeJSONString(x)> <#escape x as jsonUtils.encodeJSONString(x)>
"classificationId": "${cl.id}", "classificationId": "${cl.id}",

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 */ /** Serial version uid */
private static final long serialVersionUID = 8410664575120817707L; 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(personInfo);
Objects.requireNonNull(classificationLevel); Objects.requireNonNull(clearanceLevel);
this.personInfo = personInfo; this.personInfo = personInfo;
this.classificationLevel = classificationLevel; this.clearanceLevel = clearanceLevel;
} }
/** Returns the {@link PersonInfo} for this security clearance. */ /** Returns the {@link PersonInfo} for this security clearance. */
public PersonInfo getPersonInfo() { return this.personInfo; } public PersonInfo getPersonInfo() { return this.personInfo; }
/** Returns the {@link ClassificationLevel} for this security clearance. */ /** Returns the {@link ClassificationLevel} for this security clearance. */
public ClassificationLevel getClassificationLevel() { return this.classificationLevel; } public ClassificationLevel getClearanceLevel() { return this.clearanceLevel; }
@Override public String toString() @Override public String toString()
{ {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append(SecurityClearance.class.getSimpleName()) msg.append(SecurityClearance.class.getSimpleName())
.append(':').append(personInfo.getUserName()) .append(':').append(personInfo.getUserName())
.append(" [").append(classificationLevel).append(']'); .append(" [").append(clearanceLevel).append(']');
return msg.toString(); return msg.toString();
} }
@@ -69,8 +70,8 @@ public final class SecurityClearance implements Serializable
SecurityClearance that = (SecurityClearance) o; SecurityClearance that = (SecurityClearance) o;
return this.personInfo.equals(that.personInfo) && 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)) if (nodeService.hasAspect(personNode, ASPECT_SECURITY_CLEARANCE))
{ {
final String clearanceLevel = (String)nodeService.getProperty(personNode, PROP_CLEARANCE_LEVEL); 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() : classificationLevel = clearanceLevel == null ? classificationService.getDefaultClassificationLevel() :
classificationService.getClassificationLevelById(clearanceLevel); classificationService.getClassificationLevelById(clearanceLevel);
} }

8
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
View File

@@ -26,9 +26,6 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import java.io.Serializable;
import java.util.Map;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.LevelIdNotFound; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.LevelIdNotFound;
import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper; import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper;
@@ -46,6 +43,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.io.Serializable;
import java.util.Map;
/** /**
* Unit tests for {@link SecurityClearanceServiceImpl}. * Unit tests for {@link SecurityClearanceServiceImpl}.
* *
@@ -97,7 +97,7 @@ public class SecurityClearanceServiceImplUnitTest
final SecurityClearance clearance = securityClearanceServiceImpl.getUserSecurityClearance(); final SecurityClearance clearance = securityClearanceServiceImpl.getUserSecurityClearance();
assertEquals("default", clearance.getClassificationLevel().getId()); assertEquals("default", clearance.getClearanceLevel().getId());
} }
/** Check that a user can have their clearance set for the first time. */ /** Check that a user can have their clearance set for the first time. */