You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/11/22 14:54:26 UTC
svn commit: r1770849 - in /jackrabbit/branches/2.8: ./
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java
Author: reschke
Date: Tue Nov 22 14:54:26 2016
New Revision: 1770849
URL: http://svn.apache.org/viewvc?rev=1770849&view=rev
Log:
JCR-3845: Have AuthorizableQueryManager Support Specifying Sort Ignore Case Mode (patch provided by dominique jaeggi) (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 14:54:26 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java?rev=1770849&r1=1770848&r2=1770849&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/AuthorizableQueryManager.java Tue Nov 22 14:54:26 2016
@@ -60,6 +60,7 @@ import java.util.Stack;
{
property: /* relative path (String) * /
( direction: "asc" | "desc" ) // Defaults to "asc"
+ ( ignoreCase: true | false ) // Defaults to "true", see QueryBuilder#setSortOrder()
}
) ? // Defaults to document order
@@ -636,15 +637,16 @@ public class AuthorizableQueryManager {
private String currentKey;
private String property;
private QueryBuilder.Direction direction;
+ private boolean ignoreCase = true;
@Override
public void endObject() throws IOException {
if (property == null) {
throw new IOException("Missing property");
} else {
- queryBuilder.setSortOrder(property, direction == null
- ? QueryBuilder.Direction.ASCENDING
- : direction, true);
+ queryBuilder.setSortOrder(property,
+ direction == null ? QueryBuilder.Direction.ASCENDING : direction,
+ ignoreCase);
}
handlers.pop();
}
@@ -660,6 +662,8 @@ public class AuthorizableQueryManager {
property = s;
} else if ("direction".equals(currentKey)) {
direction = directionFor(s);
+ } else if ("ignoreCase".equals(currentKey)) {
+ ignoreCase = Boolean.valueOf(s);
} else {
throw new IOException("Unexpected: '" + currentKey + ':' + s + '\'');
}