From 77691ec5fd2f39754a86e920edd2e9d743a0955a Mon Sep 17 00:00:00 2001
From: Sara <sara.aspery@alfresco.com>
Date: Wed, 25 Aug 2021 20:14:16 +0100
Subject: [PATCH] ACS-1913 Fix endpoint operation labels (#682)

* ACS-1913 Fix endpoint operation labels

* ACS-1913 Update tests

* ACS-1913 Update tests
---
 .../alfresco/rest/api/nodes/NodeRenditionsRelation.java  | 2 +-
 .../rest/api/nodes/NodeVersionRenditionsRelation.java    | 2 +-
 .../alfresco/rest/api/nodes/NodeVersionsRelation.java    | 2 +-
 .../org/alfresco/rest/api/nodes/NodesEntityResource.java | 2 +-
 .../rest/api/trashcan/TrashcanEntityResource.java        | 2 +-
 .../org/alfresco/rest/api/tests/AbstractBaseApiTest.java | 4 ++--
 .../java/org/alfresco/rest/api/tests/NodeApiTest.java    | 9 ++++-----
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java
index f2faf3ef4a..9a6e48fd50 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java
@@ -119,7 +119,7 @@ public class NodeRenditionsRelation implements RelationshipResourceAction.Read<R
         return renditions.getContent(nodeRef, renditionId, parameters);
     }
 
-    @Operation ("requestRenditionDirectAccessUrl")
+    @Operation("request-direct-access-url")
     @WebApiParam (name = "requestRenditionDirectAccessUrl", title = "Request direct access url", description = "Request direct access url", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
     @WebApiDescription(title = "Request content url",
             description="Generates a direct access URL.",
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java
index c777d56ef5..f5cb41857e 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java
@@ -132,7 +132,7 @@ public class NodeVersionRenditionsRelation implements RelationshipResourceAction
         return renditions.getContent(nodeRef, versionId, renditionId, parameters);
     }
 
-    @Operation ("requestVersionRenditionDirectAccessUrl")
+    @Operation ("request-direct-access-url")
     @WebApiParam (name = "requestVersionRenditionDirectAccessUrl", title = "Request direct access url", description = "Request direct access url", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
     @WebApiDescription(title = "Request content url",
             description="Generates a direct access URL.",
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
index 25af1cb0f2..b75b19e0a0 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
@@ -302,7 +302,7 @@ public class NodeVersionsRelation extends AbstractNodeRelation implements
         return null;
     }
 
-    @Operation("requestVersionDirectAccessUrl")
+    @Operation("request-direct-access-url")
     @WebApiParam (name = "requestVersionDirectAccessUrl", title = "Request direct access url", description = "Request direct access url", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
     @WebApiDescription(title = "Request content url",
             description="Generates a direct access URL.",
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
index c7cf7bca95..0f3c82aa23 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
@@ -202,7 +202,7 @@ public class NodesEntityResource implements
         return nodes.unlock(nodeId, parameters);
     }
 
-    @Operation("requestNodeDirectAccessUrl")
+    @Operation("request-direct-access-url")
     @WebApiParam(name = "requestNodeDirectAccessUrl", title = "Request direct access url", description = "Request direct access url", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
     @WebApiDescription(title = "Request content url",
             description="Generates a direct access URL.",
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
index 60abf8da32..a1b88ce1aa 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
@@ -100,7 +100,7 @@ public class TrashcanEntityResource implements
         return deletedNodes.getContent(nodeId, null, parameters);
     }
 
-    @Operation("requestDeletedNodeDirectAccessUrl")
+    @Operation("request-direct-access-url")
     @WebApiParam(name = "requestDeletedNodeDirectAccessUrl", title = "Request direct access url", description = "Request direct access url", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
     @WebApiDescription(title = "Request content url",
             description="Generates a direct access URL.",
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
index 5ca4b778a2..0090c4de2d 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
@@ -138,7 +138,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
 
     protected final String RUNID = System.currentTimeMillis()+"";
 
-    private static final String REQUEST_NODE_DIRECT_ACCESS_URL = "requestNodeDirectAccessUrl";
+    private static final String REQUEST_DIRECT_ACCESS_URL = "request-direct-access-url";
     
     @Override
     @Before
@@ -216,7 +216,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
 
     protected String getRequestContentDirectUrl(String nodeId)
     {
-        return URL_NODES + "/" + nodeId + "/" + REQUEST_NODE_DIRECT_ACCESS_URL;
+        return URL_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL;
     }
 
     /**
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
index 33c583bb8f..434caff1de 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -6277,8 +6277,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         assertNotNull(contentInfo);
         assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
 
-
-        getSingle(getRequestContentDirectUrl(contentNodeId), null, null, null, 405);
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
     }
 
     @Test
@@ -6322,7 +6321,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         assertNotNull(contentInfo);
         assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
 
-        getSingle(getRequestContentDirectUrl(contentNodeId), null, null, null, 405);
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
     }
 
     @Test
@@ -6367,7 +6366,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         assertNotNull(rendition);
         assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
 
-        getSingle(getRequestContentDirectUrl(contentNodeId), null, null, null, 405);
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
     }
 
 
@@ -6473,7 +6472,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         Document document2b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
 
         String contentNodeId2b = document2b.getId();
-        getSingle(getRequestContentDirectUrl(contentNodeId2b), null, null, null, 405);
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId2b), null, null, null, null, 501);
 
     }
 }