From c2c2cb2fbcf1cc243017476230b840200a3773eb Mon Sep 17 00:00:00 2001
From: Silviu Dinuta <silviu.dinuta@savatech.ro>
Date: Wed, 2 Nov 2016 17:07:21 +0200
Subject: [PATCH] RM-4289: added deleteRMSite method instead of overriding
 deleteSite

---
 .../source/java/org/alfresco/rm/rest/api/RMSites.java     | 8 ++++++++
 .../java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java   | 5 ++---
 .../alfresco/rm/rest/api/sites/RMSiteEntityResource.java  | 2 +-
 .../rm/rest/api/sites/RMSiteEntityResourceUnitTest.java   | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMSites.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMSites.java
index 40339b1ffb..584d186fb5 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMSites.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMSites.java
@@ -66,6 +66,14 @@ public interface RMSites extends Sites
      */
     RMSite updateRMSite(String siteId, SiteUpdate site, Parameters parameters);
 
+    /**
+     * Deletes RM site
+     *
+     * @param siteId
+     * @param parameters
+     */
+    void deleteRMSite(String siteId, Parameters parameters);
+
     /**
      * TODO Copied from Sites interface because was not available in 5.2.a-EA. To be removed after upgrading.
      *
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
index 66523b44da..6df0b20e2d 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
@@ -330,10 +330,9 @@ public class RMSitesImpl extends SitesImpl implements RMSites
         return new RMSite(site, compliance);
     }
 
-    @Override
-    public void deleteSite(String siteId, Parameters parameters)
+    public void deleteRMSite(String siteId, Parameters parameters)
     {
         siteService.hasSite(RM_SITE_ID);
-        super.deleteSite(siteId, parameters);
+        deleteSite(siteId, parameters);
     }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java
index 9cff802084..eb11498de8 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java
@@ -79,7 +79,7 @@ public class RMSiteEntityResource implements EntityResourceAction.Delete, Entity
         {
             throw new InvalidArgumentException("DELETE does not support parameter: permanent");
         }
-        sites.deleteSite(siteId, parameters);
+        sites.deleteRMSite(siteId, parameters);
     }
 
     @Override
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java
index f834774701..76585f243d 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java
@@ -116,7 +116,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest
         Params parameters = mock(Params.class);
         when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn(null);
         rmSiteEntityResource.delete(siteId, parameters);
-        verify(mockedRMSites, times(1)).deleteSite(siteId, parameters);
+        verify(mockedRMSites, times(1)).deleteRMSite(siteId, parameters);
     }
 
     @Test
@@ -134,7 +134,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest
         {
             assertEquals("The Deletion is supported only for siteId = rm.", ex.getMessage());
         }
-        verify(mockedRMSites, never()).deleteSite(siteId, parameters);
+        verify(mockedRMSites, never()).deleteRMSite(siteId, parameters);
     }
 
     @Test