Temporarily revert changes for gh-33616

See gh-33616

Author: bclozel

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -83,6 +83,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.MethodMetadata;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
+import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.javapoet.ClassName;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.lang.Nullable;
@@ -283,7 +284,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 					"AutowiredAnnotationBeanPostProcessor requires a ConfigurableListableBeanFactory: " + beanFactory);
 		}
 		this.beanFactory = clbf;
-		this.metadataReaderFactory = MetadataReaderFactory.create(clbf.getBeanClassLoader());
+		this.metadataReaderFactory = new SimpleMetadataReaderFactory(clbf.getBeanClassLoader());
 	}
 
 

spring-core/spring-core.gradle

@@ -11,7 +11,7 @@ apply plugin: "kotlin"
 apply plugin: "kotlinx-serialization"
 
 multiRelease {
-	targetVersions 17, 21, 24
+	targetVersions 17, 21
 }
 
 def javapoetVersion = "1.13.0"
@@ -25,10 +25,6 @@ configurations {
 	graalvm
 }
 
-springFramework {
-	enableJavaPreviewFeatures = true
-}
-
 task javapoetRepackJar(type: ShadowJar) {
 	archiveBaseName = 'spring-javapoet-repack'
 	archiveVersion = javapoetVersion

spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,13 +35,11 @@
  * @author Costin Leau
  * @since 2.5
  */
-public class CachingMetadataReaderFactory implements MetadataReaderFactory {
+public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory {
 
 	/** Default maximum number of entries for a local MetadataReader cache: 256. */
 	public static final int DEFAULT_CACHE_LIMIT = 256;
 
-	private final MetadataReaderFactory delegate;
-
 	/** MetadataReader cache: either local or shared at the ResourceLoader level. */
 	@Nullable
 	private Map<Resource, MetadataReader> metadataReaderCache;
@@ -52,7 +50,7 @@ public class CachingMetadataReaderFactory implements MetadataReaderFactory {
 	 * using a local resource cache.
 	 */
 	public CachingMetadataReaderFactory() {
-		this.delegate = MetadataReaderFactory.create((ClassLoader) null);
+		super();
 		setCacheLimit(DEFAULT_CACHE_LIMIT);
 	}
 
@@ -62,7 +60,7 @@ public CachingMetadataReaderFactory() {
 	 * @param classLoader the ClassLoader to use
 	 */
 	public CachingMetadataReaderFactory(@Nullable ClassLoader classLoader) {
-		this.delegate = MetadataReaderFactory.create(classLoader);
+		super(classLoader);
 		setCacheLimit(DEFAULT_CACHE_LIMIT);
 	}
 
@@ -74,7 +72,7 @@ public CachingMetadataReaderFactory(@Nullable ClassLoader classLoader) {
 	 * @see DefaultResourceLoader#getResourceCache
 	 */
 	public CachingMetadataReaderFactory(@Nullable ResourceLoader resourceLoader) {
-		this.delegate = MetadataReaderFactory.create(resourceLoader);
+		super(resourceLoader);
 		if (resourceLoader instanceof DefaultResourceLoader defaultResourceLoader) {
 			this.metadataReaderCache = defaultResourceLoader.getResourceCache(MetadataReader.class);
 		}
@@ -83,6 +81,7 @@ public CachingMetadataReaderFactory(@Nullable ResourceLoader resourceLoader) {
 		}
 	}
 
+
 	/**
 	 * Specify the maximum number of entries for the MetadataReader cache.
 	 * <p>Default is 256 for a local cache, whereas a shared cache is
@@ -113,18 +112,14 @@ public int getCacheLimit() {
 		}
 	}
 
-	@Override
-	public MetadataReader getMetadataReader(String className) throws IOException {
-		return this.delegate.getMetadataReader(className);
-	}
 
 	@Override
 	public MetadataReader getMetadataReader(Resource resource) throws IOException {
 		if (this.metadataReaderCache instanceof ConcurrentMap) {
 			// No synchronization necessary...
 			MetadataReader metadataReader = this.metadataReaderCache.get(resource);
 			if (metadataReader == null) {
-				metadataReader = this.delegate.getMetadataReader(resource);
+				metadataReader = super.getMetadataReader(resource);
 				this.metadataReaderCache.put(resource, metadataReader);
 			}
 			return metadataReader;
@@ -133,14 +128,14 @@ else if (this.metadataReaderCache != null) {
 			synchronized (this.metadataReaderCache) {
 				MetadataReader metadataReader = this.metadataReaderCache.get(resource);
 				if (metadataReader == null) {
-					metadataReader = this.delegate.getMetadataReader(resource);
+					metadataReader = super.getMetadataReader(resource);
 					this.metadataReaderCache.put(resource, metadataReader);
 				}
 				return metadataReader;
 			}
 		}
 		else {
-			return this.delegate.getMetadataReader(resource);
+			return super.getMetadataReader(resource);
 		}
 	}
 

spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,12 @@
 import java.io.IOException;
 
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.lang.Nullable;
 
 /**
  * Factory interface for {@link MetadataReader} instances.
  * Allows for caching a MetadataReader per original resource.
  *
  * @author Juergen Hoeller
- * @author Brian Clozel
  * @since 2.5
  * @see SimpleMetadataReaderFactory
  * @see CachingMetadataReaderFactory
@@ -52,23 +49,4 @@ public interface MetadataReaderFactory {
 	 */
 	MetadataReader getMetadataReader(Resource resource) throws IOException;
 
-	/**
-	 * Create a default {@link MetadataReaderFactory} implementation that's suitable
-	 * for the current JVM.
-	 * @return a new factory instance
-	 * @since 7.0
-	 */
-	static MetadataReaderFactory create(@Nullable ResourceLoader resourceLoader) {
-		return MetadataReaderFactoryDelegate.create(resourceLoader);
-	}
-
-	/**
-	 * Create a default {@link MetadataReaderFactory} implementation that's suitable
-	 * for the current JVM.
-	 * @return a new factory instance
-	 * @since 7.0
-	 */
-	static MetadataReaderFactory create(@Nullable ClassLoader classLoader) {
-		return MetadataReaderFactoryDelegate.create(classLoader);
-	}
 }