Polishing.

Reorder methods according to conventions. More speaking names for the newly introduced type lookup methods.

Issue #2517.

Author: odrotbohm

src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java

@@ -142,13 +142,9 @@ public boolean isAssignableFrom(TypeInformation<?> target) {
 	@Nullable
 	protected TypeInformation<?> doGetComponentType() {
 
-		var isCustomMapImplementation = isMap() && !isMapBaseType();
-
-		if (isCustomMapImplementation) {
-			return getRequiredSuperTypeInformation(getMapBaseType()).getComponentType();
-		}
-
-		return createInfo(this.type.getActualTypeArguments()[0]);
+		return isMap() && !isMapBaseType()
+				? getRequiredSuperTypeInformation(getMapBaseType()).getComponentType()
+				: createInfo(this.type.getActualTypeArguments()[0]);
 	}
 
 	@Override

src/main/java/org/springframework/data/util/TypeDiscoverer.java

@@ -470,41 +470,11 @@ private TypeInformation<?> getTypeArgument(Class<?> bound, int index) {
 	}
 
 	protected boolean isMapBaseType() {
-		return isBaseType(MAP_TYPES);
-	}
-
-	private boolean isBaseType(Class<?>[] candidates) {
-
-		Class<S> type = getType();
-
-		for (Class<?> candidate: candidates) {
-			if (candidate.equals(type)) {
-				return true;
-			}
-		}
-
-		return false;
+		return isOneOf(MAP_TYPES);
 	}
 
 	protected Class<?> getMapBaseType() {
-		return getBaseType(MAP_TYPES);
-	}
-
-	private Class<?> getBaseType(Class<?>[] candidates) {
-
-		var type = getType();
-
-		for (var candidate : candidates) {
-			if (candidate.isAssignableFrom(type)) {
-				return candidate;
-			}
-		}
-
-		throw new IllegalArgumentException(String.format("Type %s not contained in candidates %s!", type, candidates));
-	}
-
-	private boolean isNullableWrapper() {
-		return NullableWrapperConverters.supports(getType());
+		return getSuperTypeWithin(MAP_TYPES);
 	}
 
 	@Override
@@ -558,6 +528,52 @@ private boolean isCollection() {
 		return false;
 	}
 
+	/**
+	 * Returns whether the current's raw type is one of the given ones.
+	 *
+	 * @param candidates must not be {@literal null}.
+	 * @return
+	 */
+	private boolean isOneOf(Class<?>[] candidates) {
+
+		Assert.notNull(candidates, "Candidates must not be null!");
+
+		var type = getType();
+
+		for (Class<?> candidate : candidates) {
+			if (candidate.equals(type)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the super type of the current raw type from the given candidates.
+	 *
+	 * @param candidates must not be {@literal null}.
+	 * @return
+	 */
+	private Class<?> getSuperTypeWithin(Class<?>[] candidates) {
+
+		Assert.notNull(candidates, "Candidates must not be null!");
+
+		var type = getType();
+
+		for (Class<?> candidate : candidates) {
+			if (candidate.isAssignableFrom(type)) {
+				return candidate;
+			}
+		}
+
+		throw new IllegalArgumentException(String.format("Type %s not contained in candidates %s!", type, candidates));
+	}
+
+	private boolean isNullableWrapper() {
+		return NullableWrapperConverters.supports(getType());
+	}
+
 	/**
 	 * A synthetic {@link ParameterizedType}.
 	 *

src/test/java/org/springframework/data/util/ParameterizedTypeInformationUnitTests.java

@@ -95,11 +95,11 @@ void resolvesMapTypesCorrectly() {
 		assertThat(propertyType.getMapValueType().getType()).isEqualTo(Locale.class);
 	}
 
-	@Test
+	@Test // #2517
 	void resolvesVavrMapTypesCorrectly() {
 
-		TypeInformation<VavrFoo> type = ClassTypeInformation.from(VavrFoo.class);
-		TypeInformation<?> propertyType = type.getProperty("param");
+		var type = ClassTypeInformation.from(VavrFoo.class);
+		var propertyType = type.getProperty("param");
 
 		assertThat(propertyType.getComponentType().getType()).isEqualTo(Locale.class);
 		assertThat(propertyType.getMapValueType().getType()).isEqualTo(String.class);