From d5408c047dad533fcbee31d20a168cdba5a85850 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Wed, 6 Aug 2025 18:32:01 +0200
Subject: [PATCH] Introduce @Proxyable annotation for bean-specific proxy type

Closes gh-35296
See gh-35293
---
 .../context/annotation/ProxyType.java         | 45 ++++++++++++++
 .../context/annotation/Proxyable.java         | 58 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ProxyType.java
 create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/Proxyable.java

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ProxyType.java b/spring-context/src/main/java/org/springframework/context/annotation/ProxyType.java
new file mode 100644
index 00000000000..e733b8b27ef
--- /dev/null
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ProxyType.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+/**
+ * Common enum for indicating a desired proxy type.
+ *
+ * @author Juergen Hoeller
+ * @since 7.0
+ * @see Proxyable#value()
+ */
+public enum ProxyType {
+
+	/**
+	 * Default is a JDK dynamic proxy, or potentially a class-based CGLIB proxy
+	 * when globally configured.
+	 */
+	DEFAULT,
+
+	/**
+	 * Suggest a JDK dynamic proxy implementing <i>all</i> interfaces exposed by
+	 * the class of the target object. Overrides a globally configured default.
+	 */
+	INTERFACES,
+
+	/**
+	 * Suggest a class-based CGLIB proxy. Overrides a globally configured default.
+	 */
+	TARGET_CLASS
+
+}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Proxyable.java b/spring-context/src/main/java/org/springframework/context/annotation/Proxyable.java
new file mode 100644
index 00000000000..623364ea2d3
--- /dev/null
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Proxyable.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Common annotation for suggesting a specific proxy type for a {@link Bean @Bean}
+ * method or {@link org.springframework.stereotype.Component @Component} class,
+ * overriding a globally configured default.
+ *
+ * <p>Only actually applying in case of a bean actually getting auto-proxied in
+ * the first place. Actual auto-proxying is dependent on external configuration.
+ *
+ * @author Juergen Hoeller
+ * @since 7.0
+ * @see org.springframework.aop.framework.autoproxy.AutoProxyUtils#PRESERVE_TARGET_CLASS_ATTRIBUTE
+ * @see org.springframework.aop.framework.autoproxy.AutoProxyUtils#EXPOSED_INTERFACES_ATTRIBUTE
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Proxyable {
+
+	/**
+	 * Suggest a specific proxy type, either {@link ProxyType#INTERFACES} for
+	 * a JDK dynamic proxy or {@link ProxyType#TARGET_CLASS} for a CGLIB proxy,
+	 * overriding a globally configured default.
+	 */
+	ProxyType value() default ProxyType.DEFAULT;
+
+	/**
+	 * Suggest a JDK dynamic proxy with specific interfaces to expose, overriding
+	 * a globally configured default.
+	 * <p>Only taken into account if {@link #value()} is not {@link ProxyType#TARGET_CLASS}.
+	 */
+	Class<?>[] interfaces() default {};
+
+
+}