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

fixing IDE whitespaces

Browse Source
This commit is contained in:
Sara Aspery
2017-06-24 22:49:27 +01:00
parent 854c48cfd2
commit c4342a2a03
7 changed files with 1411 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java
View File

@@ -149,8 +149,8 @@ public class RecordsAPI extends RMModelRequest
* <li>Invalid parameter: {@code recordId} is not a record</li> * <li>Invalid parameter: {@code recordId} is not a record</li>
* <li>authentication fails</li> * <li>authentication fails</li>
* <li>current user does not have permission to complete {@code recordId}</li> * <li>current user does not have permission to complete {@code recordId}</li>
* <li>{@code recordId} does not exist</li> * <li>{@code recordId} does not exist or is frozen</li>
* <li>model integrity exception: the record is already complete</li> * <li>model integrity exception: the record is already completed</li>
* <li>model integrity exception: the record has missing meta-data</li> * <li>model integrity exception: the record has missing meta-data</li>
* </ul> * </ul>
*/ */
@@ -242,7 +242,7 @@ public class RecordsAPI extends RMModelRequest
* @param recordModel The record model which holds the information * @param recordModel The record model which holds the information
* @param recordId The identifier of a record * @param recordId The identifier of a record
* @param parameters The URL parameters to add * @param parameters The URL parameters to add
* @param returns The updated {@link Record} * @return The updated {@link Record}
* @throws Exception for the following cases: * @throws Exception for the following cases:
* <ul> * <ul>
* <li>the update request is invalid or {@code recordId} is not a valid format or {@code recordModel} is invalid</li> * <li>the update request is invalid or {@code recordId} is not a valid format or {@code recordModel} is invalid</li>

7
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CompleteRecordTests.java
View File

@@ -207,8 +207,7 @@ public class CompleteRecordTests extends BaseRMRestTest
description = "Cannot complete a document that is not a record" description = "Cannot complete a document that is not a record"
) )
@AlfrescoTest (jira = "RM-4431") @AlfrescoTest (jira = "RM-4431")
public void completeNonRecord(String nonRecordId) public void completeNonRecord(String nonRecordId) throws Exception
throws Exception
{ {
// Get the recordsAPI // Get the recordsAPI
RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI(); RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
@@ -254,7 +253,7 @@ public class CompleteRecordTests extends BaseRMRestTest
} }
/** /**
* Helper method to create an electronic record and and assert successfully creation * Helper method to create an electronic record and and assert successful creation
*/ */
private Record createAndVerifyElectronicRecord(String recordFolderId) throws Exception private Record createAndVerifyElectronicRecord(String recordFolderId) throws Exception
{ {
@@ -268,7 +267,7 @@ public class CompleteRecordTests extends BaseRMRestTest
} }
/** /**
* Helper method to create a non-electronic record and and assert successfully creation * Helper method to create a non-electronic record and and assert successful creation
*/ */
private Record createAndVerifyNonElectronicRecord(String recordFolderId) throws Exception private Record createAndVerifyNonElectronicRecord(String recordFolderId) throws Exception
{ {

558
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

File diff suppressed because it is too large Load Diff

8
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
View File

@@ -42,14 +42,10 @@ import org.alfresco.util.ParameterCheck;
*/ */
public class DeclareRecordAction extends RMActionExecuterAbstractBase public class DeclareRecordAction extends RMActionExecuterAbstractBase
{ {
/** /** action name */
* action name
*/
public static final String NAME = "declareRecord"; public static final String NAME = "declareRecord";
/** /** Record service */
* Record service
*/
private RecordService recordService; private RecordService recordService;
/** /**

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
View File

@@ -57,6 +57,7 @@ public interface RecordService
* *
* @param recordMetadataAspect record metadata aspect qualified name * @param recordMetadataAspect record metadata aspect qualified name
* @param filePlanType file plan type * @param filePlanType file plan type
*
* @since 2.2 * @since 2.2
*/ */
void registerRecordMetadataAspect(QName recordMetadataAspect, QName filePlanType); void registerRecordMetadataAspect(QName recordMetadataAspect, QName filePlanType);
@@ -72,6 +73,7 @@ public interface RecordService
* Disables the property editable check for a given node in this transaction only. * Disables the property editable check for a given node in this transaction only.
* *
* @param nodeRef node reference * @param nodeRef node reference
*
* @since 2.2 * @since 2.2
*/ */
void disablePropertyEditableCheck(NodeRef nodeRef); void disablePropertyEditableCheck(NodeRef nodeRef);
@@ -85,6 +87,7 @@ public interface RecordService
* Gets a list of all the record meta-data aspects * Gets a list of all the record meta-data aspects
* *
* @return {@link Set}<{@link QName}> list of record meta-data aspects * @return {@link Set}<{@link QName}> list of record meta-data aspects
*
* @deprecated since 2.2, file plan component required to provide context * @deprecated since 2.2, file plan component required to provide context
*/ */
@Deprecated @Deprecated
@@ -96,6 +99,7 @@ public interface RecordService
* *
* @param aspect aspect {@link QName} * @param aspect aspect {@link QName}
* @return boolean true if the aspect is a registered record meta-data aspect, false otherwise * @return boolean true if the aspect is a registered record meta-data aspect, false otherwise
*
* @since 2.3 * @since 2.3
*/ */
boolean isRecordMetadataAspect(QName aspect); boolean isRecordMetadataAspect(QName aspect);
@@ -107,6 +111,7 @@ public interface RecordService
* @param property property {@link QName} * @param property property {@link QName}
* @return boolean true if the property is declared on a registered record meta-data aspect, * @return boolean true if the property is declared on a registered record meta-data aspect,
* false otherwise * false otherwise
*
* @since 2.3 * @since 2.3
*/ */
boolean isRecordMetadataProperty(QName property); boolean isRecordMetadataProperty(QName property);
@@ -120,6 +125,7 @@ public interface RecordService
* *
* @param nodeRef node reference to file plan component providing context * @param nodeRef node reference to file plan component providing context
* @return {@link Set}<{@link QName}> list of record meta-data aspects * @return {@link Set}<{@link QName}> list of record meta-data aspects
*
* @since 2.2 * @since 2.2
*/ */
Set<QName> getRecordMetadataAspects(NodeRef nodeRef); Set<QName> getRecordMetadataAspects(NodeRef nodeRef);
@@ -132,6 +138,7 @@ public interface RecordService
* *
* @param filePlanType file plan type * @param filePlanType file plan type
* @return{@link Set}<{@link QName}> list of record meta-data aspects * @return{@link Set}<{@link QName}> list of record meta-data aspects
*
* @since 2.2 * @since 2.2
*/ */
Set<QName> getRecordMetadataAspects(QName filePlanType); Set<QName> getRecordMetadataAspects(QName filePlanType);
@@ -194,7 +201,7 @@ public interface RecordService
/** /**
* Indicates whether the record is filed or not * Indicates whether the record is filed or not
* *
* @param record Record node reference * @param record nodeRef of record
* @return boolean true if filed, false otherwise * @return boolean true if filed, false otherwise
*/ */
boolean isFiled(NodeRef record); boolean isFiled(NodeRef record);
@@ -202,7 +209,7 @@ public interface RecordService
/** /**
* 'File' a new document that arrived in the file plan structure. * 'File' a new document that arrived in the file plan structure.
* *
* @param record Record node reference * @param record noderef of record
*/ */
void file(NodeRef record); void file(NodeRef record);
@@ -267,6 +274,7 @@ public interface RecordService
* *
* @param record the record to unlink * @param record the record to unlink
* @param recordFolder the record folder to unlink it from * @param recordFolder the record folder to unlink it from
*
* @since 2.3 * @since 2.3
*/ */
void unlink(NodeRef record, NodeRef recordFolder); void unlink(NodeRef record, NodeRef recordFolder);

231
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -145,47 +145,33 @@ public class RecordServiceImpl extends BaseBehaviourBean
NodeServicePolicies.OnUpdatePropertiesPolicy, NodeServicePolicies.OnUpdatePropertiesPolicy,
ContentServicePolicies.OnContentUpdatePolicy ContentServicePolicies.OnContentUpdatePolicy
{ {
/** /** Logger */
* Logger
*/
private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class);
/** /** Sync Model URI */
* Sync Model URI
*/
private static final String SYNC_MODEL_1_0_URI = "http://www.alfresco.org/model/sync/1.0"; private static final String SYNC_MODEL_1_0_URI = "http://www.alfresco.org/model/sync/1.0";
/** /** Synced aspect */
* Synced aspect
*/
private static final QName ASPECT_SYNCED = QName.createQName(SYNC_MODEL_1_0_URI, "synced"); private static final QName ASPECT_SYNCED = QName.createQName(SYNC_MODEL_1_0_URI, "synced");
/** /** transation data key */
* transation data key
*/
private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate"; private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate";
public static final String KEY_NEW_RECORDS = "newRecords"; public static final String KEY_NEW_RECORDS = "newRecords";
/** /** I18N */
* I18N
*/
private static final String MSG_NODE_HAS_ASPECT = "rm.service.node-has-aspect"; private static final String MSG_NODE_HAS_ASPECT = "rm.service.node-has-aspect";
private static final String FINAL_VERSION = "rm.service.final-version"; private static final String FINAL_VERSION = "rm.service.final-version";
private static final String FINAL_DESCRIPTION = "rm.service.final-version-description"; private static final String FINAL_DESCRIPTION = "rm.service.final-version-description";
private static final String MSG_UNDECLARED_ONLY_RECORDS = "rm.action.undeclared-only-records"; private static final String MSG_UNDECLARED_ONLY_RECORDS = "rm.action.undeclared-only-records";
private static final String MSG_NO_DECLARE_MAND_PROP = "rm.action.no-declare-mand-prop"; private static final String MSG_NO_DECLARE_MAND_PROP = "rm.action.no-declare-mand-prop";
/** /** Always edit property array */
* Always edit property array
*/
private static final QName[] ALWAYS_EDIT_PROPERTIES = new QName[] private static final QName[] ALWAYS_EDIT_PROPERTIES = new QName[]
{ {
ContentModel.PROP_LAST_THUMBNAIL_MODIFICATION_DATA ContentModel.PROP_LAST_THUMBNAIL_MODIFICATION_DATA
}; };
/** /** always edit model URI's */
* always edit model URI's
*/
private List<String> alwaysEditURIs; private List<String> alwaysEditURIs;
/** /**
@@ -209,9 +195,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
return this.alwaysEditURIs; return this.alwaysEditURIs;
} }
/** /** record model URI's */
* record model URI's
*/
public static final List<String> RECORD_MODEL_URIS = Collections.unmodifiableList( public static final List<String> RECORD_MODEL_URIS = Collections.unmodifiableList(
Arrays.asList( Arrays.asList(
RM_URI, RM_URI,
@@ -221,9 +205,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
DOD5015Model.DOD_URI DOD5015Model.DOD_URI
)); ));
/** /** non-record model URI's */
* non-record model URI's
*/
private static final String[] NON_RECORD_MODEL_URIS = new String[] private static final String[] NON_RECORD_MODEL_URIS = new String[]
{ {
NamespaceService.AUDIO_MODEL_1_0_URI, NamespaceService.AUDIO_MODEL_1_0_URI,
@@ -235,114 +217,70 @@ public class RecordServiceImpl extends BaseBehaviourBean
NamespaceService.REPOSITORY_VIEW_1_0_URI NamespaceService.REPOSITORY_VIEW_1_0_URI
}; };
/** /** Indentity service */
* Indentity service
*/
private IdentifierService identifierService; private IdentifierService identifierService;
/** /** Extended permission service */
* Extended permission service
*/
private ExtendedPermissionService extendedPermissionService; private ExtendedPermissionService extendedPermissionService;
/** /** Extended security service */
* Extended security service
*/
private ExtendedSecurityService extendedSecurityService; private ExtendedSecurityService extendedSecurityService;
/** /** File plan service */
* File plan service
*/
private FilePlanService filePlanService; private FilePlanService filePlanService;
/** /** Records management notification helper */
* Records management notification helper
*/
private RecordsManagementNotificationHelper notificationHelper; private RecordsManagementNotificationHelper notificationHelper;
/** /** Policy component */
* Policy component
*/
private PolicyComponent policyComponent; private PolicyComponent policyComponent;
/** /** Ownable service */
* Ownable service
*/
private OwnableService ownableService; private OwnableService ownableService;
/** /** Capability service */
* Capability service
*/
private CapabilityService capabilityService; private CapabilityService capabilityService;
/** /** Rule service */
* Rule service
*/
private RuleService ruleService; private RuleService ruleService;
/** /** File folder service */
* File folder service
*/
private FileFolderService fileFolderService; private FileFolderService fileFolderService;
/** /** Record folder service */
* Record folder service
*/
private RecordFolderService recordFolderService; private RecordFolderService recordFolderService;
/** /** File plan role service */
* File plan role service
*/
private FilePlanRoleService filePlanRoleService; private FilePlanRoleService filePlanRoleService;
/** /** Permission service */
* Permission service
*/
private PermissionService permissionService; private PermissionService permissionService;
/** /** Version service */
* Version service
*/
private VersionService versionService; private VersionService versionService;
/** /** Relationship service */
* Relationship service
*/
private RelationshipService relationshipService; private RelationshipService relationshipService;
/** /** Disposition service */
* Disposition service
*/
private DispositionService dispositionService; private DispositionService dispositionService;
/** /** records management container type */
* records management container type
*/
private RecordsManagementContainerType recordsManagementContainerType; private RecordsManagementContainerType recordsManagementContainerType;
/** /** recordable version service */
* recordable version service
*/
private RecordableVersionService recordableVersionService; private RecordableVersionService recordableVersionService;
/** /** list of available record meta-data aspects and the file plan types the are applicable to */
* list of available record meta-data aspects and the file plan types the are applicable to
*/
private Map<QName, Set<QName>> recordMetaDataAspects; private Map<QName, Set<QName>> recordMetaDataAspects;
/** /** Freeze service */
* Freeze service
*/
private FreezeService freezeService; private FreezeService freezeService;
/** /** Namespace service */
* Namespace service
*/
private NamespaceService namespaceService; private NamespaceService namespaceService;
/** /** policies */
* policies
*/
private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord; private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord;
private ClassPolicyDelegate<OnFileRecord> onFileRecord; private ClassPolicyDelegate<OnFileRecord> onFileRecord;
private ClassPolicyDelegate<BeforeRecordDeclaration> beforeRecordDeclarationDelegate; private ClassPolicyDelegate<BeforeRecordDeclaration> beforeRecordDeclarationDelegate;
@@ -622,7 +560,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
Set<NodeRef> newRecords = transactionalResourceHelper.getSet(KEY_NEW_RECORDS); Set<NodeRef> newRecords = transactionalResourceHelper.getSet(KEY_NEW_RECORDS);
newRecords.add(nodeRef); newRecords.add(nodeRef);
} else }
else
{ {
// if we are linking a record // if we are linking a record
NodeRef parentNodeRef = childAssocRef.getParentRef(); NodeRef parentNodeRef = childAssocRef.getParentRef();
@@ -638,11 +577,13 @@ public class RecordServiceImpl extends BaseBehaviourBean
// recalculate disposition schedule for the record when linking it // recalculate disposition schedule for the record when linking it
dispositionService.recalculateNextDispositionStep(nodeRef); dispositionService.recalculateNextDispositionStep(nodeRef);
} }
} catch (RecordLinkRuntimeException e) }
catch (RecordLinkRuntimeException e)
{ {
// rethrow exception // rethrow exception
throw e; throw e;
} catch (AlfrescoRuntimeException e) }
catch (AlfrescoRuntimeException e)
{ {
// do nothing but log error // do nothing but log error
LOGGER.warn("Unable to file pending record.", e); LOGGER.warn("Unable to file pending record.", e);
@@ -698,7 +639,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
( (
name = "onUpdateProperties", name = "onUpdateProperties",
kind = BehaviourKind.CLASS, kind = BehaviourKind.CLASS,
type = "rma:record" type= "rma:record"
) )
public void onUpdateProperties(final NodeRef nodeRef, final Map<QName, Serializable> before, final Map<QName, Serializable> after) public void onUpdateProperties(final NodeRef nodeRef, final Map<QName, Serializable> before, final Map<QName, Serializable> after)
{ {
@@ -724,18 +665,20 @@ public class RecordServiceImpl extends BaseBehaviourBean
// deal with date values, remove the seconds and milliseconds for the // deal with date values, remove the seconds and milliseconds for the
// comparison as they are removed from the submitted for data // comparison as they are removed from the submitted for data
Calendar beforeCal = Calendar.getInstance(); Calendar beforeCal = Calendar.getInstance();
beforeCal.setTime((Date) beforeValue); beforeCal.setTime((Date)beforeValue);
Calendar afterCal = Calendar.getInstance(); Calendar afterCal = Calendar.getInstance();
afterCal.setTime((Date) afterValue); afterCal.setTime((Date)afterValue);
beforeCal.set(Calendar.SECOND, 0); beforeCal.set(Calendar.SECOND, 0);
beforeCal.set(Calendar.MILLISECOND, 0); beforeCal.set(Calendar.MILLISECOND, 0);
afterCal.set(Calendar.SECOND, 0); afterCal.set(Calendar.SECOND, 0);
afterCal.set(Calendar.MILLISECOND, 0); afterCal.set(Calendar.MILLISECOND, 0);
propertyUnchanged = (beforeCal.compareTo(afterCal) == 0); propertyUnchanged = (beforeCal.compareTo(afterCal) == 0);
} else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE))) }
else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE)))
{ {
propertyUnchanged = true; propertyUnchanged = true;
} else }
else
{ {
// otherwise // otherwise
propertyUnchanged = EqualsHelper.nullSafeEquals(beforeValue, afterValue); propertyUnchanged = EqualsHelper.nullSafeEquals(beforeValue, afterValue);
@@ -759,6 +702,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
* Get map containing record metadata aspects. * Get map containing record metadata aspects.
* *
* @return {@link Map}<{@link QName}, {@link Set}<{@link QName}>> map containing record metadata aspects * @return {@link Map}<{@link QName}, {@link Set}<{@link QName}>> map containing record metadata aspects
*
* @since 2.2 * @since 2.2
*/ */
protected Map<QName, Set<QName>> getRecordMetadataAspectsMap() protected Map<QName, Set<QName>> getRecordMetadataAspectsMap()
@@ -816,7 +760,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
// get the current set of file plan types for this aspect // get the current set of file plan types for this aspect
filePlanTypes = getRecordMetadataAspectsMap().get(recordMetadataAspect); filePlanTypes = getRecordMetadataAspectsMap().get(recordMetadataAspect);
} else }
else
{ {
// create a new set for the file plan type // create a new set for the file plan type
filePlanTypes = new HashSet<QName>(1); filePlanTypes = new HashSet<QName>(1);
@@ -961,7 +906,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
// move the document into the file plan // move the document into the file plan
nodeService.moveNode(nodeRef, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName()); nodeService.moveNode(nodeRef, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
} finally }
finally
{ {
behaviourFilter.enableBehaviour(); behaviourFilter.enableBehaviour();
} }
@@ -1000,12 +946,14 @@ public class RecordServiceImpl extends BaseBehaviourBean
// set the extended security // set the extended security
extendedSecurityService.set(nodeRef, readersAndWriters); extendedSecurityService.set(nodeRef, readersAndWriters);
} finally }
finally
{ {
ruleService.enableRules(); ruleService.enableRules();
} }
} }
} finally }
finally
{ {
ruleService.enableRuleType("outbound"); ruleService.enableRuleType("outbound");
} }
@@ -1046,7 +994,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
LOGGER.debug(msg); LOGGER.debug(msg);
throw new RecordCreationException(msg); throw new RecordCreationException(msg);
} }
} else }
else
{ {
// verify that the provided file plan is actually a file plan // verify that the provided file plan is actually a file plan
if (!filePlanService.isFilePlan(filePlan)) if (!filePlanService.isFilePlan(filePlan))
@@ -1162,7 +1111,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
// create a copy of the original state and add it to the unfiled record container // create a copy of the original state and add it to the unfiled record container
FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null); FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null);
record = recordInfo.getNodeRef(); record = recordInfo.getNodeRef();
} finally }
finally
{ {
recordsManagementContainerType.enable(); recordsManagementContainerType.enable();
} }
@@ -1173,7 +1123,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
try try
{ {
nodeService.removeAspect(record, ContentModel.ASPECT_VERSIONABLE); nodeService.removeAspect(record, ContentModel.ASPECT_VERSIONABLE);
} finally }
finally
{ {
behaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE); behaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
} }
@@ -1196,14 +1147,16 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (originalAssocs == null) if (originalAssocs == null)
{ {
nodeService.removeAspect(record, ContentModel.ASPECT_COPIEDFROM); nodeService.removeAspect(record, ContentModel.ASPECT_COPIEDFROM);
} else }
else
{ {
for (AssociationRef originalAssoc : originalAssocs) for (AssociationRef originalAssoc : originalAssocs)
{ {
nodeService.createAssociation(record, originalAssoc.getTargetRef(), ContentModel.ASSOC_ORIGINAL); nodeService.createAssociation(record, originalAssoc.getTargetRef(), ContentModel.ASSOC_ORIGINAL);
} }
} }
} catch (FileNotFoundException e) }
catch (FileNotFoundException e)
{ {
throw new AlfrescoRuntimeException("Can't create recorded version, because copy fails.", e); throw new AlfrescoRuntimeException("Can't create recorded version, because copy fails.", e);
} }
@@ -1274,7 +1227,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (type == null) if (type == null)
{ {
type = ContentModel.TYPE_CONTENT; type = ContentModel.TYPE_CONTENT;
} else if (!dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)) }
else if (!dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
{ {
throw new AlfrescoRuntimeException("Record can only be created from a sub-type of cm:content."); throw new AlfrescoRuntimeException("Record can only be created from a sub-type of cm:content.");
} }
@@ -1319,7 +1273,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
} }
}); });
} finally }
finally
{ {
enablePropertyEditableCheck(); enablePropertyEditableCheck();
} }
@@ -1357,7 +1312,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
return null; return null;
} }
}); });
} finally }
finally
{ {
ruleService.enableRules(); ruleService.enableRules();
enablePropertyEditableCheck(); enablePropertyEditableCheck();
@@ -1391,7 +1347,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
/** /**
* Helper method to 'file' a new document that arrived in the file plan structure. * Helper method to 'file' a new document that arrived in the file plan structure.
* <p> *
* TODO atm we only 'file' content as a record .. may need to consider other types if we * TODO atm we only 'file' content as a record .. may need to consider other types if we
* are to support the notion of composite records. * are to support the notion of composite records.
* *
@@ -1464,10 +1420,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
// get record property values // get record property values
final Map<QName, Serializable> properties = nodeService.getProperties(nodeRef); final Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
final String recordId = (String) properties.get(PROP_IDENTIFIER); final String recordId = (String)properties.get(PROP_IDENTIFIER);
final String documentOwner = (String) properties.get(PROP_RECORD_ORIGINATING_USER_ID); final String documentOwner = (String)properties.get(PROP_RECORD_ORIGINATING_USER_ID);
final String originalName = (String) properties.get(PROP_ORIGIONAL_NAME); final String originalName = (String)properties.get(PROP_ORIGIONAL_NAME);
final NodeRef originatingLocation = (NodeRef) properties.get(PROP_RECORD_ORIGINATING_LOCATION); final NodeRef originatingLocation = (NodeRef)properties.get(PROP_RECORD_ORIGINATING_LOCATION);
// we can only reject if the originating location is present // we can only reject if the originating location is present
if (originatingLocation != null) if (originatingLocation != null)
@@ -1496,7 +1452,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
fileFolderService.rename(nodeRef, originalName); fileFolderService.rename(nodeRef, originalName);
String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME); String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
LOGGER.debug("Rename {} to {}", name, originalName); LOGGER.debug("Rename {} to {}", name, originalName);
} }
@@ -1523,7 +1479,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
// send an email to the record creator // send an email to the record creator
notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner); notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner);
} }
} finally }
finally
{ {
ruleService.enableRules(); ruleService.enableRules();
} }
@@ -1624,7 +1581,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (result) if (result)
{ {
LOGGER.debug(" ... property marked as always editable."); LOGGER.debug(" ... property marked as always editable.");
} else }
else
{ {
boolean allowRecordEdit = false; boolean allowRecordEdit = false;
boolean allowNonRecordEdit = false; boolean allowNonRecordEdit = false;
@@ -1650,25 +1608,29 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
LOGGER.debug(" ... so all properties can be edited."); LOGGER.debug(" ... so all properties can be edited.");
result = true; result = true;
} else if (allowNonRecordEdit && !allowRecordEdit) }
else if (allowNonRecordEdit && !allowRecordEdit)
{ {
// can only edit non record properties // can only edit non record properties
if (!isRecordMetadata(filePlan, property)) if (!isRecordMetadata(filePlan, property))
{ {
LOGGER.debug(" ... property is not considered record metadata so editable."); LOGGER.debug(" ... property is not considered record metadata so editable.");
result = true; result = true;
} else }
else
{ {
LOGGER.debug(" ... property is considered record metadata so not editable."); LOGGER.debug(" ... property is considered record metadata so not editable.");
} }
} else if (!allowNonRecordEdit && allowRecordEdit) }
else if (!allowNonRecordEdit && allowRecordEdit)
{ {
// can only edit record properties // can only edit record properties
if (isRecordMetadata(filePlan, property)) if (isRecordMetadata(filePlan, property))
{ {
LOGGER.debug(" ... property is considered record metadata so editable."); LOGGER.debug(" ... property is considered record metadata so editable.");
result = true; result = true;
} else }
else
{ {
LOGGER.debug(" ... property is not considered record metadata so not editable."); LOGGER.debug(" ... property is not considered record metadata so not editable.");
} }
@@ -1701,7 +1663,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName())) if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName()))
{ {
result = false; result = false;
} else }
else
{ {
// check the URI's // check the URI's
result = RECORD_MODEL_URIS.contains(property.getNamespaceURI()); result = RECORD_MODEL_URIS.contains(property.getNamespaceURI());
@@ -1796,7 +1759,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (!nodeService.hasAspect(nodeRef, typeQName)) if (!nodeService.hasAspect(nodeRef, typeQName))
{ {
nodeService.addAspect(nodeRef, typeQName, null); nodeService.addAspect(nodeRef, typeQName, null);
} else }
else
{ {
LOGGER.info(I18NUtil.getMessage(MSG_NODE_HAS_ASPECT, nodeRef.toString(), typeQName.toString())); LOGGER.info(I18NUtil.getMessage(MSG_NODE_HAS_ASPECT, nodeRef.toString(), typeQName.toString()));
} }
@@ -1812,7 +1776,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
ParameterCheck.mandatory("recordFolder", recordFolder); ParameterCheck.mandatory("recordFolder", recordFolder);
// ensure we are linking a record to a record folder // ensure we are linking a record to a record folder
if (isRecord(record) && isRecordFolder(recordFolder)) if(isRecord(record) && isRecordFolder(recordFolder))
{ {
// ensure that we are not linking a record to an existing location // ensure that we are not linking a record to an existing location
List<ChildAssociationRef> parents = nodeService.getParentAssocs(record); List<ChildAssociationRef> parents = nodeService.getParentAssocs(record);
@@ -1840,7 +1804,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
// recalculate disposition schedule for the record when linking it // recalculate disposition schedule for the record when linking it
dispositionService.recalculateNextDispositionStep(record); dispositionService.recalculateNextDispositionStep(record);
} else }
else
{ {
// can only link a record to a record folder // can only link a record to a record folder
throw new RecordLinkRuntimeException("Can only link a record to a record folder."); throw new RecordLinkRuntimeException("Can only link a record to a record folder.");
@@ -1848,6 +1813,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
} }
/** /**
*
* @param record * @param record
* @param recordFolder * @param recordFolder
*/ */
@@ -1883,7 +1849,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
ParameterCheck.mandatory("recordFolder", recordFolder); ParameterCheck.mandatory("recordFolder", recordFolder);
// ensure we are unlinking a record from a record folder // ensure we are unlinking a record from a record folder
if (isRecord(record) && isRecordFolder(recordFolder)) if(isRecord(record) && isRecordFolder(recordFolder))
{ {
// check that we are not trying to unlink the primary parent // check that we are not trying to unlink the primary parent
NodeRef primaryParent = nodeService.getPrimaryParent(record).getParentRef(); NodeRef primaryParent = nodeService.getPrimaryParent(record).getParentRef();
@@ -1897,7 +1863,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
// recalculate disposition schedule for record after unlinking it // recalculate disposition schedule for record after unlinking it
dispositionService.recalculateNextDispositionStep(record); dispositionService.recalculateNextDispositionStep(record);
} else }
else
{ {
// can only unlink a record from a record folder // can only unlink a record from a record folder
throw new RecordLinkRuntimeException("Can only unlink a record from a record folder."); throw new RecordLinkRuntimeException("Can only unlink a record from a record folder.");
@@ -1991,7 +1958,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
* If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue * If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue
* and we don't need to reevaluate. * and we don't need to reevaluate.
*/ */
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE)) if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE))
{ {
incompleteNodeTagger.beforeCommit(false); incompleteNodeTagger.beforeCommit(false);
} }

71
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java
View File

@@ -76,6 +76,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
doBehaviourDrivenTest(new BehaviourDrivenTest() doBehaviourDrivenTest(new BehaviourDrivenTest()
{ {
private NodeRef filePlan = null; private NodeRef filePlan = null;
private Rule rule = null;
private List<Rule> rules = null; private List<Rule> rules = null;
public void given() public void given()
@@ -84,23 +85,23 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
// create a rule that applies to childre // create a rule that applies to childre
Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME); Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
Rule rule = new Rule(); rule = new Rule();
rule.setRuleType("inbound"); rule.setRuleType("inbound");
rule.setAction(completeRecordAction); rule.setAction(completeRecordAction);
rule.applyToChildren(true); rule.applyToChildren(true);
// save rule on file plan root parent folder
ruleService.saveRule(folder, rule);
} }
public void when() public void when()
{ {
// get rules, including those inherited // save rule on file plan root parent folder
rules = ruleService.getRules(filePlan, true); ruleService.saveRule(folder, rule);
} }
public void then() public void then()
{ {
// get rules, including those inherited
rules = ruleService.getRules(filePlan, true);
// rules aren't inhreited from file plan root parent folder // rules aren't inhreited from file plan root parent folder
assertEquals(0, rules.size()); assertEquals(0, rules.size());
} }
@@ -121,6 +122,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
{ {
private NodeRef filePlan = null; private NodeRef filePlan = null;
private List<Rule> rules = null; private List<Rule> rules = null;
private Rule rule = null;
public void given() public void given()
{ {
@@ -128,24 +130,24 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
// create a rule that applies to childre // create a rule that applies to childre
Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME); Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
Rule rule = new Rule(); rule = new Rule();
rule.setRuleType("inbound"); rule.setRuleType("inbound");
rule.setAction(completeRecordAction); rule.setAction(completeRecordAction);
rule.applyToChildren(true); rule.applyToChildren(true);
// save rule on file plan root
ruleService.saveRule(filePlan, rule);
} }
public void when() public void when()
{ {
// get rules, including those inherited // save rule on file plan root
NodeRef unfiledRecordContainer = filePlanService.getUnfiledContainer(filePlan); ruleService.saveRule(filePlan, rule);
rules = ruleService.getRules(unfiledRecordContainer, true);
} }
public void then() public void then()
{ {
// get rules, including those inherited
NodeRef unfiledRecordContainer = filePlanService.getUnfiledContainer(filePlan);
rules = ruleService.getRules(unfiledRecordContainer, true);
// rules aren't inhreited from file plan root // rules aren't inhreited from file plan root
assertEquals(0, rules.size()); assertEquals(0, rules.size());
} }
@@ -164,6 +166,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
{ {
private NodeRef filePlan = null; private NodeRef filePlan = null;
private List<Rule> rules = null; private List<Rule> rules = null;
private Rule rule = null;
public void given() public void given()
{ {
@@ -171,24 +174,24 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
// create a rule that applies to childre // create a rule that applies to childre
Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME); Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
Rule rule = new Rule(); rule = new Rule();
rule.setRuleType("inbound"); rule.setRuleType("inbound");
rule.setAction(completeRecordAction); rule.setAction(completeRecordAction);
rule.applyToChildren(true); rule.applyToChildren(true);
// save rule on file plan root
ruleService.saveRule(filePlan, rule);
} }
public void when() public void when()
{ {
// get rules, including those inherited // save rule on file plan root
NodeRef container = filePlanService.getHoldContainer(filePlan); ruleService.saveRule(filePlan, rule);
rules = ruleService.getRules(container, true);
} }
public void then() public void then()
{ {
// get rules, including those inherited
NodeRef container = filePlanService.getHoldContainer(filePlan);
rules = ruleService.getRules(container, true);
// rules aren't inhreited from file plan root // rules aren't inhreited from file plan root
assertEquals(0, rules.size()); assertEquals(0, rules.size());
} }
@@ -207,6 +210,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
{ {
private NodeRef filePlan = null; private NodeRef filePlan = null;
private List<Rule> rules = null; private List<Rule> rules = null;
private Rule rule = null;
public void given() public void given()
{ {
@@ -214,24 +218,24 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
// create a rule that applies to childre // create a rule that applies to childre
Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME); Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
Rule rule = new Rule(); rule = new Rule();
rule.setRuleType("inbound"); rule.setRuleType("inbound");
rule.setAction(completeRecordAction); rule.setAction(completeRecordAction);
rule.applyToChildren(true); rule.applyToChildren(true);
// save rule on file plan root
ruleService.saveRule(filePlan, rule);
} }
public void when() public void when()
{ {
// get rules, including those inherited // save rule on file plan root
NodeRef container = filePlanService.getTransferContainer(filePlan); ruleService.saveRule(filePlan, rule);
rules = ruleService.getRules(container, true);
} }
public void then() public void then()
{ {
// get rules, including those inherited
NodeRef container = filePlanService.getTransferContainer(filePlan);
rules = ruleService.getRules(container, true);
// rules aren't inhreited from file plan root // rules aren't inhreited from file plan root
assertEquals(0, rules.size()); assertEquals(0, rules.size());
} }
@@ -251,6 +255,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
private NodeRef filePlan = null; private NodeRef filePlan = null;
private NodeRef recordCategory = null; private NodeRef recordCategory = null;
private List<Rule> rules = null; private List<Rule> rules = null;
private Rule rule = null;
public void given() public void given()
{ {
@@ -259,23 +264,23 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
// create a rule that applies to childre // create a rule that applies to childre
Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME); Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
Rule rule = new Rule(); rule = new Rule();
rule.setRuleType("inbound"); rule.setRuleType("inbound");
rule.setAction(completeRecordAction); rule.setAction(completeRecordAction);
rule.applyToChildren(true); rule.applyToChildren(true);
// save rule on file plan root
ruleService.saveRule(filePlan, rule);
} }
public void when() public void when()
{ {
// get rules, including those inherited // save rule on file plan root
rules = ruleService.getRules(recordCategory, true); ruleService.saveRule(filePlan, rule);
} }
public void then() public void then()
{ {
// get rules, including those inherited
rules = ruleService.getRules(recordCategory, true);
// rules aren't inhreited from file plan root // rules aren't inhreited from file plan root
assertEquals(1, rules.size()); assertEquals(1, rules.size());
} }