Skip to content

Commit bbaca63

Browse files
authored
Merge branch 'develop' into feature/query-rule-alternative
2 parents 7f73c68 + c27e841 commit bbaca63

File tree

7 files changed

+26
-6
lines changed

7 files changed

+26
-6
lines changed

src/commonMain/kotlin/com/algolia/search/model/settings/Settings.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,18 @@ public data class Settings(
357357
/**
358358
* Lets you store custom data in your indices.
359359
*/
360-
@SerialName(KeyUserData) var userData: JsonObject? = null
360+
@SerialName(KeyUserData) var userData: JsonObject? = null,
361+
/**
362+
* This parameter configures the segmentation of text at indexing time.
363+
* Accepted value: [Language.Japanese]
364+
* Input data to index is treated as the given language(s) for segmentation.
365+
*/
366+
@SerialName(KeyIndexLanguages) var indexLanguages: List<Language>? = null
361367
) {
362368

363369
/**
364370
* This parameter keeps track of which primary index (if any) a replica is connected to.
365371
*/
366-
@SerialName(KeyPrimary) val primary: IndexName? = null
367-
}
372+
@SerialName(KeyPrimary)
373+
val primary: IndexName? = null
374+
}

src/commonMain/kotlin/com/algolia/search/model/settings/SettingsKey.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,9 @@ public sealed class SettingsKey(override val raw: String) : Raw<String> {
104104

105105
public object MaxFacetHits : SettingsKey(KeyMaxFacetHits)
106106

107+
public object UserData: SettingsKey(KeyUserData)
108+
109+
public object IndexLanguages: SettingsKey(KeyIndexLanguages)
110+
107111
public data class Other(override val raw: String) : SettingsKey(raw)
108112
}

src/commonMain/kotlin/com/algolia/search/serialize/Keys.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,4 +362,5 @@ public const val KeySuburb = "suburb"
362362
public const val KeyVillage = "village"
363363
public const val KeySimilarQuery = "similarQuery"
364364
public const val KeyEnableABTest = "enableABTest"
365-
public const val KeyAlternatives = "alternatives"
365+
public const val KeyAlternatives = "alternatives"
366+
public const val KeyIndexLanguages = "indexLanguages"

src/commonTest/kotlin/model/settings/TestSettingsKey.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,7 @@ internal class TestSettingsKey {
5757
MinProximity.raw shouldEqual KeyMinProximity
5858
ResponseFields.raw shouldEqual KeyResponseFields
5959
MaxFacetHits.raw shouldEqual KeyMaxFacetHits
60+
IndexLanguages.raw shouldEqual KeyIndexLanguages
61+
UserData.raw shouldEqual KeyUserData
6062
}
6163
}

src/commonTest/kotlin/serialize/TestKeys.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,5 +354,6 @@ internal class TestKeys {
354354
KeySimilarQuery shouldEqual "similarQuery"
355355
KeyEnableABTest shouldEqual "enableABTest"
356356
KeyAlternatives shouldEqual "alternatives"
357+
KeyIndexLanguages shouldEqual "indexLanguages"
357358
}
358359
}

src/commonTest/kotlin/serialize/settings/TestSettings.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ internal class TestSettings : TestSerializer<Settings>(Settings.serializer()) {
8484
maxFacetHits = int,
8585
version = int,
8686
advancedSyntaxFeatures = listOf(AdvancedSyntaxFeatures.ExcludeWords, AdvancedSyntaxFeatures.ExactPhrase),
87-
userData = json { unknown to unknown }
87+
userData = json { unknown to unknown },
88+
indexLanguages = listOf(Language.Japanese)
8889
) to json {
8990
// Attributes
9091
KeySearchableAttributes to attributesJson
@@ -154,6 +155,7 @@ internal class TestSettings : TestSerializer<Settings>(Settings.serializer()) {
154155
KeyVersion to int
155156
KeyUserData to json { unknown to unknown }
156157
KeyPrimary to JsonNull
158+
KeyIndexLanguages to jsonArray { +Language.Japanese.raw }
157159
}
158160
)
159161

src/commonTest/resources/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,8 @@
113113
"hitsPerPage"
114114
],
115115
"maxFacetHits": 100,
116-
"version": 1
116+
"version": 1,
117+
"indexLanguages": [
118+
"ja"
119+
]
117120
}

0 commit comments

Comments
 (0)