-
Notifications
You must be signed in to change notification settings - Fork 37.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Polish "Add support for converting String to Pattern"
See gh-24311
- Loading branch information
Showing
5 changed files
with
76 additions
and
7 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
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
19 changes: 19 additions & 0 deletions
19
...g-core/src/main/kotlin/org/springframework/core/convert/support/StringToRegexConverter.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,19 @@ | ||
package org.springframework.core.convert.support | ||
|
||
import org.springframework.core.convert.converter.Converter | ||
|
||
/** | ||
* Converts from a String to a [Regex]. | ||
* | ||
* @author Stephane Nicoll | ||
*/ | ||
class StringToRegexConverter : Converter<String, Regex> { | ||
|
||
override fun convert(source: String): Regex? { | ||
if (source.isEmpty()) { | ||
return null | ||
} | ||
return source.toRegex() | ||
} | ||
|
||
} |
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
34 changes: 34 additions & 0 deletions
34
...st/kotlin/org/springframework/core/convert/support/DefaultConversionServiceKotlinTests.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,34 @@ | ||
package org.springframework.core.convert.support | ||
|
||
import org.assertj.core.api.Assertions.assertThat | ||
import org.junit.jupiter.api.Test | ||
|
||
/** | ||
* Tests for Kotlin support in [DefaultConversionService]. | ||
* | ||
* @author Stephane Nicoll | ||
*/ | ||
class DefaultConversionServiceKotlinTests { | ||
|
||
private val conversionService = DefaultConversionService() | ||
|
||
@Test | ||
fun stringToRegexEmptyString() { | ||
assertThat(conversionService.convert("", Regex::class.java)).isNull(); | ||
} | ||
|
||
@Test | ||
fun stringToRegex() { | ||
val pattern = "\\w+" | ||
assertThat(conversionService.convert(pattern, Regex::class.java)).isInstanceOfSatisfying( | ||
Regex::class.java | ||
) { regex -> assertThat(regex.pattern).isEqualTo(pattern) } | ||
} | ||
|
||
@Test | ||
fun regexToString() { | ||
val pattern = "\\w+" | ||
assertThat(conversionService.convert(pattern.toRegex(), String::class.java)).isEqualTo(pattern) | ||
} | ||
|
||
} |