Added noop query Philippus#1267

trsc · Feb 5, 2018 · c60ef94 · c60ef94
1 parent 3b542cc
commit c60ef94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 31 deletions.
diff --git a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/searches/queries/Query.scala b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/searches/queries/Query.scala
@@ -2,4 +2,6 @@ package com.sksamuel.elastic4s.searches.queries
 
 trait Query
 
+object NoopQuery extends Query
+
 trait MultiTermQuery extends Query
diff --git a/...tic4s-http/src/main/scala/com/sksamuel/elastic4s/http/search/queries/QueryBuilderFn.scala b/...tic4s-http/src/main/scala/com/sksamuel/elastic4s/http/search/queries/QueryBuilderFn.scala
@@ -1,41 +1,16 @@
 package com.sksamuel.elastic4s.http.search.queries
 
 import com.sksamuel.elastic4s.http.search.RawQueryBodyFn
-import com.sksamuel.elastic4s.http.search.queries.compound.{
-  BoolQueryBuilderFn,
-  BoostingQueryBodyFn,
-  ConstantScoreBodyFn,
-  DisMaxQueryBodyFn
-}
-import com.sksamuel.elastic4s.http.search.queries.geo.{
-  GeoBoundingBoxQueryBodyFn,
-  GeoDistanceQueryBodyFn,
-  GeoPolyonQueryBodyFn,
-  GeoShapeQueryBodyFn
-}
-import com.sksamuel.elastic4s.http.search.queries.nested.{
-  HasChildBodyFn,
-  HasParentBodyFn,
-  NestedQueryBodyFn,
-  ParentIdQueryBodyFn
-}
+import com.sksamuel.elastic4s.http.search.queries.compound.{BoolQueryBuilderFn, BoostingQueryBodyFn, ConstantScoreBodyFn, DisMaxQueryBodyFn}
+import com.sksamuel.elastic4s.http.search.queries.geo.{GeoBoundingBoxQueryBodyFn, GeoDistanceQueryBodyFn, GeoPolyonQueryBodyFn, GeoShapeQueryBodyFn}
+import com.sksamuel.elastic4s.http.search.queries.nested.{HasChildBodyFn, HasParentBodyFn, NestedQueryBodyFn, ParentIdQueryBodyFn}
 import com.sksamuel.elastic4s.http.search.queries.span._
-import com.sksamuel.elastic4s.http.search.queries.specialized.{
-  FunctionScoreQueryBuilderFn,
-  MoreLikeThisBuilderFn,
-  ScriptQueryBodyFn,
-  ScriptScoreQueryBodyFn
-}
+import com.sksamuel.elastic4s.http.search.queries.specialized.{FunctionScoreQueryBuilderFn, MoreLikeThisBuilderFn, ScriptQueryBodyFn, ScriptScoreQueryBodyFn}
 import com.sksamuel.elastic4s.http.search.queries.term._
 import com.sksamuel.elastic4s.http.search.queries.text._
-import com.sksamuel.elastic4s.json.XContentBuilder
+import com.sksamuel.elastic4s.json.{XContentBuilder, XContentFactory}
 import com.sksamuel.elastic4s.searches.queries.funcscorer.{FunctionScoreQuery, ScriptScore}
-import com.sksamuel.elastic4s.searches.queries.geo.{
-  GeoBoundingBoxQuery,
-  GeoDistanceQuery,
-  GeoPolygonQuery,
-  GeoShapeQuery
-}
+import com.sksamuel.elastic4s.searches.queries.geo.{GeoBoundingBoxQuery, GeoDistanceQuery, GeoPolygonQuery, GeoShapeQuery}
 import com.sksamuel.elastic4s.searches.queries.matches._
 import com.sksamuel.elastic4s.searches.queries.span._
 import com.sksamuel.elastic4s.searches.queries.term.{TermQuery, TermsLookupQuery, TermsQuery, TermsSetQuery}
@@ -66,6 +41,7 @@ object QueryBuilderFn {
     case q: MoreLikeThisQuery   => MoreLikeThisBuilderFn(q)
     case q: MultiMatchQuery     => MultiMatchBodyFn(q)
     case q: NestedQuery         => NestedQueryBodyFn(q)
+    case NoopQuery => XContentFactory.jsonBuilder()
     case q: ParentIdQuery       => ParentIdQueryBodyFn(q)
     case q: PrefixQuery         => PrefixQueryBodyFn(q)
     case q: QueryStringQuery    => QueryStringBodyFn(q)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@ package com.sksamuel.elastic4s.searches.queries

		trait Query

		object NoopQuery extends Query

		trait MultiTermQuery extends Query