From 4a18a13f7b81a6babaf43cb484e89d032771446c Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 15:19:40 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    127619 jkaabimofrad:
 Missed changes during resolving conflicts.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/rest/api/Nodes.java  |  1 +
 .../api/PublicApiDeclarativeRegistry.java     | 19 +++++++++++++++++++
 .../org/alfresco/rest/api/Renditions.java     |  1 +
 .../org/alfresco/rest/api/impl/NodesImpl.java |  3 ++-
 .../rest/api/impl/RenditionsImpl.java         |  1 +
 .../QuickShareLinkRenditionsRelation.java     |  1 +
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/rest/api/Nodes.java b/source/java/org/alfresco/rest/api/Nodes.java
index 990e9edf9c..1ada730bcc 100644
--- a/source/java/org/alfresco/rest/api/Nodes.java
+++ b/source/java/org/alfresco/rest/api/Nodes.java
@@ -289,3 +289,4 @@ public interface Nodes
     String PARAM_ISPRIMARY = "isPrimary";
     String PARAM_ASSOC_TYPE = "assocType";
 }
+
diff --git a/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java b/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
index ba208d4710..ecabb4bec7 100644
--- a/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
+++ b/source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
@@ -124,6 +124,8 @@ 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:
@@ -155,6 +157,22 @@ 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;
                     }
@@ -440,3 +458,4 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
     	initWebScript(getNetworkWebScript, "network");
     }
 }
+
diff --git a/source/java/org/alfresco/rest/api/Renditions.java b/source/java/org/alfresco/rest/api/Renditions.java
index 30c300ecf4..bd3bded41a 100644
--- a/source/java/org/alfresco/rest/api/Renditions.java
+++ b/source/java/org/alfresco/rest/api/Renditions.java
@@ -90,3 +90,4 @@ public interface Renditions
      */
     BinaryResource getContent(NodeRef sourceNodeRef, String renditionId, Parameters parameters);
 }
+
diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index 081dbb1dc2..a001639eb0 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -2485,7 +2485,7 @@ public class NodesImpl implements Nodes
             }
 
             // Create a new file.
-            Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
+            final Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
 
             // RA-1052
             try
@@ -2852,3 +2852,4 @@ public class NodesImpl implements Nodes
         }
     }
 }
+
diff --git a/source/java/org/alfresco/rest/api/impl/RenditionsImpl.java b/source/java/org/alfresco/rest/api/impl/RenditionsImpl.java
index a80f4776d8..165f42ee3d 100644
--- a/source/java/org/alfresco/rest/api/impl/RenditionsImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/RenditionsImpl.java
@@ -472,3 +472,4 @@ public class RenditionsImpl implements Renditions, ResourceLoaderAware
         return contentData.getMimetype();
     }
 }
+
diff --git a/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java b/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
index 425033dfe3..6914e787f6 100644
--- a/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
+++ b/source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
@@ -80,3 +80,4 @@ public class QuickShareLinkRenditionsRelation implements
         return quickShareLinks.getRenditions(sharedId);
     }
 }
+