Author: angela
Date: Fri Jun 2 10:03:56 2017
New Revision: 1797364
URL: http://svn.apache.org/viewvc?rev=1797364&view=rev
Log:
OAK-6296 : Move JACKRABBIT_2_SINGLE_QUOTED_PHRASE from
o.a.j.oak.query.ask.FullTextSearchImpl to oak.fulltext.FullTextParser
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1797364&r1=1797363&r2=1797364&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
Fri Jun 2 10:03:56 2017
@@ -42,14 +42,6 @@ import org.apache.jackrabbit.oak.spi.que
*/
public class FullTextSearchImpl extends ConstraintImpl {
- /**
- * Compatibility for Jackrabbit 2.0 single quoted phrase queries.
- * (contains(., "word ''hello world'' word")
- * These are queries that delimit a phrase with a single quote
- * instead, as in the spec, using double quotes.
- */
- public static final boolean JACKRABBIT_2_SINGLE_QUOTED_PHRASE = true;
-
final String selectorName;
private final String relativePath;
final String propertyName;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java?rev=1797364&r1=1797363&r2=1797364&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
Fri Jun 2 10:03:56 2017
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.query.
import java.text.ParseException;
import java.util.ArrayList;
-import org.apache.jackrabbit.oak.query.ast.FullTextSearchImpl;
-
/**
* A parser for fulltext condition literals. The grammar is defined in the
@@ -38,6 +36,14 @@ import org.apache.jackrabbit.oak.query.a
*/
public class FullTextParser {
+ /**
+ * Compatibility for Jackrabbit 2.0 single quoted phrase queries.
+ * (contains(., "word ''hello world'' word")
+ * These are queries that delimit a phrase with a single quote
+ * instead, as in the spec, using double quotes.
+ */
+ private static final boolean JACKRABBIT_2_SINGLE_QUOTED_PHRASE = true;
+
private String propertyName;
private String text;
private int parseIndex;
@@ -120,7 +126,7 @@ public class FullTextParser {
buff.append(c);
}
}
- } else if (c == '\'' &&
FullTextSearchImpl.JACKRABBIT_2_SINGLE_QUOTED_PHRASE) {
+ } else if (c == '\'' && JACKRABBIT_2_SINGLE_QUOTED_PHRASE) {
// basically the same as double quote
parseIndex++;
while (true) {
