From ae7e3fe39ea0e9de44e9265e148ac6c516ffab12 Mon Sep 17 00:00:00 2001
From: kristian <kristian.dimitrov@alfresco.com>
Date: Thu, 5 Mar 2020 11:07:15 +0000
Subject: [PATCH] Revert "MNT-18497: Implement linkedNodeToJson logic"

This reverts commit 2835d684
---
 .travis.yml                                   |  1 -
 .../jscript/app/JSONConversionComponent.java  | 35 ++-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7d93d81d7..270e321664 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ branches:
   only:
     - master
     - /support\/.*/
-    - fix/MNT-18497_Rendering-folder-with-links-is-slow-in-share
 
 stages:
   - test
diff --git a/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java b/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
index 12a618fa5c..a768b2d5be 100644
--- a/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
+++ b/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
@@ -234,38 +234,7 @@ public class JSONConversionComponent
         
         return json;
     }
-
-    /**
-     * MNT-18497
-     * Convert a linkedNode reference to a JSON object.  Selects the correct converter based on selection
-     * implementation. Skips adding properties and aspects of targetNodeRef
-     */
-    @SuppressWarnings("unchecked")
-    public JSONObject linkedNodeToJSONObject(final NodeRef nodeRef, final boolean useShortQNames)
-    {
-        final JSONObject json = new JSONObject();
-
-        if (this.nodeService.exists(nodeRef))
-        {
-            if (publicServiceAccessService.hasAccess(ServiceRegistry.NODE_SERVICE.getLocalName(), "getProperties", nodeRef) == AccessStatus.ALLOWED)
-            {
-                // init namespace prefix cache
-                namespacePrefixCache.get().clear();
-
-                // Get node info
-                FileInfo nodeInfo = this.fileFolderService.getFileInfo(nodeRef);
-
-                // Set root values
-                setRootValues(nodeInfo, json, useShortQNames);
-
-                // add permissions
-                json.put("permissions", permissionsToJSON(nodeRef));
-            }
-        }
-
-        return json;
-    }
-
+    
     /**
      * 
      * @param nodeInfo FileInfo
@@ -288,7 +257,7 @@ public class JSONConversionComponent
             NodeRef targetNodeRef = nodeInfo.getLinkNodeRef();
             if (targetNodeRef != null)
             {
-                rootJSONObject.put("linkedNode", linkedNodeToJSONObject(targetNodeRef, useShortQNames));
+                rootJSONObject.put("linkedNode", toJSONObject(targetNodeRef, useShortQNames));
             }
         }