diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
index d46379be33..573339edf9 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
@@ -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);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
index 9972390b21..d304bff3ba 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
@@ -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)) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Ssl.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Ssl.java
index bb17e6a26c..976c005a0e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Ssl.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Ssl.java
@@ -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) {
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 b875d304a7..9ba175996d 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
@@ -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) {