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

Author: snicoll

spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * 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.
@@ -20,7 +20,9 @@
 import java.util.Currency;
 import java.util.Locale;
 import java.util.UUID;
+import java.util.regex.Pattern;
 
+import org.springframework.core.KotlinDetector;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.ConverterRegistry;
 import org.springframework.lang.Nullable;
@@ -166,6 +168,14 @@ private static void addScalarConverters(ConverterRegistry converterRegistry) {
 
 		converterRegistry.addConverter(new StringToUUIDConverter());
 		converterRegistry.addConverter(UUID.class, String.class, new ObjectToStringConverter());
+
+		converterRegistry.addConverter(new StringToPatternConverter());
+		converterRegistry.addConverter(Pattern.class, String.class, new ObjectToStringConverter());
+
+		if (KotlinDetector.isKotlinPresent()) {
+			converterRegistry.addConverter(new StringToRegexConverter());
+			converterRegistry.addConverter(kotlin.text.Regex.class, String.class, new ObjectToStringConverter());
+		}
 	}
 
 }

spring-core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java

@@ -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);
+	}
+
+}

spring-core/src/main/kotlin/org/springframework/core/convert/support/StringToRegexConverter.kt

@@ -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()
+	}
+
+}

spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java

@@ -40,6 +40,7 @@
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -318,6 +319,24 @@ void uuidToStringAndStringToUuid() {
 		assertThat(convertToUUID).isEqualTo(uuid);
 	}
 
+	@Test
+	void stringToPatternEmptyString() {
+		assertThat(conversionService.convert("", Pattern.class)).isNull();
+	}
+
+	@Test
+	void stringToPattern() {
+		String pattern = "\\s";
+		assertThat(conversionService.convert(pattern, Pattern.class))
+				.isInstanceOfSatisfying(Pattern.class, regex -> assertThat(regex.pattern()).isEqualTo(pattern));
+	}
+
+	@Test
+	void patternToString() {
+		String regex = "\\d";
+		assertThat(conversionService.convert(Pattern.compile(regex), String.class)).isEqualTo(regex);
+	}
+
 	@Test
 	void numberToNumber() {
 		assertThat(conversionService.convert(1, Long.class)).isEqualTo(Long.valueOf(1));

spring-core/src/test/kotlin/org/springframework/core/convert/support/DefaultConversionServiceKotlinTests.kt

@@ -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)
+	}
+
+}