You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/06/20 16:31:18 UTC
svn commit: r1861698 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java
test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java
Author: angela
Date: Thu Jun 20 16:31:18 2019
New Revision: 1861698
URL: http://svn.apache.org/viewvc?rev=1861698&view=rev
Log:
OAK-8423 : QueryUtil.getCollation should not throw RepositoryException
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java?rev=1861698&r1=1861697&r2=1861698&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java Thu Jun 20 16:31:18 2019
@@ -31,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
import org.jetbrains.annotations.NotNull;
+import static org.apache.jackrabbit.api.security.user.QueryBuilder.Direction.ASCENDING;
+
/**
* Common utilities used for user/group queries.
*/
@@ -114,14 +116,12 @@ public final class QueryUtil {
}
@NotNull
- public static RelationOp getCollation(@NotNull QueryBuilder.Direction direction) throws RepositoryException {
- switch (direction) {
- case ASCENDING:
- return RelationOp.GT;
- case DESCENDING:
- return RelationOp.LT;
- default:
- throw new RepositoryException("Unknown sort order " + direction);
+ public static RelationOp getCollation(@NotNull QueryBuilder.Direction direction) {
+ if (direction == ASCENDING) {
+ return RelationOp.GT;
+ }else {
+ // DESCENDING
+ return RelationOp.LT;
}
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java?rev=1861698&r1=1861697&r2=1861698&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java Thu Jun 20 16:31:18 2019
@@ -203,7 +203,7 @@ public class QueryUtilTest {
}
@Test
- public void testEscapeForQuery() throws Exception {
+ public void testEscapeForQuery() {
NamePathMapper namePathMapper = new NamePathMapperImpl(new LocalNameMapper(
ImmutableMap.of(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR),
ImmutableMap.of("myPrefix", NamespaceRegistry.NAMESPACE_JCR)));
@@ -213,7 +213,7 @@ public class QueryUtilTest {
}
@Test
- public void testGetCollation() throws Exception {
+ public void testGetCollation() {
assertSame(RelationOp.LT, QueryUtil.getCollation(QueryBuilder.Direction.DESCENDING));
assertSame(RelationOp.GT, QueryUtil.getCollation(QueryBuilder.Direction.ASCENDING));
}