feat(search-engine): Support for user queries over multiple fields

Author: aholstenson

silo-search-api/src/main/java/se/l4/silo/index/search/internal/UserQueryMatcherImpl.java

@@ -6,13 +6,25 @@
 import se.l4.silo.index.search.QueryClause;
 import se.l4.silo.index.search.internal.UserQueryImpl;
 
+/**
+ * Query from a user that applies to one or more fields.
+ */
 public interface UserQuery
 	extends QueryClause
 {
+	/**
+	 * Context to apply.
+	 */
 	enum Context
 	{
+		/**
+		 * Standard context, perform a full-text search.
+		 */
 		STANDARD,
 
+		/**
+		 * Type ahead context.
+		 */
 		TYPE_AHEAD
 	}
 
@@ -64,7 +76,7 @@ static Matcher matcher(String query, Context context)
 	 * single field.
 	 */
 	interface Matcher
-		extends se.l4.silo.index.Matcher
+		extends se.l4.silo.index.Matcher<String>
 	{
 		/**
 		 * Get the context of this query.
@@ -114,6 +126,11 @@ public interface Builder
 		 */
 		Builder withContext(Context context);
 
+		/**
+		 * Build the instance.
+		 *
+		 * @return
+		 */
 		UserQuery build();
 	}
 }

silo-search-api/src/main/java/se/l4/silo/index/search/query/UserQuery.java

@@ -74,7 +74,7 @@ public V read(StreamingInput in)
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Query createQuery(
 		QueryEncounter<?> encounter,
-		String field,
+		SearchFieldDef<?> fieldDef,
 		Matcher<V> matcher
 	)
 	{
@@ -89,7 +89,7 @@ public Query createQuery(
 			converted = (Matcher) matcher;
 		}
 
-		return originalType.createQuery(encounter, field, converted);
+		return originalType.createQuery(encounter, fieldDef, converted);
 	}
 
 	@Override

silo-search-api/src/main/java/se/l4/silo/index/search/query/UserQueryMatcher.java

@@ -19,6 +19,7 @@
 import se.l4.silo.engine.index.search.config.IndexCacheConfig;
 import se.l4.silo.engine.index.search.config.IndexCommitConfig;
 import se.l4.silo.engine.index.search.facets.FacetDef;
+import se.l4.silo.engine.index.search.internal.query.QueryBuildersImpl;
 import se.l4.silo.engine.index.search.locales.Locales;
 import se.l4.silo.index.search.SearchIndexException;