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

RM-1641 (Create Relationship Service)

Browse Source 
* Refactored existing customReference classes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@85578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-09-24 08:17:53 +00:00
parent c793f96f00
commit 387abf1282
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java
View File

@@ -126,10 +126,10 @@ public class CustomRefsGet extends AbstractRmWebScript
List<Map<String, String>> outwardReferenceData = new ArrayList<Map<String, String>>(); List<Map<String, String>> outwardReferenceData = new ArrayList<Map<String, String>>();
List<AssociationRef> assocsFromThisNode = rmAdminService.getCustomReferencesFrom(nodeRef); List<AssociationRef> assocsFromThisNode = rmAdminService.getCustomReferencesFrom(nodeRef);
addBidirectionalReferenceData(outwardReferenceData, assocsFromThisNode); outwardReferenceData.addAll(getBidirectionalReferenceData(assocsFromThisNode));
List<ChildAssociationRef> childAssocs = rmAdminService.getCustomChildReferences(nodeRef); List<ChildAssociationRef> childAssocs = rmAdminService.getCustomChildReferences(nodeRef);
addParentChildReferenceData(outwardReferenceData, childAssocs); outwardReferenceData.addAll(getParentChildReferenceData(childAssocs));
return outwardReferenceData; return outwardReferenceData;
} }
@@ -144,11 +144,11 @@ public class CustomRefsGet extends AbstractRmWebScript
{ {
List<Map<String, String>> inwardReferenceData = new ArrayList<Map<String, String>>(); List<Map<String, String>> inwardReferenceData = new ArrayList<Map<String, String>>();
List<AssociationRef> toAssocs = rmAdminService.getCustomReferencesTo(nodeRef); List<AssociationRef> assocsToThisNode = rmAdminService.getCustomReferencesTo(nodeRef);
addBidirectionalReferenceData(inwardReferenceData, toAssocs); inwardReferenceData.addAll(getBidirectionalReferenceData(assocsToThisNode));
List<ChildAssociationRef> parentAssocs = rmAdminService.getCustomParentReferences(nodeRef); List<ChildAssociationRef> parentAssocs = rmAdminService.getCustomParentReferences(nodeRef);
addParentChildReferenceData(inwardReferenceData, parentAssocs); inwardReferenceData.addAll(getParentChildReferenceData(parentAssocs));
return inwardReferenceData; return inwardReferenceData;
} }
@@ -158,20 +158,21 @@ public class CustomRefsGet extends AbstractRmWebScript
* for each assRef. FTL-relevant data are added to that map. The associationRefs must all be * for each assRef. FTL-relevant data are added to that map. The associationRefs must all be
* parent/child references. * parent/child references.
* *
* @param referenceData Reference data
* @param childAssocs Association references * @param childAssocs Association references
* @return The reference data
*/ */
private void addParentChildReferenceData(List<Map<String, String>> referenceData, List<ChildAssociationRef> childAssocs) private List<Map<String, String>> getParentChildReferenceData(List<ChildAssociationRef> childAssocs)
{ {
List<Map<String, String>> referenceData = new ArrayList<Map<String, String>>();
for (ChildAssociationRef childAssRef : childAssocs) for (ChildAssociationRef childAssRef : childAssocs)
{ {
Map<String, String> data = new HashMap<String, String>(); Map<String, String> data = new HashMap<String, String>();
QName typeQName = childAssRef.getTypeQName();
data.put(CHILD_REF, childAssRef.getChildRef().toString()); data.put(CHILD_REF, childAssRef.getChildRef().toString());
data.put(PARENT_REF, childAssRef.getParentRef().toString()); data.put(PARENT_REF, childAssRef.getParentRef().toString());
QName typeQName = childAssRef.getTypeQName();
AssociationDefinition assDef = rmAdminService.getCustomReferenceDefinitions().get(typeQName); AssociationDefinition assDef = rmAdminService.getCustomReferenceDefinitions().get(typeQName);
if (assDef != null && if (assDef != null &&
@@ -180,16 +181,17 @@ public class CustomRefsGet extends AbstractRmWebScript
{ {
String compoundTitle = assDef.getTitle(dictionaryService); String compoundTitle = assDef.getTitle(dictionaryService);
data.put(REF_ID, typeQName.getLocalName());
String[] sourceAndTarget = rmAdminService.splitSourceTargetId(compoundTitle); String[] sourceAndTarget = rmAdminService.splitSourceTargetId(compoundTitle);
data.put(SOURCE, sourceAndTarget[0]); data.put(SOURCE, sourceAndTarget[0]);
data.put(TARGET, sourceAndTarget[1]); data.put(TARGET, sourceAndTarget[1]);
data.put(REFERENCE_TYPE, CustomReferenceType.PARENT_CHILD.toString()); data.put(REFERENCE_TYPE, CustomReferenceType.PARENT_CHILD.toString());
data.put(REF_ID, typeQName.getLocalName());
referenceData.add(data); referenceData.add(data);
} }
} }
return referenceData;
} }
/** /**
@@ -197,11 +199,13 @@ public class CustomRefsGet extends AbstractRmWebScript
* for each assRef. FTL-relevant data are added to that map. The associationRefs must all be * for each assRef. FTL-relevant data are added to that map. The associationRefs must all be
* bidirectional references. * bidirectional references.
* *
* @param referenceData Reference data
* @param assocs Association references * @param assocs Association references
* @return The reference data
*/ */
private void addBidirectionalReferenceData(List<Map<String, String>> referenceData, List<AssociationRef> assocs) private List<Map<String, String>> getBidirectionalReferenceData(List<AssociationRef> assocs)
{ {
List<Map<String, String>> referenceData = new ArrayList<Map<String, String>>();
for (AssociationRef assRef : assocs) for (AssociationRef assRef : assocs)
{ {
Map<String, String> data = new HashMap<String, String>(); Map<String, String> data = new HashMap<String, String>();
@@ -222,6 +226,8 @@ public class CustomRefsGet extends AbstractRmWebScript
referenceData.add(data); referenceData.add(data);
} }
} }
return referenceData;
} }
/** /**