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

Merge branch 'feature/RM-4289_Status404ForGETandDELETErmSite' into 'master'

Browse Source 
Feature/rm 4289 status404 for ge tand delet erm site

See merge request !593
This commit is contained in:
Silviu Dinuta
2016-11-03 09:15:29 +00:00
parent 5031d000b0 1919536cd7
commit 4123ca264b
4 changed files with 29 additions and 3 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); 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. * TODO Copied from Sites interface because was not available in 5.2.a-EA. To be removed after upgrading.
* *

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

@@ -327,4 +327,22 @@ public class RMSitesImpl extends SitesImpl implements RMSites
RMSiteCompliance compliance = getCompliance(siteInfo); RMSiteCompliance compliance = getCompliance(siteInfo);
return new RMSite(site, compliance); return new RMSite(site, compliance);
} }
@Override
public void deleteRMSite(String siteId, Parameters parameters)
{
deleteSite(siteId, parameters);
solveRMSiteNodeRefCaching();
}
/**
* Method used for solving rm site nodeRef caching problem that affected rm site update and get from rest api, after site deletion from rest api.
* See RM-4289 issue for details.
*
*/
private void solveRMSiteNodeRefCaching()
{
//since we do not have access to SiteServiceImpl.getSiteNodeRef(String shortName, boolean enforcePermissions) method we can use hasSite method to solve caching problem
siteService.hasSite(RM_SITE_ID);
}
} }

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"); throw new InvalidArgumentException("DELETE does not support parameter: permanent");
} }
sites.deleteSite(siteId, parameters); sites.deleteRMSite(siteId, parameters);
} }
@Override @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); Params parameters = mock(Params.class);
when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn(null); when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn(null);
rmSiteEntityResource.delete(siteId, parameters); rmSiteEntityResource.delete(siteId, parameters);
verify(mockedRMSites, times(1)).deleteSite(siteId, parameters); verify(mockedRMSites, times(1)).deleteRMSite(siteId, parameters);
} }
@Test @Test
@@ -134,7 +134,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest
{ {
assertEquals("The Deletion is supported only for siteId = rm.", ex.getMessage()); assertEquals("The Deletion is supported only for siteId = rm.", ex.getMessage());
} }
verify(mockedRMSites, never()).deleteSite(siteId, parameters); verify(mockedRMSites, never()).deleteRMSite(siteId, parameters);
} }
@Test @Test