Browse Source

Start building against Spring Framework 7.0.2 snapshots

See gh-48439
pull/48480/head
Stéphane Nicoll 1 week ago
parent
commit
a98b36efbb
  1. 2
      core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java
  2. 2
      core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java
  3. 2
      gradle.properties
  4. 2
      module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/convert/IsoOffsetDateTimeConverter.java
  5. 2
      module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java
  6. 2
      module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java
  7. 2
      module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
  8. 4
      smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java
  9. 9
      smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java

2
core/spring-boot/src/main/java/org/springframework/boot/convert/LenientObjectToEnumConverterFactory.java

@ -61,7 +61,7 @@ abstract class LenientObjectToEnumConverterFactory<T> implements ConverterFactor @@ -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;

2
core/spring-boot/src/test/java/org/springframework/boot/convert/ApplicationConversionServiceTests.java

@ -340,7 +340,7 @@ class ApplicationConversionServiceTests { @@ -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) {

2
gradle.properties

@ -20,7 +20,7 @@ mavenVersion=3.9.10 @@ -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

2
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; @@ -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) {

2
module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java

@ -142,7 +142,7 @@ class DataCassandraAutoConfigurationTests { @@ -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) {

2
module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java

@ -183,7 +183,7 @@ class DataElasticsearchAutoConfigurationTests { @@ -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) {

2
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java

@ -398,7 +398,7 @@ class DataMongoAutoConfigurationTests { @@ -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) {

4
smoke-test/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java

@ -32,8 +32,8 @@ public class SampleGroovyTemplateApplication { @@ -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));

9
smoke-test/spring-boot-smoke-test-web-thymeleaf/src/main/java/smoketest/web/thymeleaf/SampleWebUiApplication.java

@ -32,13 +32,8 @@ public class SampleWebUiApplication { @@ -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) {

Loading…
Cancel
Save