Retain subclass fields over masked superclass fields in TypeDiscoverer

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons</artifactId>
-	<version>4.2.0-SNAPSHOT</version>
+	<version>4.2.0-GH-3500-SNAPSHOT</version>
 
 	<name>Spring Data Core</name>
 	<description>Core Spring concepts underpinning every Spring Data module.</description>

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

@@ -407,8 +407,11 @@ private Map<String, TypeInformation<?>> doGetProperties() {
 
 		Map<String, TypeInformation<?>> result = new HashMap<>();
 		Class<?> type = getType();
-		FieldCallback callback = field -> result.put(field.getName(),
-				TypeInformation.of(ResolvableType.forField(field, resolvableType)));
+		FieldCallback callback = field -> {
+			if (!result.containsKey(field.getName())) {
+				result.put(field.getName(), TypeInformation.of(ResolvableType.forField(field, resolvableType)));
+			}
+		};
 
 		// Inspect fields first
 		ReflectionUtils.doWithFields(type, callback);

src/test/java/org/springframework/data/core/TypeDiscovererUnitTests.java

@@ -379,6 +379,14 @@ void considersNestedGenericsInEqualityForRecursiveUnresolvableTypes() throws Exc
 		assertThat(domainType.isAssignableFrom(actualType)).isTrue();
 	}
 
+	@Test // GH-3500
+	void superclassFieldsDoNotHideSubclassFields() {
+
+		TypeDiscoverer<?> discoverer = TypeDiscoverer.ofCached(ResolvableType.forClass(TheOne.class));
+
+		assertThat(discoverer.getProperty("theOne").getType()).isEqualTo(String.class);
+	}
+
 	class Person {
 
 		Addresses addresses;
@@ -487,6 +495,16 @@ static abstract class SomeType<Self extends SomeType<Self>> {
 
 	}
 
+	static class SuperclassWithProperties {
+		private CharSequence theOne;
+		private String theOther;
+	}
+
+	class TheOne extends SuperclassWithProperties {
+		private String theOne;
+	}
+
+
 	@SuppressWarnings("rawtypes")
 	interface RepoWithRawGenerics extends Repository<SomeType, SomeType> {