Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JAVA-5774 Allow all property types for Filter.regex() #1619

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

JAVA-5774 Allow all property types for Filter.regex() #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9f235b
JAVA-5774 Allow all property types for Filter.regex()
Jan 29, 2025
ebe9601
JAVA-5774 Add a test do describe the use case for using the regex fil…
Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions driver-kotlin-extensions/src/main/kotlin/com/mongodb/kotlin/client/model/Filters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexExt")
public infix fun KProperty<String?>.regex(pattern: String): Bson = Filters.regex(path(), pattern)
public infix fun <T> KProperty<T?>.regex(pattern: String): Bson = Filters.regex(path(), pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -444,7 +444,7 @@ public object Filters {
* @param pattern the pattern
* @return the filter
*/
public fun regex(property: KProperty<String?>, pattern: String): Bson = property.regex(pattern)
public fun <T> regex(property: KProperty<T?>, pattern: String): Bson = property.regex(pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -455,7 +455,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexExt")
public infix fun KProperty<String?>.regex(pattern: Pattern): Bson = Filters.regex(path(), pattern)
public infix fun <T> KProperty<T?>.regex(pattern: Pattern): Bson = Filters.regex(path(), pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -465,7 +465,7 @@ public object Filters {
* @param pattern the pattern
* @return the filter
*/
public fun regex(property: KProperty<String?>, pattern: Pattern): Bson = property.regex(pattern)
public fun <T> regex(property: KProperty<T?>, pattern: Pattern): Bson = property.regex(pattern)

/**
* Creates a filter that matches all documents where the value of the option matches the given regular expression
Expand All @@ -477,7 +477,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexExt")
public fun KProperty<String?>.regex(pattern: String, options: String): Bson =
public fun <T> KProperty<T?>.regex(pattern: String, options: String): Bson =
Filters.regex(path(), pattern, options)

/**
Expand All @@ -489,7 +489,7 @@ public object Filters {
* @param options the options
* @return the filter
*/
public fun regex(property: KProperty<String?>, pattern: String, options: String): Bson =
public fun <T> regex(property: KProperty<T?>, pattern: String, options: String): Bson =
property.regex(pattern, options)

/**
Expand All @@ -501,7 +501,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexExt")
public infix fun KProperty<String?>.regex(regex: Regex): Bson = Filters.regex(path(), regex.toPattern())
public infix fun <T> KProperty<T?>.regex(regex: Regex): Bson = Filters.regex(path(), regex.toPattern())

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -511,7 +511,7 @@ public object Filters {
* @param regex the regex
* @return the filter
*/
public fun regex(property: KProperty<String?>, regex: Regex): Bson = property.regex(regex.toPattern())
public fun <T> regex(property: KProperty<T?>, regex: Regex): Bson = property.regex(regex.toPattern())

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -522,7 +522,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterableExt")
public infix fun KProperty<Iterable<String?>>.regex(pattern: String): Bson = Filters.regex(path(), pattern)
public infix fun <T> KProperty<Iterable<T?>>.regex(pattern: String): Bson = Filters.regex(path(), pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -534,7 +534,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterable")
public fun regex(property: KProperty<Iterable<String?>>, pattern: String): Bson = property.regex(pattern)
public fun <T> regex(property: KProperty<Iterable<T?>>, pattern: String): Bson = property.regex(pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -545,7 +545,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterableExt")
public infix fun KProperty<Iterable<String?>>.regex(pattern: Pattern): Bson = Filters.regex(path(), pattern)
public infix fun <T> KProperty<Iterable<T?>>.regex(pattern: Pattern): Bson = Filters.regex(path(), pattern)

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -557,7 +557,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterable")
public fun regex(property: KProperty<Iterable<String?>>, pattern: Pattern): Bson = property.regex(pattern)
public fun <T> regex(property: KProperty<Iterable<T?>>, pattern: Pattern): Bson = property.regex(pattern)

/**
* Creates a filter that matches all documents where the value of the option matches the given regular expression
Expand All @@ -569,7 +569,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterableExt")
public fun KProperty<Iterable<String?>>.regex(regex: String, options: String): Bson =
public fun <T> KProperty<Iterable<T?>>.regex(regex: String, options: String): Bson =
Filters.regex(path(), regex, options)

/**
Expand All @@ -583,7 +583,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterable")
public fun regex(property: KProperty<Iterable<String?>>, regex: String, options: String): Bson =
public fun <T> regex(property: KProperty<Iterable<T?>>, regex: String, options: String): Bson =
property.regex(regex, options)

/**
Expand All @@ -595,7 +595,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterableExt")
public infix fun KProperty<Iterable<String?>>.regex(regex: Regex): Bson = Filters.regex(path(), regex.toPattern())
public infix fun <T> KProperty<Iterable<T?>>.regex(regex: Regex): Bson = Filters.regex(path(), regex.toPattern())

/**
* Creates a filter that matches all documents where the value of the property matches the given regular expression
Expand All @@ -607,7 +607,7 @@ public object Filters {
*/
@JvmSynthetic
@JvmName("regexIterable")
public fun regex(property: KProperty<Iterable<String?>>, regex: Regex): Bson = property.regex(regex.toPattern())
public fun <T> regex(property: KProperty<Iterable<T?>>, regex: Regex): Bson = property.regex(regex.toPattern())

/**
* Creates a filter that matches all documents matching the given the search term with the given text search
Expand Down
13 changes: 13 additions & 0 deletions driver-kotlin-extensions/src/test/kotlin/com/mongodb/kotlin/client/model/FiltersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class FiltersTest {
data class Person(val name: String, val age: Int, val address: List<String>, val results: List<Int>)
val person = Person("Ada", 20, listOf("St James Square", "London", "W1"), listOf(1, 2, 3))

@JvmInline
value class Name(val value: String)
data class PersonWithValueClass(val name: Name, val age: Int, val address: List<String>, val results: List<Int>)

@Test
fun testEqSupport() {
val expected = BsonDocument.parse("""{"name": "Ada"}""")
Expand Down Expand Up @@ -427,6 +431,15 @@ class FiltersTest {

kmongoDsl = Person::address.regex(pattern.toRegex(RegexOption.IGNORE_CASE).toPattern())
assertEquals(expected, kmongoDsl.document)

// Filter on a value class
expected = BsonDocument.parse("""{"name": {"${'$'}regex": "$pattern", ${'$'}options : ""}}}""")

bson = regex(PersonWithValueClass::name, pattern)
assertEquals(expected, bson.document)

kmongoDsl = PersonWithValueClass::name.regex(pattern)
assertEquals(expected, kmongoDsl.document)
}

@Test
Expand Down