-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
167 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
java/src/main/kotlin/org/taymyr/lagom/elasticsearch/search/dsl/query/Order.kt
This file was deleted.
Oops, something went wrong.
104 changes: 104 additions & 0 deletions
104
java/src/main/kotlin/org/taymyr/lagom/elasticsearch/search/dsl/query/Sort.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package org.taymyr.lagom.elasticsearch.search.dsl.query | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonValue | ||
| import com.fasterxml.jackson.core.JsonGenerator | ||
| import com.fasterxml.jackson.databind.JsonSerializer | ||
| import com.fasterxml.jackson.databind.SerializerProvider | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize | ||
| import org.taymyr.lagom.elasticsearch.script.Script | ||
|
|
||
| interface Sort | ||
|
|
||
| @JsonSerialize(using = Order.OrderSerializer::class) | ||
| abstract class Order(private val value: String) : Sort { | ||
|
|
||
| abstract val expr: String | ||
|
|
||
| data class AscOrder(override val expr: String) : Order("asc") | ||
| data class DescOrder(override val expr: String) : Order("desc") | ||
|
|
||
| class OrderSerializer : JsonSerializer<Order>() { | ||
| override fun serialize(value: Order?, gen: JsonGenerator?, serializers: SerializerProvider?) { | ||
| gen?.run { | ||
| value?.let { order -> | ||
| writeStartObject() | ||
| writeObjectField(order.expr, order.value) | ||
| writeEndObject() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmStatic | ||
| fun asc(expr: String) = AscOrder(expr) | ||
|
|
||
| @JvmStatic | ||
| fun desc(expr: String) = DescOrder(expr) | ||
| } | ||
| } | ||
|
|
||
| enum class SortDirection(@JsonValue val value: String) { | ||
| ASC("asc"), DESC("desc") | ||
| } | ||
|
|
||
| enum class SortMode(@JsonValue val value: String) { | ||
| MIN("min"), MAX("max"), SUM("sum"), AVG("avg"), MEDIAN("median") | ||
| } | ||
|
|
||
| data class FieldSortSpec(val order: SortDirection, val mode: SortMode? = null) { | ||
| companion object { | ||
| @JvmOverloads | ||
| @JvmStatic | ||
| fun asc(mode: SortMode? = null) = FieldSortSpec(SortDirection.ASC, mode) | ||
|
|
||
| @JvmOverloads | ||
| @JvmStatic | ||
| fun desc(mode: SortMode? = null) = FieldSortSpec(SortDirection.DESC, mode) | ||
| } | ||
| } | ||
|
|
||
| @JsonSerialize(using = FieldSort.FieldSortSerializer::class) | ||
| data class FieldSort(val field: String, val sort: FieldSortSpec) : Sort { | ||
| class FieldSortSerializer : JsonSerializer<FieldSort>() { | ||
| override fun serialize(value: FieldSort?, gen: JsonGenerator?, serializers: SerializerProvider?) { | ||
| gen?.apply { | ||
| value?.let { | ||
| writeStartObject() | ||
| writeObjectField(it.field, it.sort) | ||
| writeEndObject() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmStatic | ||
| fun fieldSort(field: String, sort: FieldSortSpec) = FieldSort(field, sort) | ||
| } | ||
| } | ||
|
|
||
| @JsonSerialize(using = ScriptSort.ScriptSortSerializer::class) | ||
| data class ScriptSort(val type: String, val script: Script, val order: SortDirection) : Sort { | ||
| class ScriptSortSerializer : JsonSerializer<ScriptSort>() { | ||
| override fun serialize(value: ScriptSort?, gen: JsonGenerator?, serializers: SerializerProvider?) { | ||
| gen?.apply { | ||
| value?.let { | ||
| writeStartObject() | ||
| writeFieldName("_script") | ||
| writeStartObject() | ||
| writeObjectField("type", it.type) | ||
| writeObjectField("script", it.script) | ||
| writeObjectField("order", it.order) | ||
| writeEndObject() | ||
| writeEndObject() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmStatic | ||
| fun scriptSort(type: String, script: Script, order: SortDirection) = ScriptSort(type, script, order) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
java/src/test/resources/org/taymyr/lagom/elasticsearch/search/dsl/request-sort.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "sort": [ | ||
| { "field_a": "asc" }, | ||
| { "field_b": { "order": "asc", "mode": "max" } }, | ||
| { "field_c": { "order": "desc" } }, | ||
| { | ||
| "_script": { | ||
| "type": "number", | ||
| "script": { | ||
| "lang": "painless", | ||
| "source": "doc['field_c'].value == params.a ? 1 : 0", | ||
| "params": { | ||
| "a": "foo" | ||
| } | ||
| }, | ||
| "order": "asc" | ||
| } | ||
| } | ||
| ], | ||
| "query": { | ||
| "match_all": {} | ||
| } | ||
| } |