From d8003e326dbfb4cf9e4d56533f87671f4bce5de2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 11 Jul 2022 17:09:27 +0200
Subject: [PATCH] Revert "Introduce ProxyHints.registerJdkProxy(String...)"

This reverses commit b560c10d4cea3f9e149153078ec8c42e843d53dd.

See gh-28781
---
 .../springframework/aot/hint/JdkProxyHint.java   | 16 ----------------
 .../org/springframework/aot/hint/ProxyHints.java | 16 ----------------
 .../aot/hint/ProxyHintsTests.java                | 12 ++----------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java b/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
index cedc9ead9a0..c8c7af2ccda 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
@@ -29,7 +29,6 @@ import org.springframework.lang.Nullable;
  *
  * @author Stephane Nicoll
  * @author Brian Clozel
- * @author Sam Brannen
  * @since 6.0
  */
 public final class JdkProxyHint implements ConditionalHint {
@@ -131,17 +130,6 @@ public final class JdkProxyHint implements ConditionalHint {
 			return this;
 		}
 
-		/**
-		 * Add the specified interfaces that the proxy should implement.
-		 * @param proxiedInterfaces the fully qualified class names of interfaces
-		 * the proxy should implement
-		 * @return {@code this}, to facilitate method chaining
-		 */
-		public Builder proxiedInterfaces(String... proxiedInterfaces) {
-			this.proxiedInterfaces.addAll(toTypeReferences(proxiedInterfaces));
-			return this;
-		}
-
 		/**
 		 * Make this hint conditional on the fact that the specified type
 		 * can be resolved.
@@ -171,10 +159,6 @@ public final class JdkProxyHint implements ConditionalHint {
 			return Arrays.stream(proxiedInterfaces).map(TypeReference::of).toList();
 		}
 
-		private static List<TypeReference> toTypeReferences(String... proxiedInterfaces) {
-			return Arrays.stream(proxiedInterfaces).map(TypeReference::of).toList();
-		}
-
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
index 31779e0b0e9..ba2295536fd 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
@@ -27,7 +27,6 @@ import org.springframework.aot.hint.ClassProxyHint.Builder;
  * Gather the need for using proxies at runtime.
  *
  * @author Stephane Nicoll
- * @author Sam Brannen
  * @since 6.0
  */
 public class ProxyHints {
@@ -91,21 +90,6 @@ public class ProxyHints {
 				jdkProxyHint.proxiedInterfaces(proxiedInterfaces));
 	}
 
-	/**
-	 * Register that a JDK proxy implementing the specified interfaces is
-	 * required.
-	 * <p>When registering a JDK proxy for Spring AOP, consider using
-	 * {@link org.springframework.aop.framework.AopProxyUtils#completeJdkProxyInterfaces(String...)
-	 * AopProxyUtils.completeJdkProxyInterfaces()} for convenience.
-	 * @param proxiedInterfaces the fully qualified class names of interfaces the
-	 * proxy should implement
-	 * @return {@code this}, to facilitate method chaining
-	 */
-	public ProxyHints registerJdkProxy(String... proxiedInterfaces) {
-		return registerJdkProxy(jdkProxyHint ->
-				jdkProxyHint.proxiedInterfaces(proxiedInterfaces));
-	}
-
 	/**
 	 * Register that a class proxy is required for the class defined by the
 	 * specified {@link TypeReference}.
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
index 10832ddc5a6..ff749c91502 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
@@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * Tests for {@link ProxyHints}.
  *
  * @author Stephane Nicoll
- * @author Sam Brannen
  */
 class ProxyHintsTests {
 
@@ -53,17 +52,10 @@ class ProxyHintsTests {
 
 	@Test
 	void registerJdkProxyWithInterfaceClassNames() {
-		this.proxyHints.registerJdkProxy(Function.class.getName(), "com.example.Advised");
-		assertThat(this.proxyHints.jdkProxies()).singleElement()
-				.satisfies(proxiedInterfaces(Function.class.getName(), "com.example.Advised"));
-	}
-
-	@Test
-	void registerJdkProxyWithTypeReferences() {
 		this.proxyHints.registerJdkProxy(TypeReference.of(Function.class),
 				TypeReference.of("com.example.Advised"));
-		assertThat(this.proxyHints.jdkProxies()).singleElement()
-				.satisfies(proxiedInterfaces(Function.class.getName(), "com.example.Advised"));
+		assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(
+				Function.class.getName(), "com.example.Advised"));
 	}
 
 	@Test