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

RM-5878 code review changes

Browse Source
This commit is contained in:
Ross Gale
2017-11-29 14:05:39 +00:00
parent 097f2d848a
commit ffe5429927
8 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -74,6 +74,11 @@
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>0.9.10</version> <version>0.9.10</version>
</dependency> </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

2
rm-automation/pom.xml
View File

@@ -150,7 +150,7 @@
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>6.8.8</version> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.yandex.qatools.htmlelements</groupId> <groupId>ru.yandex.qatools.htmlelements</groupId>

12
rm-server/pom.xml
View File

@@ -243,6 +243,12 @@
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
<!-- Database drivers --> <!-- Database drivers -->
<dependency> <dependency>
<groupId>postgresql</groupId> <groupId>postgresql</groupId>
@@ -257,12 +263,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Dependencies for the test result reports --> <!-- Dependencies for the test result reports -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
View File

@@ -279,5 +279,5 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
QName ASPECT_COUNTABLE = QName.createQName(RM_URI, "countable"); QName ASPECT_COUNTABLE = QName.createQName(RM_URI, "countable");
QName PROP_COUNT = QName.createQName(RM_URI, "count"); QName PROP_COUNT = QName.createQName(RM_URI, "count");
QName SAVED_SEARCH_ASPECT = QName.createQName(RM_URI, "savedSearch"); QName ASPECT_SAVED_SEARCH = QName.createQName(RM_URI, "savedSearch");
} }

9
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java
View File

@@ -32,6 +32,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
/** /**
* RM v2.0 Saved Search Patch * RM v2.0 Saved Search Patch
* *
@@ -42,9 +44,6 @@ import org.springframework.beans.factory.BeanNameAware;
public class RMv2SavedSearchPatch extends ModulePatchComponent public class RMv2SavedSearchPatch extends ModulePatchComponent
implements BeanNameAware, RecordsManagementModel, DOD5015Model implements BeanNameAware, RecordsManagementModel, DOD5015Model
{ {
/** RM site id */
private static final String RM_SITE_ID = "rm";
/** Records management search service */ /** Records management search service */
private RecordsManagementSearchService recordsManagementSearchService; private RecordsManagementSearchService recordsManagementSearchService;
@@ -84,10 +83,10 @@ public class RMv2SavedSearchPatch extends ModulePatchComponent
@Override @Override
protected void executePatch() protected void executePatch()
{ {
if (siteService.getSite(RM_SITE_ID) != null) if (siteService.getSite(DEFAULT_SITE_NAME) != null)
{ {
// get the saved searches // get the saved searches
List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID); List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME);
if (LOGGER.isDebugEnabled()) if (LOGGER.isDebugEnabled())
{ {

14
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java
View File

@@ -18,14 +18,14 @@
*/ */
package org.alfresco.module.org_alfresco_module_rm.patch.v23; package org.alfresco.module.org_alfresco_module_rm.patch.v23;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch; import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails; import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
/** /**
* RM v2.3 patch that adds the saved search aspect. * RM v2.3 patch that adds the saved search aspect.
@@ -41,8 +41,6 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
/** node service */ /** node service */
private NodeService nodeService; private NodeService nodeService;
private static final String RM_SITE_ID = "rm";
/** /**
* @param recordsManagementSearchService records management search service * @param recordsManagementSearchService records management search service
*/ */
@@ -60,14 +58,14 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
} }
/** /**
* @see AbstractModulePatch#applyInternal() * Retrieves all saved searches for the records management site and adds ASPECT_SAVED_SEARCH
*/ */
@Override @Override
public void applyInternal() public void applyInternal()
{ {
for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(RM_SITE_ID)) for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME))
{ {
nodeService.addAspect(savedSearchDetails.getNodeRef(),SAVED_SEARCH_ASPECT,null); nodeService.addAspect(savedSearchDetails.getNodeRef(), ASPECT_SAVED_SEARCH,null);
} }
} }
} }

5
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
View File

@@ -18,6 +18,8 @@
*/ */
package org.alfresco.module.org_alfresco_module_rm.search; package org.alfresco.module.org_alfresco_module_rm.search;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -50,7 +52,6 @@ import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.extensions.surf.util.I18NUtil; import org.springframework.extensions.surf.util.I18NUtil;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
/** /**
* Records management search service implementation * Records management search service implementation
@@ -534,7 +535,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
} }
nodeService.addAspect(searchNode, SAVED_SEARCH_ASPECT, null); nodeService.addAspect(searchNode, ASPECT_SAVED_SEARCH, null);
// Write the JSON content to search node // Write the JSON content to search node
final NodeRef writableSearchNode = searchNode; final NodeRef writableSearchNode = searchNode;
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()

33
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java
View File

@@ -18,11 +18,17 @@
*/ */
package org.alfresco.module.org_alfresco_module_rm.patch.v23; package org.alfresco.module.org_alfresco_module_rm.patch.v23;
import static java.util.Arrays.asList;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl;
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails; import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
import org.alfresco.repo.version.NodeServiceImpl;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.junit.Test; import org.junit.Test;
@@ -30,22 +36,13 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
import java.util.List;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/** /**
* patch.v23 unit test * patch.v23 unit test
* *
* @author Ross Gale * @author Ross Gale
* @since 2.3 * @since 2.3
*/ */
public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest public class RMv23SavedSearchesPatchUnitTest
{ {
@Mock @Mock
@@ -61,9 +58,9 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
private RMv23SavedSearchesPatch patch; private RMv23SavedSearchesPatch patch;
/** /**
* Given that I am upgrading an existing repository to v2.2 * Given that I am upgrading an existing repository to v2.3
* When I execute the patch * When I execute the patch
* Then the capabilities are updated * Then any existing rm saved searches will have the saved search aspect applied
*/ */
@Test @Test
public void executePatch() public void executePatch()
@@ -71,9 +68,7 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
NodeRef noderef1 = new NodeRef("foo://123/456"); NodeRef noderef1 = new NodeRef("foo://123/456");
NodeRef noderef2 = new NodeRef("bar://123/456"); NodeRef noderef2 = new NodeRef("bar://123/456");
List<SavedSearchDetails> searches = new ArrayList<>(); List<SavedSearchDetails> searches = asList(mockSavedSearchDetails1, mockSavedSearchDetails2);
searches.add(mockSavedSearchDetails1);
searches.add(mockSavedSearchDetails2);
when(mockSavedSearchDetails1.getNodeRef()).thenReturn(noderef1); when(mockSavedSearchDetails1.getNodeRef()).thenReturn(noderef1);
when(mockSavedSearchDetails2.getNodeRef()).thenReturn(noderef2); when(mockSavedSearchDetails2.getNodeRef()).thenReturn(noderef2);
when(recordsManagementSearchService.getSavedSearches("rm")).thenReturn(searches); when(recordsManagementSearchService.getSavedSearches("rm")).thenReturn(searches);
@@ -81,8 +76,8 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
// execute patch // execute patch
patch.applyInternal(); patch.applyInternal();
verify(nodeService, times(1)).addAspect(noderef1,SAVED_SEARCH_ASPECT,null); verify(nodeService, times(1)).addAspect(noderef1, ASPECT_SAVED_SEARCH, null);
verify(nodeService, times(1)).addAspect(noderef2, SAVED_SEARCH_ASPECT, null); verify(nodeService, times(1)).addAspect(noderef2, ASPECT_SAVED_SEARCH, null);
} }
} }