inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-4289: added deleteRMSite method instead of overriding deleteSite

Browse Source
This commit is contained in:
Silviu Dinuta
2016-11-02 17:07:21 +02:00
parent 78ff5bba59
commit c2c2cb2fbc
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMSites.java
View File

@@ -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.
*

5
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
View File

@@ -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);
}
}

2
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java
View File

@@ -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

4
rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java
View File

@@ -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