inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2559, ALF-21909 Corrected missmatch in VirtualStoreImpl and VirtualQueryImpl. I corrected some name convention from my commit before (MNT-17113)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2017-06-19 16:35:20 +00:00
parent 144c3b5d52
commit 82037ee4b6
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
View File

@@ -546,8 +546,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
true, true,
true, true,
null, null,
Collections.<QName> emptySet(),
searchTypeQNames, searchTypeQNames,
Collections.<QName> emptySet(),
ignoreAspectQNames, ignoreAspectQNames,
sortProps, sortProps,
pagingRequest); pagingRequest);

2
source/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
View File

@@ -93,7 +93,7 @@ public class VirtualQueryImpl implements VirtualQuery
*/ */
@Override @Override
public PagingResults<Reference> perform(ActualEnvironment environment, boolean files, boolean folders, public PagingResults<Reference> perform(ActualEnvironment environment, boolean files, boolean folders,
String pattern, Set<QName> ignoreTypeQNames, Set<QName> searchTypeQNames, Set<QName> ignoreAspectQNames, String pattern, Set<QName> searchTypeQNames, Set<QName> ignoreTypeQNames, Set<QName> ignoreAspectQNames,
List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest, Reference parentReference) List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest, Reference parentReference)
throws VirtualizationException throws VirtualizationException
{ {

10
source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
View File

@@ -651,10 +651,10 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
/** /**
* A simple listener which will delete the given node after the transition is completed * A simple listener which will delete the given node after the transition is completed
*/ */
private class CustomListener extends TransactionListenerAdapter private class TestNodeDeleterListener extends TransactionListenerAdapter
{ {
private final NodeRef nodeRef; private final NodeRef nodeRef;
private CustomListener(NodeRef nodeRef) private TestNodeDeleterListener(NodeRef nodeRef)
{ {
this.nodeRef = nodeRef; this.nodeRef = nodeRef;
} }
@@ -736,9 +736,9 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
// Delete the content node (pdfOrig) before the afterCommit code is executed // Delete the content node (pdfOrig) before the afterCommit code is executed
CustomListener customListener = new CustomListener(pdfOrig); TestNodeDeleterListener testNodeDeleterListener = new TestNodeDeleterListener(pdfOrig);
// I needs to have a higher priority as the implemented afterCommit. The priority in order are (0,1,2,3,4) // It needs to have a higher priority as the implemented afterCommit. The priority in order are (0,1,2,3,4)
AlfrescoTransactionSupport.bindListener(customListener, 1); AlfrescoTransactionSupport.bindListener(testNodeDeleterListener, 1);
thumbnailService.createThumbnail(pdfOrig, ContentModel.PROP_CONTENT, MimetypeMap.MIMETYPE_IMAGE_JPEG, details.getTransformationOptions(), "doclib"); thumbnailService.createThumbnail(pdfOrig, ContentModel.PROP_CONTENT, MimetypeMap.MIMETYPE_IMAGE_JPEG, details.getTransformationOptions(), "doclib");
return null; return null;

4
source/test-java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
View File

@@ -180,8 +180,8 @@ public class VirtualQueryImplTest extends TestCase
true, true,
true, true,
null, null,
Collections.singleton(testQName2),
Collections.<QName> emptySet(), Collections.<QName> emptySet(),
Collections.singleton(testQName2),
Collections.singleton(testQName1), Collections.singleton(testQName1),
Arrays.asList(withSortDefinitions), Arrays.asList(withSortDefinitions),
null, null,
@@ -197,8 +197,8 @@ public class VirtualQueryImplTest extends TestCase
false, false,
true, true,
null, null,
Collections.singleton(testQName2),
Collections.<QName> emptySet(), Collections.<QName> emptySet(),
Collections.singleton(testQName2),
Collections.singleton(testQName1), Collections.singleton(testQName1),
Collections.<Pair<QName, Boolean>> emptyList(), Collections.<Pair<QName, Boolean>> emptyList(),
null, null,