diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java index 7b126b61cbb..ea96f3ce4fd 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java @@ -29,12 +29,13 @@ import org.springframework.util.Assert; * * @author Keith Donald * @author Josh Cummings + * @author Sebastien Deleuze * @since 3.0 * @param the source type - * @param the target type + * @param the target type (potentially {@code null}) */ @FunctionalInterface -public interface Converter { +public interface Converter { /** * Convert the source object of type {@code S} to target type {@code T}. @@ -42,7 +43,7 @@ public interface Converter { * @return the converted object, which must be an instance of {@code T} (potentially {@code null}) * @throws IllegalArgumentException if the source cannot be converted to the desired target type */ - @Nullable T convert(S source); + T convert(S source); /** * Construct a composed {@link Converter} that first applies this {@link Converter} @@ -56,7 +57,7 @@ public interface Converter { * and then applies the {@code after} {@link Converter} * @since 5.3 */ - default Converter andThen(Converter after) { + default Converter andThen(Converter after) { Assert.notNull(after, "'after' Converter must not be null"); return (S s) -> { T initialResult = convert(s); diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java index b7e368487bb..06498229094 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java @@ -107,7 +107,7 @@ public class ConvertingComparator implements Comparator { /** * Adapts a {@link ConversionService} and {@code targetType} to a {@link Converter}. */ - private static class ConversionServiceConverter implements Converter { + private static class ConversionServiceConverter implements Converter { private final ConversionService conversionService; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java index beeb69588ec..2b831f55f8b 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java @@ -31,7 +31,7 @@ import org.springframework.core.convert.converter.Converter; * @author Sam Brannen * @since 3.0 */ -final class StringToBooleanConverter implements Converter { +final class StringToBooleanConverter implements Converter { private static final Set trueValues = Set.of("true", "on", "yes", "1"); diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java index e508a3e2088..047e3ad7999 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java @@ -26,7 +26,7 @@ import org.springframework.core.convert.converter.Converter; * @author Keith Donald * @since 3.0 */ -final class StringToCharacterConverter implements Converter { +final class StringToCharacterConverter implements Converter { @Override public @Nullable Character convert(String source) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java index 15711439e8c..f544317a453 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java @@ -37,7 +37,7 @@ final class StringToEnumConverterFactory implements ConverterFactory implements Converter { + private static class StringToEnum implements Converter { private final Class enumType; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java index e42e97554af..d8137b0eeca 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; * @since 3.0 * @see StringUtils#parseLocale */ -final class StringToLocaleConverter implements Converter { +final class StringToLocaleConverter implements Converter { @Override public @Nullable Locale convert(String source) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java index f66208d25e1..e450803e904 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java @@ -48,7 +48,7 @@ final class StringToNumberConverterFactory implements ConverterFactory implements Converter { + private static final class StringToNumber implements Converter { private final Class targetType; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java index 83de478a102..b3936c25d38 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPatternConverter.java @@ -29,7 +29,7 @@ import org.springframework.core.convert.converter.Converter; * @author Stephane Nicoll * @since 6.1 */ -final class StringToPatternConverter implements Converter { +final class StringToPatternConverter implements Converter { @Override public @Nullable Pattern convert(String source) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToRegexConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToRegexConverter.java index e04d6ebbac4..c1f85b10337 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToRegexConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToRegexConverter.java @@ -28,7 +28,7 @@ import org.springframework.core.convert.converter.Converter; * @author Sebastien Deleuze * @since 6.1 */ -final class StringToRegexConverter implements Converter { +final class StringToRegexConverter implements Converter { @Override public @Nullable Regex convert(String source) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java index 600f6191ebe..be0adf39536 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; * @since 3.2 * @see UUID#fromString */ -final class StringToUUIDConverter implements Converter { +final class StringToUUIDConverter implements Converter { @Override public @Nullable UUID convert(String source) {