Start building against Spring Framework 7.0.2 snapshots

See gh-48439
This commit is contained in:
Stéphane Nicoll
2025-12-08 14:54:53 +01:00
parent d306e96c1e
commit a98b36efbb
9 changed files with 11 additions and 16 deletions
@@ -61,7 +61,7 @@ abstract class LenientObjectToEnumConverterFactory<T> implements ConverterFactor
}
@SuppressWarnings("unchecked")
private class LenientToEnumConverter<E extends Enum> implements Converter<T, E> {
private class LenientToEnumConverter<E extends Enum> implements Converter<T, @Nullable E> {
private final Class<E> enumType;
@@ -340,7 +340,7 @@ class ApplicationConversionServiceTests {
}
static class ExampleConverter implements Converter<String, Integer> {
static class ExampleConverter implements Converter<String, @Nullable Integer> {
@Override
public @Nullable Integer convert(String source) {
+1 -1
View File
@@ -20,7 +20,7 @@ mavenVersion=3.9.10
mockitoVersion=5.20.0
nativeBuildToolsVersion=0.11.3
snakeYamlVersion=2.5
springFrameworkVersion=7.0.1
springFrameworkVersion=7.0.2-SNAPSHOT
springFramework60xVersion=6.0.23
tomcatVersion=11.0.14
nullabilityPluginVersion=0.0.8
@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
* @author Stephane Nicoll
* @since 2.0.0
*/
public class IsoOffsetDateTimeConverter implements Converter<String, OffsetDateTime> {
public class IsoOffsetDateTimeConverter implements Converter<String, @Nullable OffsetDateTime> {
@Override
public @Nullable OffsetDateTime convert(String source) {
@@ -142,7 +142,7 @@ class DataCassandraAutoConfigurationTests {
}
static class MyConverter implements Converter<Person, String> {
static class MyConverter implements Converter<Person, @Nullable String> {
@Override
public @Nullable String convert(Person o) {
@@ -183,7 +183,7 @@ class DataElasticsearchAutoConfigurationTests {
}
static class MyConverter implements Converter<ElasticsearchTemplate, Boolean> {
static class MyConverter implements Converter<ElasticsearchTemplate, @Nullable Boolean> {
@Override
public @Nullable Boolean convert(ElasticsearchTemplate source) {
@@ -398,7 +398,7 @@ class DataMongoAutoConfigurationTests {
}
static class MyConverter implements Converter<MongoClient, Boolean> {
static class MyConverter implements Converter<MongoClient, @Nullable Boolean> {
@Override
public @Nullable Boolean convert(MongoClient source) {
@@ -32,8 +32,8 @@ public class SampleGroovyTemplateApplication {
}
@Bean
public Converter<String, Message> messageConverter() {
return new Converter<>() {
public Converter<String, @Nullable Message> messageConverter() {
return new Converter<String, @Nullable Message>() {
@Override
public @Nullable Message convert(String id) {
return messageRepository().findMessage(Long.valueOf(id));
@@ -32,13 +32,8 @@ public class SampleWebUiApplication {
}
@Bean
public Converter<String, Message> messageConverter() {
return new Converter<>() {
@Override
public @Nullable Message convert(String id) {
return messageRepository().findMessage(Long.valueOf(id));
}
};
public Converter<String, @Nullable Message> messageConverter() {
return (id) -> messageRepository().findMessage(Long.valueOf(id));
}
public static void main(String[] args) {