mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68121: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 67187: MNT-10169 : Sort order by name is not always correct when the file name has alphanumeric characters - Fix for GetChildrenCannedQueryTest failure git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -20,8 +20,6 @@ package org.alfresco.repo.node.getchildren;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.text.Collator;
|
import java.text.Collator;
|
||||||
import java.text.ParseException;
|
|
||||||
import java.text.RuleBasedCollator;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
@@ -61,6 +59,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
|
|||||||
import org.alfresco.service.cmr.repository.NodeService;
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
||||||
import org.alfresco.service.namespace.QName;
|
import org.alfresco.service.namespace.QName;
|
||||||
|
import org.alfresco.util.AlfrescoCollator;
|
||||||
import org.alfresco.util.Pair;
|
import org.alfresco.util.Pair;
|
||||||
import org.alfresco.util.ParameterCheck;
|
import org.alfresco.util.ParameterCheck;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
@@ -374,7 +373,7 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
|
|||||||
{
|
{
|
||||||
this.sortProps = sortProps;
|
this.sortProps = sortProps;
|
||||||
// try to overrider collator comparison rules
|
// try to overrider collator comparison rules
|
||||||
this.collator = updateCollatorRules(Collator.getInstance(I18NUtil.getContentLocale()));
|
this.collator = AlfrescoCollator.getInstance(I18NUtil.getContentLocale());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int compare(FilterSortNode n1, FilterSortNode n2)
|
public int compare(FilterSortNode n1, FilterSortNode n2)
|
||||||
@@ -452,32 +451,6 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// update RuleBasedCollator rules to change order of characters during comparison
|
|
||||||
// MNT-10169 fix
|
|
||||||
private Collator updateCollatorRules(Collator collator)
|
|
||||||
{
|
|
||||||
if (collator instanceof RuleBasedCollator)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// get current collator rules
|
|
||||||
String collatorRules = ((RuleBasedCollator)collator).getRules();
|
|
||||||
// we shoudn't ignore space character in character comparison - put it before u0021 character
|
|
||||||
String newCollatorRules = collatorRules.replaceAll("<'\u0021'", "<'\u0020'<'\u0021'");
|
|
||||||
// create new collator with overridden rules
|
|
||||||
return new RuleBasedCollator(newCollatorRules);
|
|
||||||
}
|
|
||||||
catch(ParseException e)
|
|
||||||
{
|
|
||||||
if (logger.isWarnEnabled())
|
|
||||||
{
|
|
||||||
logger.warn("Error on overwriting RuleBasedCollator rules " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return collator;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean includeAspects(NodeRef nodeRef, Set<QName> inclusiveAspects, Set<QName> exclusiveAspects)
|
private boolean includeAspects(NodeRef nodeRef, Set<QName> inclusiveAspects, Set<QName> exclusiveAspects)
|
||||||
{
|
{
|
||||||
if (inclusiveAspects == null && exclusiveAspects == null)
|
if (inclusiveAspects == null && exclusiveAspects == null)
|
||||||
|
59
source/java/org/alfresco/util/AlfrescoCollator.java
Normal file
59
source/java/org/alfresco/util/AlfrescoCollator.java
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
||||||
|
*
|
||||||
|
* This file is part of Alfresco
|
||||||
|
*
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.alfresco.util;
|
||||||
|
|
||||||
|
import java.text.Collator;
|
||||||
|
import java.text.ParseException;
|
||||||
|
import java.text.RuleBasedCollator;
|
||||||
|
import java.util.Locale;
|
||||||
|
/**
|
||||||
|
* Can be used to overwrite a RuleBaseCollator instance rules
|
||||||
|
*
|
||||||
|
* @author sergey.shcherbovich
|
||||||
|
*/
|
||||||
|
public class AlfrescoCollator
|
||||||
|
{
|
||||||
|
public static Collator getInstance(Locale locale)
|
||||||
|
{
|
||||||
|
return updateCollatorRules(Collator.getInstance(locale));
|
||||||
|
}
|
||||||
|
|
||||||
|
// update RuleBasedCollator rules to change order of characters during comparison
|
||||||
|
// MNT-10169 fix
|
||||||
|
private static synchronized Collator updateCollatorRules(Collator collator)
|
||||||
|
{
|
||||||
|
if (collator instanceof RuleBasedCollator)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// get current collator rules
|
||||||
|
String collatorRules = ((RuleBasedCollator)collator).getRules();
|
||||||
|
// we shoudn't ignore space character in character comparison - put it before u0021 character
|
||||||
|
String newCollatorRules = collatorRules.replaceAll("<'\u0021'", "<'\u0020'<'\u0021'");
|
||||||
|
// create new collator with overridden rules
|
||||||
|
return new RuleBasedCollator(newCollatorRules);
|
||||||
|
}
|
||||||
|
catch(ParseException e)
|
||||||
|
{
|
||||||
|
return collator;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return collator;
|
||||||
|
}
|
||||||
|
}
|
@@ -75,6 +75,7 @@ import org.alfresco.service.namespace.NamespaceService;
|
|||||||
import org.alfresco.service.namespace.QName;
|
import org.alfresco.service.namespace.QName;
|
||||||
import org.alfresco.service.transaction.TransactionService;
|
import org.alfresco.service.transaction.TransactionService;
|
||||||
import org.alfresco.test_category.OwnJVMTestsCategory;
|
import org.alfresco.test_category.OwnJVMTestsCategory;
|
||||||
|
import org.alfresco.util.AlfrescoCollator;
|
||||||
import org.alfresco.util.ApplicationContextHelper;
|
import org.alfresco.util.ApplicationContextHelper;
|
||||||
import org.alfresco.util.Pair;
|
import org.alfresco.util.Pair;
|
||||||
import org.alfresco.util.PropertyMap;
|
import org.alfresco.util.PropertyMap;
|
||||||
@@ -83,6 +84,7 @@ import org.apache.commons.logging.Log;
|
|||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.junit.experimental.categories.Category;
|
import org.junit.experimental.categories.Category;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.extensions.surf.util.I18NUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GetChildren canned query - simple unit tests
|
* GetChildren canned query - simple unit tests
|
||||||
@@ -1051,7 +1053,7 @@ public class GetChildrenCannedQueryTest extends TestCase
|
|||||||
logger.info("testSorting: "+count+" items ["+sortPropQName+","+(sortAscending ? " ascending" : " descending")+"]");
|
logger.info("testSorting: "+count+" items ["+sortPropQName+","+(sortAscending ? " ascending" : " descending")+"]");
|
||||||
}
|
}
|
||||||
|
|
||||||
Collator collator = Collator.getInstance();
|
Collator collator = AlfrescoCollator.getInstance(I18NUtil.getContentLocale());
|
||||||
|
|
||||||
// check order
|
// check order
|
||||||
Serializable prevVal = null;
|
Serializable prevVal = null;
|
||||||
|
Reference in New Issue
Block a user