From 976748ee0fe01116d3dec2dff0d8c5e4352d0351 Mon Sep 17 00:00:00 2001
From: Sara Aspery <sara.aspery@alfresco.com>
Date: Thu, 28 Nov 2019 17:07:20 +0000
Subject: [PATCH] RM-7068 updates from review

---
 .../org_alfresco_module_rm/hold/HoldServiceImpl.java     | 9 +--------
 .../hold/HoldServiceImplUnitTest.java                    | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
index b684d55ae3..7187d9b894 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
@@ -552,14 +552,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
      */
     private void checkPermissionsForDeleteHold(NodeRef hold)
     {
-        List<NodeRef> held = AuthenticationUtil.runAsSystem(new RunAsWork<List<NodeRef>>()
-        {
-            @Override
-            public List<NodeRef> doWork()
-            {
-                return getHeld(hold);
-            }
-        });
+        List<NodeRef> held = AuthenticationUtil.runAsSystem(() -> getHeld(hold));
 
         List<String> heldNames = new ArrayList<>();
         for (NodeRef nodeRef : held)
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
index bdfdd33c95..3ec15d149d 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
@@ -320,7 +320,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
         // TODO check interactions with policy component!!!
     }
 
-    @Test (expected = AlfrescoRuntimeException.class)
+    @Test (expected = AccessDeniedException.class)
     public void deleteHoldNoPermissionsOnContent()
     {
         mockPoliciesForDeleteHold();