Some fixes.

Author: markok4

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

@@ -2800,15 +2800,20 @@ object HttpExecutorSpec extends IntegrationSpec {
               val term        = "apple"
               val docWithTerm = doc.copy(stringField = s"$term banana orange")
 
-              val query = intervals(
-                "stringField",
-                intervalMatch(term)
-              )
-
               for {
                 _   <- Executor.execute(ElasticRequest.upsert(firstSearchIndex, docId, docWithTerm))
                 _   <- Executor.execute(ElasticRequest.refresh(firstSearchIndex))
-                res <- Executor.execute(ElasticRequest.search(firstSearchIndex, query)).documentAs[TestDocument]
+                res <- Executor
+                         .execute(
+                           ElasticRequest.search(
+                             firstSearchIndex,
+                             intervals(
+                               TestDocument.stringField,
+                               intervalMatch(term)
+                             )
+                           )
+                         )
+                         .documentAs[TestDocument]
               } yield assert(res)(Assertion.contains(docWithTerm))
             }
           } @@ around(
@@ -2817,15 +2822,20 @@ object HttpExecutorSpec extends IntegrationSpec {
           ),
           test("intervalMatch query does not find document if term is absent") {
             checkOnce(genDocumentId, genTestDocument) { (docId, doc) =>
-              val query = intervals(
-                "stringField",
-                intervalMatch("nonexistentterm")
-              )
-
               for {
                 _   <- Executor.execute(ElasticRequest.upsert(firstSearchIndex, docId, doc))
                 _   <- Executor.execute(ElasticRequest.refresh(firstSearchIndex))
-                res <- Executor.execute(ElasticRequest.search(firstSearchIndex, query)).documentAs[TestDocument]
+                res <- Executor
+                         .execute(
+                           ElasticRequest.search(
+                             firstSearchIndex,
+                             intervals(
+                               TestDocument.stringField,
+                               intervalMatch("nonexistentterm")
+                             )
+                           )
+                         )
+                         .documentAs[TestDocument]
               } yield assert(res)(Assertion.isEmpty)
             }
           } @@ around(

modules/library/src/main/scala/zio/elasticsearch/query/ElasticIntervalRule.scala

@@ -65,8 +65,6 @@ private[elasticsearch] final case class IntervalAllOf[S](
 
   def orderedOn: IntervalAllOf[S] = copy(ordered = Some(true))
 
-  def orderedOff: IntervalAllOf[S] = copy(ordered = Some(false))
-
   private[elasticsearch] def toJson: Json =
     Obj(
       "all_of" -> Obj(
@@ -87,7 +85,7 @@ private[elasticsearch] final case class IntervalAnyOf[S](
 
   def filter(f: IntervalFilter[S]): IntervalAnyOf[S] = copy(filter = Some(f))
 
-  override private[elasticsearch] def toJson: Json =
+  private[elasticsearch] def toJson: Json =
     Obj(
       "any_of" -> Obj(
         Chunk(
@@ -138,15 +136,15 @@ private[elasticsearch] final case class IntervalFuzzy[S](
 
   def analyzer(value: String): IntervalFuzzy[S] = copy(analyzer = Some(value))
 
-  def useField(field: Field[_, _]): IntervalFuzzy[S] = copy(useField = Some(field.name))
-
-  def useField(field: String): IntervalFuzzy[S] = copy(useField = Some(field))
-
   def prefixLength(length: Int): IntervalFuzzy[S] = copy(prefixLength = Some(length))
 
+  def transpositionsDisabled: IntervalFuzzy[S] = copy(transpositions = Some(false))
+
   def transpositionsEnabled: IntervalFuzzy[S] = copy(transpositions = Some(true))
 
-  def transpositionsDisabled: IntervalFuzzy[S] = copy(transpositions = Some(false))
+  def useField(field: Field[_, _]): IntervalFuzzy[S] = copy(useField = Some(field.name))
+
+  def useField(field: String): IntervalFuzzy[S] = copy(useField = Some(field))
 
   private[elasticsearch] def toJson: Json =
     Obj(
@@ -182,13 +180,11 @@ private[elasticsearch] final case class IntervalMatch[S](
 
   def orderedOn: IntervalMatch[S] = copy(ordered = Some(true))
 
-  def orderedOff: IntervalMatch[S] = copy(ordered = Some(false))
-
   def useField(field: Field[_, _]): IntervalMatch[S] = copy(useField = Some(field.name))
 
   def useField(field: String): IntervalMatch[S] = copy(useField = Some(field))
 
-  override private[elasticsearch] def toJson: Json =
+  private[elasticsearch] def toJson: Json =
     Obj(
       "match" -> Obj(
         Chunk(
@@ -217,7 +213,7 @@ private[elasticsearch] final case class IntervalPrefix[S](
 
   def useField(field: String): IntervalPrefix[S] = copy(useField = Some(field))
 
-  override private[elasticsearch] def toJson: Json =
+  private[elasticsearch] def toJson: Json =
     Obj(
       "prefix" -> Obj(
         Chunk(

modules/library/src/test/scala/zio/elasticsearch/ElasticIntervalQuerySpec.scala

@@ -46,7 +46,7 @@ object ElasticIntervalQuerySpec extends ZIOSpecDefault {
           after = Some(intervalMatch("after_term"))
         )
 
-        val intervalWithFilter: IntervalMatch[String] = intervalMatch("lambda works").orderedOff
+        val intervalWithFilter: IntervalMatch[String] = intervalMatch("lambda works")
           .maxGaps(2)
           .analyzer("standard")
           .filter(filter)

website/sidebars.js

@@ -25,7 +25,7 @@ module.exports = {
                     'overview/queries/elastic_query_geo_polygon',
                     'overview/queries/elastic_query_has_child',
                     'overview/queries/elastic_query_has_parent',
-                    'overview/queries/elastic_query_interval.md',
+                    'overview/queries/elastic_query_interval',
                     'overview/queries/elastic_query_match',
                     'overview/queries/elastic_query_match_all',
                     'overview/queries/elastic_query_match_boolean_prefix',