Introduce @EnableTransactionManagement

2011-05-06 19:10:25 +00:00
parent d9a89529f0
commit 01e5120a26
13 changed files with 930 additions and 28 deletions
--- a/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java
@@ -40,9 +40,6 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Feature;
-import org.springframework.context.annotation.FeatureConfiguration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
@@ -53,8 +50,8 @@ import org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBui
 import org.springframework.orm.hibernate3.scannable.Foo;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.config.TxAnnotationDriven;

 /**
 * Integration tests for configuring Hibernate SessionFactory types
@@ -201,7 +198,7 @@ public class HibernateSessionFactoryConfigurationTests {


 	@Configuration
-	@Import(TxConfig.class)
+	@EnableTransactionManagement
 	static class RepositoryConfig {
 		@Inject SessionFactory sessionFactory;

@@ -227,15 +224,6 @@ public class HibernateSessionFactoryConfigurationTests {
 	}


-	@FeatureConfiguration
-	static class TxConfig {
-		@Feature
-		TxAnnotationDriven tx(PlatformTransactionManager txManager) {
-			return new TxAnnotationDriven(txManager);
-		}
-	}
-
-
 	@Configuration
 	@ImportResource("org/springframework/orm/hibernate3/AnnotationSessionFactoryBeanXmlConfig-context.xml")
 	static class AnnotationSessionFactoryBeanXmlConfig extends DataConfig {
--- a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -0,0 +1,59 @@
+package org.springframework.transaction;
+/*
+ * Copyright 2002-2007 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.
+ */
+
+
+
+import org.springframework.transaction.support.AbstractPlatformTransactionManager;
+import org.springframework.transaction.support.DefaultTransactionStatus;
+
+/**
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ */
+public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
+
+	public TransactionDefinition lastDefinition;
+	public int begun;
+	public int commits;
+	public int rollbacks;
+	public int inflight;
+
+	protected Object doGetTransaction() {
+		return new Object();
+	}
+
+	protected void doBegin(Object transaction, TransactionDefinition definition) {
+		this.lastDefinition = definition;
+		++begun;
+		++inflight;
+	}
+
+	protected void doCommit(DefaultTransactionStatus status) {
+		++commits;
+		--inflight;
+	}
+
+	protected void doRollback(DefaultTransactionStatus status) {
+		++rollbacks;
+		--inflight;
+	}
+	
+	public void clear() {
+		begun = commits = rollbacks = inflight = 0;
+	}
+
+}
--- a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2002-2011 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.annotation;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.config.AdviceMode;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
+
+/**
+ * Integration tests for the @EnableTransactionManagement annotation.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public class EnableTransactionManagementIntegrationTests {
+
+	@Test
+	public void repositoryIsNotTxProxy() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class);
+		ctx.refresh();
+
+		try {
+			assertTxProxying(ctx);
+			fail("expected exception");
+		} catch (AssertionError ex) {
+			assertThat(ex.getMessage(), equalTo("FooRepository is not a TX proxy"));
+		}
+	}
+
+	@Test
+	public void repositoryIsTxProxy_withDefaultTxManagerName() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class, DefaultTxManagerNameConfig.class);
+		ctx.refresh();
+
+		assertTxProxying(ctx);
+	}
+
+	@Test
+	public void repositoryIsTxProxy_withCustomTxManagerName() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class, CustomTxManagerNameConfig.class);
+		ctx.refresh();
+
+		assertTxProxying(ctx);
+	}
+
+	@Ignore @Test // TODO SPR-8207
+	public void repositoryIsTxProxy_withNonConventionalTxManagerName_fallsBackToByTypeLookup() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class, NonConventionalTxManagerNameConfig.class);
+		ctx.refresh();
+
+		assertTxProxying(ctx);
+	}
+
+	@Test
+	public void repositoryIsClassBasedTxProxy() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class, ProxyTargetClassTxConfig.class);
+		ctx.refresh();
+
+		assertTxProxying(ctx);
+		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooRepository.class)), is(true));
+	}
+
+	@Test
+	public void repositoryUsesAspectJAdviceMode() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config.class, AspectJTxConfig.class);
+		try {
+			ctx.refresh();
+		} catch (Exception ex) {
+			// this test is a bit fragile, but gets the job done, proving that an
+			// attempt was made to look up the AJ aspect. It's due to classpath issues
+			// in .integration-tests that it's not found.
+			assertTrue(ex.getMessage().endsWith("AspectJTransactionManagementConfiguration.class] cannot be opened because it does not exist"));
+		}
+	}
+
+	@Test
+	public void implicitTxManager() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(ImplicitTxManagerConfig.class);
+		ctx.refresh();
+
+		FooRepository fooRepository = ctx.getBean(FooRepository.class);
+		fooRepository.findAll();
+
+		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
+		assertThat(txManager.begun, equalTo(1));
+		assertThat(txManager.commits, equalTo(1));
+		assertThat(txManager.rollbacks, equalTo(0));
+	}
+
+	@Test
+	public void explicitTxManager() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(ExplicitTxManagerConfig.class);
+		ctx.refresh();
+
+		FooRepository fooRepository = ctx.getBean(FooRepository.class);
+		fooRepository.findAll();
+
+		CallCountingTransactionManager txManager1 = ctx.getBean("txManager1", CallCountingTransactionManager.class);
+		assertThat(txManager1.begun, equalTo(1));
+		assertThat(txManager1.commits, equalTo(1));
+		assertThat(txManager1.rollbacks, equalTo(0));
+
+		CallCountingTransactionManager txManager2 = ctx.getBean("txManager2", CallCountingTransactionManager.class);
+		assertThat(txManager2.begun, equalTo(0));
+		assertThat(txManager2.commits, equalTo(0));
+		assertThat(txManager2.rollbacks, equalTo(0));
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement
+	static class ImplicitTxManagerConfig {
+		@Bean
+		public PlatformTransactionManager txManager() {
+			return new CallCountingTransactionManager();
+		}
+
+		@Bean
+		public FooRepository fooRepository() {
+			return new DummyFooRepository();
+		}
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement
+	static class ExplicitTxManagerConfig implements TransactionManagementConfigurer {
+		@Bean
+		public PlatformTransactionManager txManager1() {
+			return new CallCountingTransactionManager();
+		}
+
+		@Bean
+		public PlatformTransactionManager txManager2() {
+			return new CallCountingTransactionManager();
+		}
+
+		public PlatformTransactionManager createTransactionManager() {
+			return txManager1();
+		}
+
+		@Bean
+		public FooRepository fooRepository() {
+			return new DummyFooRepository();
+		}
+	}
+
+	private void assertTxProxying(AnnotationConfigApplicationContext ctx) {
+		FooRepository repo = ctx.getBean(FooRepository.class);
+
+		boolean isTxProxy = false;
+		if (AopUtils.isAopProxy(repo)) {
+			for (Advisor advisor : ((Advised)repo).getAdvisors()) {
+				if (advisor instanceof BeanFactoryTransactionAttributeSourceAdvisor) {
+					isTxProxy = true;
+					break;
+				}
+			}
+		}
+		assertTrue("FooRepository is not a TX proxy", isTxProxy);
+
+		// trigger a transaction
+		repo.findAll();
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement
+	static class DefaultTxManagerNameConfig {
+		@Bean
+		PlatformTransactionManager transactionManager(DataSource dataSource) {
+			return new DataSourceTransactionManager(dataSource);
+		}
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement
+	static class CustomTxManagerNameConfig {
+		@Bean
+		PlatformTransactionManager txManager(DataSource dataSource) {
+			return new DataSourceTransactionManager(dataSource);
+		}
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement
+	static class NonConventionalTxManagerNameConfig {
+		@Bean
+		PlatformTransactionManager txManager(DataSource dataSource) {
+			return new DataSourceTransactionManager(dataSource);
+		}
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement(proxyTargetClass=true)
+	static class ProxyTargetClassTxConfig {
+		@Bean
+		PlatformTransactionManager transactionManager(DataSource dataSource) {
+			return new DataSourceTransactionManager(dataSource);
+		}
+	}
+
+
+	@Configuration
+	@EnableTransactionManagement(mode=AdviceMode.ASPECTJ)
+	static class AspectJTxConfig {
+		@Bean
+		PlatformTransactionManager transactionManager(DataSource dataSource) {
+			return new DataSourceTransactionManager(dataSource);
+		}
+	}
+
+
+	@Configuration
+	static class Config {
+		@Bean
+		FooRepository fooRepository() {
+			JdbcFooRepository repos = new JdbcFooRepository();
+			repos.setDataSource(dataSource());
+			return repos;
+		}
+
+		@Bean
+		DataSource dataSource() {
+			return new EmbeddedDatabaseBuilder()
+				.setType(EmbeddedDatabaseType.HSQL)
+				.build();
+		}
+	}
+
+
+	interface FooRepository {
+		List<Object> findAll();
+	}
+
+
+	@Repository
+	static class JdbcFooRepository implements FooRepository {
+
+		public void setDataSource(DataSource dataSource) {
+		}
+
+		@Transactional
+		public List<Object> findAll() {
+			return Collections.emptyList();
+		}
+	}
+
+	@Repository
+	static class DummyFooRepository implements FooRepository {
+
+		@Transactional
+		public List<Object> findAll() {
+			return Collections.emptyList();
+		}
+	}
+}