Remove LDAP + Data Source Transaction Wrappers

Closes gh-1109

Author: jzheaux

core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java

@@ -24,8 +24,6 @@
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndDataSourceTransactionManager;
-import org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager;
 import org.springframework.ldap.transaction.compensating.manager.ContextSourceTransactionManager;
 import org.springframework.ldap.transaction.compensating.support.DefaultTempEntryRenamingStrategy;
 import org.springframework.ldap.transaction.compensating.support.DifferentSubtreeTempEntryRenamingStrategy;
@@ -58,24 +56,13 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		String dataSourceRef = element.getAttribute(ATT_DATA_SOURCE_REF);
 		String sessionFactoryRef = element.getAttribute(ATT_SESSION_FACTORY_REF);
 
-		if (StringUtils.hasText(dataSourceRef) && StringUtils.hasText(sessionFactoryRef)) {
-			throw new IllegalArgumentException(String.format("Only one of %s and %s can be specified",
+		if (StringUtils.hasText(dataSourceRef) || StringUtils.hasText(sessionFactoryRef)) {
+			throw new IllegalArgumentException(String.format(
+					"ContextSourceAndHibernateTransactionManager and ContextSourceAndDataSourceTransactionManager are removed in Spring LDAP 4.0. Please remove your usage of data-source-ref and session-factory-ref.",
 					ATT_DATA_SOURCE_REF, ATT_SESSION_FACTORY_REF));
 		}
 
-		BeanDefinitionBuilder builder;
-		if (StringUtils.hasText(dataSourceRef)) {
-			builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceAndDataSourceTransactionManager.class);
-			builder.addPropertyReference("dataSource", dataSourceRef);
-		}
-		else if (StringUtils.hasText(sessionFactoryRef)) {
-			builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceAndHibernateTransactionManager.class);
-			builder.addPropertyReference("sessionFactory", sessionFactoryRef);
-		}
-		else {
-			// Standard transaction manager
-			builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceTransactionManager.class);
-		}
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceTransactionManager.class);
 
 		builder.addPropertyReference("contextSource", contextSourceRef);