Merge branch 'master' into 2883-delete-update-by-query-response-failures

Philippus · Aug 11, 2023 · ec13b71 · ec13b71
2 parents 0614465 + b9d39ab
commit ec13b71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchBodyBuilderFn.scala b/...4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchBodyBuilderFn.scala
@@ -133,6 +133,9 @@ object SearchBodyBuilderFn {
       request.runtimeMappings.foreach { mapping =>
         builder.startObject(mapping.field)
         builder.field("type", mapping.`type`)
+
+        // format is only allowed with a type of date
+        mapping.format.foreach(builder.field("format", _))
         mapping.script.foreach {
           script => builder.rawField("script", ScriptBuilderFn(script))
         }

diff --git a/...tic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/RuntimeMapping.scala b/...tic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/RuntimeMapping.scala
@@ -2,20 +2,20 @@ package com.sksamuel.elastic4s.requests.searches
 
 import com.sksamuel.elastic4s.requests.script.Script
 
-case class RuntimeMapping(field: String, `type`: String, script: Option[Script] = None, fields: Seq[RuntimeMapping.Field] = Seq.empty)
+case class RuntimeMapping(field: String, `type`: String, format: Option[String] = None, script: Option[Script] = None, fields: Seq[RuntimeMapping.Field] = Seq.empty)
 
 object RuntimeMapping {
   def apply(field: String, `type`: String, script: Script): RuntimeMapping =
-    RuntimeMapping(field, `type`, Some(script))
+    RuntimeMapping(field, `type`, None, Some(script))
 
   def apply(field: String, `type`: String, script: Script, fields: Seq[Field]): RuntimeMapping =
-    RuntimeMapping(field, `type`, Some(script), fields)
+    RuntimeMapping(field, `type`, None, Some(script), fields)
 
   def apply(field: String, `type`: String, scriptSource: String): RuntimeMapping =
-    RuntimeMapping(field, `type`, Some(Script(scriptSource)))
+    RuntimeMapping(field, `type`, None, Some(Script(scriptSource)))
 
   def apply(field: String, `type`: String, scriptSource: String, fields: Seq[Field]): RuntimeMapping =
-    RuntimeMapping(field, `type`, Some(Script(scriptSource)), fields)
+    RuntimeMapping(field, `type`, None, Some(Script(scriptSource)), fields)
 
   final case class Field(name: String, `type`: String)
 }