Remove own class reading infrastructure in favor of extensions to AnnotationMetadata.

We now remove fully our own class-reading visitors as AnnotationMetadata exposes getDeclaredMethods.
MethodsMetadataReaderFactory and MethodsMetadataReader remain deprecated bridging return types to retain backward compatibility.

Closes #2520

Author: mp911de

src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java

@@ -31,9 +31,9 @@
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.log.LogMessage;
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.MethodMetadata;
-import org.springframework.data.type.MethodsMetadata;
-import org.springframework.data.type.classreading.MethodsMetadataReaderFactory;
+import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -133,7 +133,7 @@ private static class PropertyDescriptorSource {
 		private static final Log logger = LogFactory.getLog(PropertyDescriptorSource.class);
 
 		private final Class<?> type;
-		private final Optional<MethodsMetadata> metadata;
+		private final Optional<AnnotationMetadata> metadata;
 
 		/**
 		 * Creates a new {@link PropertyDescriptorSource} for the given type.
@@ -179,15 +179,15 @@ private Stream<PropertyDescriptor> collectDescriptors() {
 		}
 
 		/**
-		 * Returns a {@link Stream} of {@link PropertyDescriptor} ordered following the given {@link MethodsMetadata} only
-		 * returning methods seen by the given {@link MethodsMetadata}.
+		 * Returns a {@link Stream} of {@link PropertyDescriptor} ordered following the given {@link AnnotationMetadata}
+		 * only returning methods seen by the given {@link AnnotationMetadata}.
 		 *
 		 * @param source must not be {@literal null}.
 		 * @param metadata must not be {@literal null}.
 		 * @return
 		 */
 		private static Stream<PropertyDescriptor> filterAndOrder(Stream<PropertyDescriptor> source,
-				MethodsMetadata metadata) {
+				AnnotationMetadata metadata) {
 
 			var orderedMethods = getMethodOrder(metadata);
 
@@ -201,12 +201,12 @@ private static Stream<PropertyDescriptor> filterAndOrder(Stream<PropertyDescript
 		}
 
 		/**
-		 * Returns a {@link Stream} of interfaces using the given {@link MethodsMetadata} as primary source for ordering.
+		 * Returns a {@link Stream} of interfaces using the given {@link AnnotationMetadata} as primary source for ordering.
 		 *
 		 * @param metadata must not be {@literal null}.
 		 * @return
 		 */
-		private Stream<Class<?>> fromMetadata(MethodsMetadata metadata) {
+		private Stream<Class<?>> fromMetadata(AnnotationMetadata metadata) {
 			return Arrays.stream(metadata.getInterfaceNames()).map(it -> findType(it, type.getInterfaces()));
 		}
 
@@ -220,20 +220,20 @@ private Stream<Class<?>> fromType() {
 		}
 
 		/**
-		 * Attempts to obtain {@link MethodsMetadata} from {@link Class}. Returns {@link Optional} containing
-		 * {@link MethodsMetadata} if metadata was read successfully, {@link Optional#empty()} otherwise.
+		 * Attempts to obtain {@link AnnotationMetadata} from {@link Class}. Returns {@link Optional} containing
+		 * {@link AnnotationMetadata} if metadata was read successfully, {@link Optional#empty()} otherwise.
 		 *
 		 * @param type must not be {@literal null}.
-		 * @return the optional {@link MethodsMetadata}.
+		 * @return the optional {@link AnnotationMetadata}.
 		 */
-		private static Optional<MethodsMetadata> getMetadata(Class<?> type) {
+		private static Optional<AnnotationMetadata> getMetadata(Class<?> type) {
 
 			try {
 
-				var factory = new MethodsMetadataReaderFactory(type.getClassLoader());
+				var factory = new SimpleMetadataReaderFactory(type.getClassLoader());
 				var metadataReader = factory.getMetadataReader(ClassUtils.getQualifiedName(type));
 
-				return Optional.of(metadataReader.getMethodsMetadata());
+				return Optional.of(metadataReader.getAnnotationMetadata());
 
 			} catch (IOException e) {
 
@@ -259,18 +259,18 @@ private static Class<?> findType(String name, Class<?>[] types) {
 		}
 
 		/**
-		 * Returns a {@link Map} containing method name to its positional index according to {@link MethodsMetadata}.
+		 * Returns a {@link Map} containing method name to its positional index according to {@link AnnotationMetadata}.
 		 *
 		 * @param metadata
 		 * @return
 		 */
-		private static Map<String, Integer> getMethodOrder(MethodsMetadata metadata) {
+		private static Map<String, Integer> getMethodOrder(AnnotationMetadata metadata) {
 
-			var methods = metadata.getMethods() //
+			var methods = metadata.getDeclaredMethods() //
 					.stream() //
 					.map(MethodMetadata::getMethodName) //
 					.distinct() //
-					.collect(Collectors.toList());
+					.toList();
 
 			return IntStream.range(0, methods.size()) //
 					.boxed() //

src/main/java/org/springframework/data/type/MethodsMetadata.java

@@ -17,8 +17,10 @@
 
 import java.util.Set;
 
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.ClassMetadata;
 import org.springframework.core.type.MethodMetadata;
+import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.data.type.classreading.MethodsMetadataReader;
 
 /**
@@ -30,7 +32,10 @@
  * @see MethodMetadata
  * @see ClassMetadata
  * @see MethodsMetadataReader#getMethodsMetadata()
+ * @deprecated since 3.0, use {@link MetadataReader} directly to obtain {@link AnnotationMetadata#getDeclaredMethods()
+ *             declared methods} directly.
  */
+@Deprecated
 public interface MethodsMetadata extends ClassMetadata {
 
 	/**