svn commit: r1662381 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast: SpellcheckImpl.java SuggestImpl.java

[tommaso]

Author: tommaso
Date: Thu Feb 26 08:27:12 2015
New Revision: 1662381

URL: http://svn.apache.org/r1662381
Log:
OAK-2548 - queries not failing if no ft index for suggest/spellcheck exists

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SpellcheckImpl.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SuggestImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SpellcheckImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SpellcheckImpl.java?rev=1662381&r1=1662380&r2=1662381&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SpellcheckImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SpellcheckImpl.java
 Thu Feb 26 08:27:12 2015
@@ -26,11 +26,15 @@ import org.apache.jackrabbit.oak.api.Typ
 import org.apache.jackrabbit.oak.query.index.FilterImpl;
 import org.apache.jackrabbit.oak.spi.query.PropertyValues;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Support for "spellcheck(...)
  */
 public class SpellcheckImpl extends ConstraintImpl {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     public static final String NATIVE_LUCENE_LANGUAGE = "lucene";
     
@@ -62,7 +66,8 @@ public class SpellcheckImpl extends Cons
         // and because we don't know how to process native
         // conditions
         if (!(selector.getIndex() instanceof FulltextQueryIndex)) {
-            throw new IllegalArgumentException("No full-text index was found 
that can process the condition " + toString());
+            log.warn("No full-text index was found that can process the 
condition " + toString());
+            return false;
         }
         // we assume the index only returns the requested entries
         return true;

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SuggestImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SuggestImpl.java?rev=1662381&r1=1662380&r2=1662381&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SuggestImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SuggestImpl.java
 Thu Feb 26 08:27:12 2015
@@ -26,12 +26,16 @@ import org.apache.jackrabbit.oak.api.Typ
 import org.apache.jackrabbit.oak.query.index.FilterImpl;
 import org.apache.jackrabbit.oak.spi.query.PropertyValues;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Support for "suggest(...)
  */
 public class SuggestImpl extends ConstraintImpl {
 
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     public static final String NATIVE_LUCENE_LANGUAGE = "lucene";
 
     public static final String SUGGEST_PREFIX = "suggest?term=";
@@ -62,7 +66,8 @@ public class SuggestImpl extends Constra
         // and because we don't know how to process native
         // conditions
         if (!(selector.getIndex() instanceof FulltextQueryIndex)) {
-            throw new IllegalArgumentException("No full-text index was found 
that can process the condition " + toString());
+            log.warn("No full-text index was found that can process the 
condition " + toString());
+            return false;
         }
         // we assume the index only returns the requested entries
         return true;