-
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.
Merge pull request #24311 from valfirst
* pr/24311: Polish "Add support for converting String to Pattern" Add support for converting String to Pattern Closes gh-24311
- Loading branch information
Showing
5 changed files
with
123 additions
and
1 deletion.
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
40 changes: 40 additions & 0 deletions
40
...core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java
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,40 @@ | ||
/* | ||
* Copyright 2002-2023 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.core.convert.support; | ||
|
||
import java.util.regex.Pattern; | ||
|
||
import org.springframework.core.convert.converter.Converter; | ||
|
||
/** | ||
* Converts from a String to a {@link java.util.regex.Pattern}. | ||
* | ||
* @author Valery Yatsynovich | ||
* @author Stephane Nicoll | ||
* @since 6.1 | ||
*/ | ||
final class StringToPatternConverter implements Converter<String, Pattern> { | ||
|
||
@Override | ||
public Pattern convert(String source) { | ||
if (source.isEmpty()) { | ||
return null; | ||
} | ||
return Pattern.compile(source); | ||
} | ||
|
||
} |
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) | ||
} | ||
|
||
} |