diff --git a/core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java b/core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java index 3ee2092506e..15abac18abe 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java @@ -61,7 +61,7 @@ abstract class LenientObjectToEnumConverterFactory implements ConverterFactor } @SuppressWarnings("unchecked") - private class LenientToEnumConverter implements Converter { + private class LenientToEnumConverter implements Converter { private final Class enumType; diff --git a/core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java b/core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java index 505b6e31bfa..c093e4abbf3 100644 --- a/core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java +++ b/core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java @@ -340,7 +340,7 @@ class ApplicationConversionServiceTests { } - static class ExampleConverter implements Converter { + static class ExampleConverter implements Converter { @Override public @Nullable Integer convert(String source) { diff --git a/gradle.properties b/gradle.properties index 2d872004a0e..fd4e4ea6e6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/convert/IsoOffsetDateTimeConverter.java b/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/convert/IsoOffsetDateTimeConverter.java index 02c7cc166de..a552a49ead9 100644 --- a/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/convert/IsoOffsetDateTimeConverter.java +++ b/module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/convert/IsoOffsetDateTimeConverter.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll * @since 2.0.0 */ -public class IsoOffsetDateTimeConverter implements Converter { +public class IsoOffsetDateTimeConverter implements Converter { @Override public @Nullable OffsetDateTime convert(String source) { diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java index d671f9d1524..f4a39cc4a4b 100644 --- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java +++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java @@ -142,7 +142,7 @@ class DataCassandraAutoConfigurationTests { } - static class MyConverter implements Converter { + static class MyConverter implements Converter { @Override public @Nullable String convert(Person o) { diff --git a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java index 2de280eeee7..29bad135eee 100644 --- a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java +++ b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java @@ -183,7 +183,7 @@ class DataElasticsearchAutoConfigurationTests { } - static class MyConverter implements Converter { + static class MyConverter implements Converter { @Override public @Nullable Boolean convert(ElasticsearchTemplate source) { diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java index 88278b8fc26..736689b013e 100644 --- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java +++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java @@ -398,7 +398,7 @@ class DataMongoAutoConfigurationTests { } - static class MyConverter implements Converter { + static class MyConverter implements Converter { @Override public @Nullable Boolean convert(MongoClient source) { diff --git a/smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java b/smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java index ca7a9aaef97..5bbf5d97f91 100644 --- a/smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java +++ b/smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java @@ -32,8 +32,8 @@ public class SampleGroovyTemplateApplication { } @Bean - public Converter messageConverter() { - return new Converter<>() { + public Converter messageConverter() { + return new Converter() { @Override public @Nullable Message convert(String id) { return messageRepository().findMessage(Long.valueOf(id)); diff --git a/smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java b/smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java index d26183ca997..547f4d7fc3a 100644 --- a/smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java +++ b/smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java @@ -32,13 +32,8 @@ public class SampleWebUiApplication { } @Bean - public Converter messageConverter() { - return new Converter<>() { - @Override - public @Nullable Message convert(String id) { - return messageRepository().findMessage(Long.valueOf(id)); - } - }; + public Converter messageConverter() { + return (id) -> messageRepository().findMessage(Long.valueOf(id)); } public static void main(String[] args) {