diff --git a/gradle.properties b/gradle.properties index 578a23b82ad..a11945935df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.22 -springFrameworkVersion=6.0.9 +springFrameworkVersion=6.0.10-SNAPSHOT tomcatVersion=10.1.8 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java index c15ae41b818..7b86c969206 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java @@ -24,7 +24,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.SortedMap; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; @@ -245,7 +244,7 @@ class MapBinderTests { existing.put("baz", 1001); Bindable> target = STRING_INTEGER_MAP.withExistingValue(existing); Map result = this.binder.bind("foo", target).get(); - assertThat(result).isInstanceOf(HashMap.class); + assertThat(result).isExactlyInstanceOf(HashMap.class); assertThat(result).hasSize(2); assertThat(result).containsEntry("bar", 1); assertThat(result).containsEntry("baz", 1001); @@ -254,10 +253,10 @@ class MapBinderTests { @Test void bindToMapShouldRespectMapType() { this.sources.add(new MockConfigurationPropertySource("foo.bar", "1")); - ResolvableType type = ResolvableType.forClassWithGenerics(SortedMap.class, String.class, Integer.class); + ResolvableType type = ResolvableType.forClassWithGenerics(HashMap.class, String.class, Integer.class); Object defaultMap = this.binder.bind("foo", STRING_INTEGER_MAP).get(); Object customMap = this.binder.bind("foo", Bindable.of(type)).get(); - assertThat(customMap).isInstanceOf(SortedMap.class).isNotInstanceOf(defaultMap.getClass()); + assertThat(customMap).isExactlyInstanceOf(HashMap.class).isNotInstanceOf(defaultMap.getClass()); } @Test