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

ALF-9086 "RINF 52: Lucene Removal: Fix FileFolderService search methods"

Browse Source 
- FileFolderService can return List<FileInfo> or PagingResults<FileInfo>

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-08-08 10:45:14 +00:00
parent 9826a1fdcc
commit 5a8ff3dfc1
2 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
View File

@@ -213,6 +213,24 @@ public class FileFolderServiceImplTest extends TestCase
checkFileList(files, 2, 3, expectedNames); checkFileList(files, 2, 3, expectedNames);
} }
public void testShallowFilesAndFoldersListWithLocale() throws Exception
{
Locale savedLocale = I18NUtil.getContentLocaleOrNull();
try
{
I18NUtil.setContentLocale(Locale.CANADA);
List<FileInfo> files = fileFolderService.list(workingRootNodeRef);
// check
String[] expectedNames = new String[]
{ NAME_L0_FILE_A, NAME_L0_FILE_B, NAME_L0_FOLDER_A, NAME_L0_FOLDER_B, NAME_L0_FOLDER_C };
checkFileList(files, 2, 3, expectedNames);
}
finally
{
I18NUtil.setContentLocale(savedLocale);
}
}
public void testListPage() throws Exception public void testListPage() throws Exception
{ {
// sanity checks only (see also GetChildrenCannedQueryTest) // sanity checks only (see also GetChildrenCannedQueryTest)

77
source/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java
View File

@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.springframework.extensions.surf.util.I18NUtil; import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingResults; import org.alfresco.query.PagingResults;
import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.ml.MultilingualContentService;
@@ -196,30 +197,36 @@ public class MLTranslationInterceptor implements MethodInterceptor
return translatedFileInfo; return translatedFileInfo;
} }
@SuppressWarnings("unchecked") private List<FileInfo> processList(List<FileInfo> fileInfos)
public Object invoke(MethodInvocation invocation) throws Throwable
{ {
Object ret = null;
String methodName = invocation.getMethod().getName();
if (I18NUtil.getContentLocaleOrNull() == null)
{
// This can shortcut anything as there is no filtering going on
return invocation.proceed();
}
else if (METHOD_NAMES_LIST.contains(methodName))
{
final PagingResults<FileInfo> fileInfos = (PagingResults<FileInfo>) invocation.proceed();
// Compile a set to ensure we don't get duplicates // Compile a set to ensure we don't get duplicates
Map<FileInfo, FileInfo> translatedFileInfos = new HashMap<FileInfo, FileInfo>(17); Map<FileInfo, FileInfo> translatedFileInfos = new HashMap<FileInfo, FileInfo>(17);
for (FileInfo fileInfo : fileInfos.getPage()) for (FileInfo fileInfo : fileInfos)
{ {
FileInfo translatedFileInfo = getTranslatedFileInfo(fileInfo); FileInfo translatedFileInfo = getTranslatedFileInfo(fileInfo);
// Add this to the set // Add this to the set
translatedFileInfos.put(fileInfo, translatedFileInfo); translatedFileInfos.put(fileInfo, translatedFileInfo);
} }
// Convert the set back to a PagingResults // Convert the set back to a list
final List<FileInfo> orderedResults = new ArrayList<FileInfo>(fileInfos.getPage().size()); List<FileInfo> orderedResults = new ArrayList<FileInfo>(fileInfos.size());
Set<FileInfo> alreadyPresent = new HashSet<FileInfo>(fileInfos.size() * 2 + 1);
for (FileInfo info : fileInfos)
{
FileInfo translatedFileInfo = translatedFileInfos.get(info);
if (alreadyPresent.contains(translatedFileInfo))
{
// We've done this one
continue;
}
alreadyPresent.add(translatedFileInfo);
orderedResults.add(translatedFileInfo);
}
return orderedResults;
}
private PagingResults<FileInfo> processPagingResults(final PagingResults<FileInfo> fileInfos)
{
final List<FileInfo> orderedResults = processList(fileInfos.getPage());
PagingResults<FileInfo> orderedPagingResults = new PagingResults<FileInfo>() PagingResults<FileInfo> orderedPagingResults = new PagingResults<FileInfo>()
{ {
@Override @Override
@@ -243,19 +250,35 @@ public class MLTranslationInterceptor implements MethodInterceptor
return fileInfos.getTotalResultCount(); return fileInfos.getTotalResultCount();
} }
}; };
Set<FileInfo> alreadyPresent = new HashSet<FileInfo>(fileInfos.getPage().size() * 2 + 1); return orderedPagingResults;
for (FileInfo info : fileInfos.getPage())
{
FileInfo translatedFileInfo = translatedFileInfos.get(info);
if (alreadyPresent.contains(translatedFileInfo))
{
// We've done this one
continue;
} }
alreadyPresent.add(translatedFileInfo);
orderedResults.add(translatedFileInfo); @SuppressWarnings("unchecked")
public Object invoke(MethodInvocation invocation) throws Throwable
{
Object ret = null;
String methodName = invocation.getMethod().getName();
if (I18NUtil.getContentLocaleOrNull() == null)
{
// This can shortcut anything as there is no filtering going on
return invocation.proceed();
}
else if (METHOD_NAMES_LIST.contains(methodName))
{
Object result = invocation.proceed();
if(result instanceof List)
{
return processList((List<FileInfo>)result);
}
else if(result instanceof PagingResults)
{
return processPagingResults((PagingResults<FileInfo>)result);
}
else
{
throw new ClassCastException("Unexpected return type from method " + methodName + " in " + this);
} }
ret = orderedPagingResults;
} }
else if (METHOD_NAMES_SINGLE.contains(methodName)) else if (METHOD_NAMES_SINGLE.contains(methodName))
{ {