From c3f6e0310ae5b9b779476a2bdaf96f5c1e535ff0 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Thu, 2 Jun 2016 22:06:11 +0000
Subject: [PATCH] reverted r126691.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rest/api/PublicApiDeclarativeRegistry.java | 18 ------------------
 .../rest/api/impl/QuickShareLinksImpl.java     | 11 ++---------
 .../QuickShareLinkRenditionsRelation.java      |  2 --
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java b/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
index a9f3b9188f..b0828cbb7c 100644
--- a/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
+++ b/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
@@ -118,8 +118,6 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
                     Class<? extends ResourceAction> resAction = null;
 
                     String entityId = templateVars.get(ResourceLocator.ENTITY_ID);
-                    String relationshipId = templateVars.get(ResourceLocator.RELATIONSHIP_ID);
-
                     switch (rwm.getMetaData().getType())
                     {
                         case ENTITY:
@@ -151,22 +149,6 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
                                 }
                             }
                             break;
-                        case RELATIONSHIP:
-                            if (StringUtils.isNotBlank(relationshipId))
-                            {
-                                if (RelationshipResourceAction.ReadById.class.isAssignableFrom(rwm.getResource().getClass()))
-                                {
-                                    resAction = RelationshipResourceAction.ReadById.class;
-                                }
-                            }
-                            else
-                            {
-                                if (RelationshipResourceAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
-                                {
-                                    resAction = RelationshipResourceAction.Read.class;
-                                }
-                            }
-                            break;
                         default:
                             break;
                     }
diff --git a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
index e4586ebf80..a941029bde 100644
--- a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
@@ -44,14 +44,11 @@ import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
-import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
-import org.alfresco.rest.framework.resource.content.BasicContentInfo;
 import org.alfresco.rest.framework.resource.content.BinaryResource;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.resource.parameters.Params;
-import org.alfresco.rest.framework.resource.parameters.SortColumn;
 import org.alfresco.rest.framework.resource.parameters.where.Query;
 import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
 import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
@@ -84,10 +81,8 @@ import org.alfresco.util.SearchLanguageConversion;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.extensions.surf.util.I18NUtil;
-import org.springframework.extensions.webscripts.WebScriptRequest;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -235,15 +230,13 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
                         throw new InvalidNodeRefException(nodeRef);
                     }
 
-                    String nodeId = nodeRef.getId();
-
                     if (renditionId != null)
                     {
-                        return renditions.getContent(nodeId, renditionId, parameters);
+                        return renditions.getContent(nodeRef, renditionId, parameters);
                     }
                     else
                     {
-                        return nodes.getContent(nodeId, parameters, false);
+                        return nodes.getContent(nodeRef, parameters, false);
                     }
                 }
             }, networkTenantDomain);
diff --git a/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java b/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
index 9a56488ffb..1d4e34d316 100644
--- a/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
+++ b/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
@@ -19,9 +19,7 @@
 package org.alfresco.rest.api.quicksharelinks;
 
 import org.alfresco.rest.api.QuickShareLinks;
-import org.alfresco.rest.api.Renditions;
 import org.alfresco.rest.api.model.Rendition;
-import org.alfresco.rest.api.nodes.NodesEntityResource;
 import org.alfresco.rest.framework.BinaryProperties;
 import org.alfresco.rest.framework.WebApiDescription;
 import org.alfresco.rest.framework.WebApiNoAuth;