From f6f20a31f9e63eacd7f4db202a26b5c7ce23f356 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Fri, 23 Jun 2017 11:37:21 +0000 Subject: [PATCH] Merged MNT-17845-5.2.N (5.2.2) to 5.2.N (5.2.2) 137773 anechifor: REPO-2516 - MNT-17845 : Smart Folders - replece isReference with fromNodeRef git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...irtualCheckOutCheckInServiceExtension.java | 20 ++-- ...ualLockableAspectInterceptorExtension.java | 6 +- .../bundle/VirtualNodeServiceExtension.java | 91 ++++++++++--------- .../VirtualPreferenceServiceExtension.java | 5 +- .../bundle/VirtualSpringBeanExtension.java | 2 +- 5 files changed, 64 insertions(+), 60 deletions(-) diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java index 4640b1c866..b91869d1b9 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java @@ -67,10 +67,10 @@ public class VirtualCheckOutCheckInServiceExtension extends materialDestination, destinationAssocTypeQName, destinationAssocQName); - - if (Reference.isReference(destinationParentNodeRef)) + + Reference parentReference = Reference.fromNodeRef(destinationParentNodeRef); + if (parentReference != null) { - Reference parentReference = Reference.fromNodeRef(destinationParentNodeRef); Reference workingCopyReference = NodeProtocol.newReference(workingCopy, parentReference); return workingCopyReference.toNodeRef(workingCopy.getStoreRef()); @@ -121,10 +121,10 @@ public class VirtualCheckOutCheckInServiceExtension extends } private NodeRef virtualizeOriginalIfNeeded(NodeRef workingCopyNodeRef, NodeRef materialOriginalNode) - { - if (materialOriginalNode != null && Reference.isReference(workingCopyNodeRef)) + { + Reference workingCopyReference = Reference.fromNodeRef(workingCopyNodeRef); + if ((materialOriginalNode != null) && (workingCopyReference != null)) { - Reference workingCopyReference = Reference.fromNodeRef(workingCopyNodeRef); Reference parentReference = workingCopyReference.execute(new GetParentReferenceMethod()); Reference originalReference = NodeProtocol.newReference(materialOriginalNode, parentReference); @@ -168,11 +168,11 @@ public class VirtualCheckOutCheckInServiceExtension extends } private NodeRef virtualizeVersionIfNeeded(NodeRef originalNodeRef, NodeRef materialVersion) - { - if (materialVersion != null && Reference.isReference(originalNodeRef) - && !Reference.isReference(materialVersion)) + { + Reference reference = Reference.fromNodeRef(originalNodeRef); + if ((materialVersion != null) && (reference != null) + && (Reference.fromNodeRef(materialVersion)==null)) { - Reference reference = Reference.fromNodeRef(originalNodeRef); Reference parentReference = reference.execute(new GetParentReferenceMethod()); Reference workingCopyReference = NodeProtocol.newReference(materialVersion, parentReference); diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java index b119c57681..71d628997d 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java @@ -54,9 +54,9 @@ public class VirtualLockableAspectInterceptorExtension extends @Override public LockState getLockState(NodeRef nodeRef) - { - if(Reference.isReference(nodeRef)){ - Reference reference = Reference.fromNodeRef(nodeRef); + { + Reference reference = Reference.fromNodeRef(nodeRef); + if(reference != null){ NodeRef actualNodeRef = reference.execute(new GetActualNodeRefMethod(environment)); return getTrait().traitImplOf_getLockState(actualNodeRef); } diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java index 6e5f6b5e9e..9d10064f02 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java @@ -40,7 +40,6 @@ import java.util.Set; import org.alfresco.model.ContentModel; import org.alfresco.repo.download.DownloadModel; -import org.alfresco.repo.node.archive.NodeArchiveService; import org.alfresco.repo.node.db.traitextender.NodeServiceExtension; import org.alfresco.repo.node.db.traitextender.NodeServiceTrait; import org.alfresco.repo.virtual.ActualEnvironment; @@ -106,9 +105,10 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension getProperties(NodeRef nodeRef) { - if (Reference.isReference(nodeRef)) + Reference reference = Reference.fromNodeRef(nodeRef); + if (reference != null) { - return getVirtualProperties(Reference.fromNodeRef(nodeRef)); + return getVirtualProperties(reference); } else @@ -168,9 +169,10 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension getAspects(NodeRef nodeRef) { NodeServiceTrait theTrait = getTrait(); - if (Reference.isReference(nodeRef)) + Reference vRef = Reference.fromNodeRef(nodeRef); + if (vRef != null) { - Reference vRef = Reference.fromNodeRef(nodeRef); GetAspectsMethod method = new GetAspectsMethod(theTrait, environment); @@ -200,9 +202,10 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension getPaths(NodeRef nodeRef, boolean primaryOnly) { - if (Reference.isReference(nodeRef)) + Reference reference = Reference.fromNodeRef(nodeRef); + if (reference != null) { - Reference reference = Reference.fromNodeRef(nodeRef); NodeRef actualNodeRef = reference.execute(new GetActualNodeRefMethod(environment)); return getTrait().getPaths(actualNodeRef, primaryOnly); @@ -231,7 +234,8 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension properties) { NodeServiceTrait theTrait = getTrait(); - if (Reference.isReference(parentRef) && !isVirtualContextFolder(parentRef, + if ((Reference.fromNodeRef(parentRef) != null) && !isVirtualContextFolder(parentRef, environment)) { // CM-533 Suppress options to create folders in a virtual folder @@ -378,7 +383,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension getParentAssocs(NodeRef nodeRef) { - if (Reference.isReference(nodeRef)) + if (Reference.fromNodeRef(nodeRef)!= null) { return getParentAssocs(nodeRef, RegexQNamePattern.MATCH_ALL, @@ -502,9 +507,9 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension targetAssocs = null; - if (Reference.isReference(sourceRef)) + Reference reference = Reference.fromNodeRef(sourceRef); + if (reference != null) { - Reference reference = Reference.fromNodeRef(sourceRef); if (smartStore.canMaterialize(reference)) { NodeRef materializedReferece = smartStore.materialize(reference); @@ -1000,12 +1005,11 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualizedIfNeededTargetAssocs = null; - if (Reference.isReference(sourceRef)) + Reference sourceReference = Reference.fromNodeRef(sourceRef); + if (sourceReference != null) { virtualizedIfNeededTargetAssocs = new LinkedList<>(); - Reference sourceReference = Reference.fromNodeRef(sourceRef); - for (AssociationRef associationRef : targetAssocs) { NodeRef targetNodeRef = associationRef.getTargetRef(); @@ -1042,10 +1046,10 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension getSourceAssocs(NodeRef targetRef, QNamePattern qnamePattern) { NodeServiceTrait theTrait = getTrait(); + Reference reference = Reference.fromNodeRef(targetRef); - if (Reference.isReference(targetRef)) + if (reference != null) { - Reference reference = Reference.fromNodeRef(targetRef); List materialAssocs = new ArrayList(); @@ -1085,7 +1089,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension properties) { - if (Reference.isReference(nodeRef)) + Reference reference = Reference.fromNodeRef(nodeRef); + if (reference != null) { - Reference reference = Reference.fromNodeRef(nodeRef); NodeRef actualNodeRef = reference.execute(new GetActualNodeRefMethod(null)); getTrait().addProperties(actualNodeRef, @@ -1119,7 +1123,8 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension assocsToRemove = revertVirtualAssociation(childAssocRef, theTrait, @@ -1346,7 +1351,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension assocsToRemove = revertVirtualAssociation(childAssocRef, theTrait, @@ -1373,7 +1378,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension assocsToRemove = revertVirtualAssociation(childAssocRef, theTrait, diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java index 4c4480f8f2..b65f13dc08 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java @@ -160,10 +160,9 @@ public class VirtualPreferenceServiceExtension extends if (documentNodeRefStr != null && !documentNodeRefStr.isEmpty()) { NodeRef documentNodeRef = new NodeRef(documentNodeRefStr); - - if (Reference.isReference(documentNodeRef)) + Reference reference = Reference.fromNodeRef(documentNodeRef); + if (reference != null) { - Reference reference = Reference.fromNodeRef(documentNodeRef); NodeRef actualNodeRef = reference.execute(new GetActualNodeRefMethod(null)); String actualNodeRefStr = actualNodeRef.toString(); String actualExtPreference = extFavKey + actualNodeRefStr + CREATED_AT; diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java index 937da33a71..0bb47840ae 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java @@ -42,7 +42,7 @@ public abstract class VirtualSpringBeanExtension extends Spr public boolean isVirtualContextFolder(NodeRef nodeRef, ActualEnvironment environment) { - boolean isReference=Reference.isReference(nodeRef); + boolean isReference=(Reference.fromNodeRef(nodeRef)!=null); boolean isFolder=environment.isSubClass(environment.getType(nodeRef), ContentModel.TYPE_FOLDER); boolean virtualContext=environment.hasAspect(nodeRef,VirtualContentModel.ASPECT_VIRTUAL_DOCUMENT);