root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2024-07-22 18:08:19 +01:00
parent a10b000119
commit ff1a4654d2
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
View File

@ -79,7 +79,7 @@ class MapBinder extends AggregateBinder<Map<Object, Object>> {
private Map<Object, Object> createMap(Bindable<?> target) {
Class<?> mapType = (target.getValue() != null) ? Map.class : target.getType().resolve(Object.class);
if (EnumMap.class.isAssignableFrom(mapType)) {
Class<?> keyType = target.getType().asMap().getGeneric(0).resolve();
Class<?> keyType = target.getType().asMap().resolveGeneric(0);
return CollectionFactory.createMap(mapType, keyType, 0);
}
return CollectionFactory.createMap(mapType, 0);

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
View File

@ -158,7 +158,7 @@ class ValueObjectBinder implements DataObjectBinder {
return (T) CollectionFactory.createCollection(resolved, 0);
}
if (EnumMap.class.isAssignableFrom(resolved)) {
Class<?> keyType = type.asMap().getGeneric(0).resolve();
Class<?> keyType = type.asMap().resolveGeneric(0);
return (T) CollectionFactory.createMap(resolved, keyType, 0);
}
if (Map.class.isAssignableFrom(resolved)) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Ssl.java
View File

@ -318,7 +318,7 @@ public class Ssl {
/**
* Returns if SSL is enabled for the given instance.
* @param ssl the {@link Ssl SSL} instance or {@code null}
* @return {@code true} is SSL is enabled
* @return {@code true} if SSL is enabled
* @since 3.1.0
*/
public static boolean isEnabled(Ssl ssl) {

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
View File

@ -649,7 +649,6 @@ class MapBinderTests {
Binder binder = new Binder(this.sources, null, null, null);
EnumMap<ExampleEnum, String> result = binder.bind("props", EXAMPLE_ENUM_STRING_ENUM_MAP).get();
assertThat(result).hasSize(1).containsEntry(ExampleEnum.FOO_BAR, "value");
}
private <K, V> Bindable<Map<K, V>> getMapBindable(Class<K> keyGeneric, ResolvableType valueType) {