TransactionAttributeSourcePointcut pointcut skips target classes with TransactionalProxy marker (e.g. Spring Data proxies)

This 4.2 commit also makes TransactionProxyFactoryBean expose the TransactionalProxy marker and refines SpringProxy marker handling.

Issue: SPR-13109

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -34,6 +34,9 @@ abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPoi
 
 	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
+		if (TransactionalProxy.class.isAssignableFrom(targetClass)) {
+			return false;
+		}
 		TransactionAttributeSource tas = getTransactionAttributeSource();
 		return (tas == null || tas.getTransactionAttribute(method, targetClass) != null);
 	}

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -20,6 +20,7 @@ import java.util.Properties;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.AbstractSingletonProxyFactoryBean;
+import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -199,4 +200,13 @@ public class TransactionProxyFactoryBean extends AbstractSingletonProxyFactoryBe
 		}
 	}
 
+	/**
+	 * As of 4.2, this method adds {@link TransactionalProxy} to the set of
+	 * proxy interfaces in order to avoid re-processing of transaction metadata.
+	 */
+	@Override
+	protected void postProcessProxyFactory(ProxyFactory proxyFactory) {
+		proxyFactory.addInterface(TransactionalProxy.class);
+	}
+
 }

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionalProxy.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2015 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
+ *
+ *      http://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.transaction.interceptor;
+
+import org.springframework.aop.SpringProxy;
+
+/**
+ * A marker interface for manually created transactional proxies.
+ *
+ * <p>{@link TransactionAttributeSourcePointcut} will ignore such existing
+ * transactional proxies during AOP auto-proxying and therefore avoid
+ * re-processing transaction metadata on them.
+ *
+ * @author Juergen Hoeller
+ * @since 4.1.7
+ */
+public interface TransactionalProxy extends SpringProxy {
+
+}