From 02e25698833771825fd1b786442697fa4612ed66 Mon Sep 17 00:00:00 2001 From: Jilles van Gurp Date: Sat, 16 Mar 2024 14:47:08 +0100 Subject: [PATCH] use external json-dsl instead of the now obsolete internal one that we removed It was still using the previous version via gradle. Some minor fixes due to minor API changes with JsonDsl.property --- build.gradle.kts | 2 +- docs/build.gradle.kts | 2 +- search-client/build.gradle.kts | 2 +- .../kotlin/com/jillesvangurp/ktsearch/aliases.kt | 2 +- .../commonMain/kotlin/com/jillesvangurp/ktsearch/ilm.kt | 6 +++--- .../kotlin/com/jillesvangurp/ktsearch/index-templates.kt | 8 ++++---- search-dsls/build.gradle.kts | 2 +- .../com/jillesvangurp/searchdsls/querydsl/geo-queries.kt | 2 +- .../jillesvangurp/searchdsls/querydsl/highlight-dsl.kt | 2 +- versions.properties | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e292b083..b8aa7d41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ allprojects { mavenCentral() maven("https://maven.tryformation.com/releases") { content { - includeGroup("com.jillesvangurp") + includeGroup("com.github.jillesvangurp") } } } diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts index 04a903c7..06c7fd78 100644 --- a/docs/build.gradle.kts +++ b/docs/build.gradle.kts @@ -37,7 +37,7 @@ val searchEngine: String = getProperty("searchEngine", "es-7").toString() dependencies { testImplementation(project(":search-dsls")) testImplementation(project(":search-client")) - testImplementation("com.jillesvangurp:json-dsl:_") + testImplementation("com.github.jillesvangurp:json-dsl:_") testImplementation(Kotlin.stdlib.jdk8) testImplementation(KotlinX.coroutines.jdk8) diff --git a/search-client/build.gradle.kts b/search-client/build.gradle.kts index a4ed6253..bd5ac9fd 100644 --- a/search-client/build.gradle.kts +++ b/search-client/build.gradle.kts @@ -92,7 +92,7 @@ kotlin { dependencies { api(kotlin("stdlib-common", "_")) api(project(":search-dsls")) - api("com.jillesvangurp:json-dsl:_") + api("com.github.jillesvangurp:json-dsl:_") api(KotlinX.datetime) implementation(Ktor.client.core) api(KotlinX.coroutines.core) diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/aliases.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/aliases.kt index 3ef7f531..eeebda6e 100644 --- a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/aliases.kt +++ b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/aliases.kt @@ -19,7 +19,7 @@ class AliasAction: JsonDsl() { } class AliasUpdateRequest: JsonDsl() { - private var actions by property(mutableListOf()) + private var actions by property("actions",mutableListOf()) fun add(block: AliasAction.()->Unit) { actions.add(withJsonDsl { this["add"] =AliasAction().apply(block) diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/ilm.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/ilm.kt index 88718768..7e40df55 100644 --- a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/ilm.kt +++ b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/ilm.kt @@ -49,7 +49,7 @@ class ILMPhaseConfiguration : JsonDsl() { } } } - var actions by property(defaultValue = ILMActions()) + var actions by property("actions",defaultValue = ILMActions()) fun actions(block: ILMActions.() -> Unit) { actions.apply(block) @@ -76,11 +76,11 @@ class IMLPhases : JsonDsl() { } class IMLPolicy : JsonDsl() { - var phases by property(defaultValue = IMLPhases()) + var phases by property("phases",defaultValue = IMLPhases()) } class ILMConfiguration: JsonDsl() { - var policy by property(defaultValue = IMLPolicy()) + var policy by property("policy",defaultValue = IMLPolicy()) } suspend fun SearchClient.setIlmPolicy(policyId: String, block: IMLPhases.()->Unit): AcknowledgedResponse { diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/index-templates.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/index-templates.kt index d6d00a42..b41b3dc8 100644 --- a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/index-templates.kt +++ b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/index-templates.kt @@ -8,7 +8,7 @@ import com.jillesvangurp.searchdsls.mappingdsl.IndexSettingsAndMappingsDSL import kotlinx.serialization.json.JsonObject class ComponentTemplate: JsonDsl() { - var template by property(defaultValue = IndexSettingsAndMappingsDSL()) + var template by property("template",defaultValue = IndexSettingsAndMappingsDSL()) } suspend fun SearchClient.updateComponentTemplate(templateId: String, block: IndexSettingsAndMappingsDSL.()->Unit): JsonObject { @@ -27,10 +27,10 @@ suspend fun SearchClient.deleteComponentTemplate(templateId: String): JsonObject } class IndexTemplate: JsonDsl() { - var indexPatterns by property(defaultValue = listOf()) + var indexPatterns by property("index_patterns",defaultValue = listOf()) var dataStream by property() - var composedOf by property(defaultValue = listOf()) - var priority by property(defaultValue = 300) + var composedOf by property("composed_of",defaultValue = listOf()) + var priority by property("priority",defaultValue = 300) var meta by property>(customPropertyName = "_meta") } diff --git a/search-dsls/build.gradle.kts b/search-dsls/build.gradle.kts index 38f72f93..74b0f877 100644 --- a/search-dsls/build.gradle.kts +++ b/search-dsls/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { commonMain { dependencies { implementation(kotlin("stdlib-common", "_")) - implementation("com.jillesvangurp:json-dsl:_") + implementation("com.github.jillesvangurp:json-dsl:_") } } diff --git a/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/geo-queries.kt b/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/geo-queries.kt index b7740a37..651bbc81 100644 --- a/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/geo-queries.kt +++ b/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/geo-queries.kt @@ -185,7 +185,7 @@ class GeoShapeQueryConfig : JsonDsl() { fun shape(rawJson: String) { this["shape"] = RawJson(rawJson) } - var relation by property(defaultValue = GeoShapeQuery.Relation.intersects) + var relation by property("relation", GeoShapeQuery.Relation.intersects) } class GeoShapeQuery(val field: String, block: GeoShapeQueryConfig.() -> Unit) : ESQuery("geo_shape") { diff --git a/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/highlight-dsl.kt b/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/highlight-dsl.kt index e8285c1f..e880c7af 100644 --- a/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/highlight-dsl.kt +++ b/search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/querydsl/highlight-dsl.kt @@ -57,7 +57,7 @@ open class Field(name: String) : ESQuery(name) { var boundaryScanner by queryDetails.property() var boundaryScannerLocale by queryDetails.property() var encoder by queryDetails.property() - var fragmenter by queryDetails.property(Fragmenter.span) + var fragmenter by queryDetails.property("fragmenter",Fragmenter.span) var fragmentOffset by queryDetails.property() var fragmentSize by queryDetails.property() diff --git a/versions.properties b/versions.properties index 36d53726..5cfaa5a8 100644 --- a/versions.properties +++ b/versions.properties @@ -15,9 +15,9 @@ version.ch.qos.logback..logback-classic=1.5.3 version.com.github.doyaaaaaken..kotlin-csv=1.9.3 -version.com.github.jillesvangurp..kotlin4example=1.1.5 +version.com.github.jillesvangurp..json-dsl=1.2.2 -version.com.jillesvangurp..json-dsl=2.1.22 +version.com.github.jillesvangurp..kotlin4example=1.1.5 version.io.github.microutils..kotlin-logging=3.0.5 ## # available=4.0.0-beta-1