Browse Source
Provide a TransactionTemplate if one PlatformTransactionManager is present. Relocated the jta support as a nested package of the new transaction package that hosts the transaction template auto-configuration. To avoid package tangles, links between auto-configurations have been reversed. Closes gh-2464 Closes gh-2809pull/2770/merge
Stephane Nicoll
11 years ago
committed by
Andy Wilkinson
16 changed files with 230 additions and 29 deletions
@ -0,0 +1,55 @@
@@ -0,0 +1,55 @@
|
||||
/* |
||||
* Copyright 2012-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.boot.autoconfigure.transaction; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter; |
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; |
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; |
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate; |
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; |
||||
import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; |
||||
import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.transaction.PlatformTransactionManager; |
||||
import org.springframework.transaction.support.TransactionTemplate; |
||||
|
||||
/** |
||||
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration |
||||
* Auto-configuration} for Spring transaction. |
||||
* |
||||
* @author Stephane Nicoll |
||||
* @since 1.3.0 |
||||
*/ |
||||
@Configuration |
||||
@ConditionalOnClass({ TransactionTemplate.class, PlatformTransactionManager.class }) |
||||
@ConditionalOnSingleCandidate(PlatformTransactionManager.class) |
||||
@AutoConfigureAfter({ JtaAutoConfiguration.class, JpaBaseConfiguration.class, |
||||
DataSourceTransactionManagerAutoConfiguration.class }) |
||||
public class TransactionAutoConfiguration { |
||||
|
||||
@Autowired |
||||
private PlatformTransactionManager transactionManager; |
||||
|
||||
@Bean |
||||
@ConditionalOnMissingBean |
||||
public TransactionTemplate transactionTemplate() { |
||||
return new TransactionTemplate(this.transactionManager); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,20 @@
@@ -0,0 +1,20 @@
|
||||
/* |
||||
* Copyright 2012-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. |
||||
*/ |
||||
|
||||
/** |
||||
* Auto-configuration for transaction suport. |
||||
*/ |
||||
package org.springframework.boot.autoconfigure.transaction; |
||||
@ -0,0 +1,125 @@
@@ -0,0 +1,125 @@
|
||||
/* |
||||
* Copyright 2012-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.boot.autoconfigure.transaction; |
||||
|
||||
import java.util.Map; |
||||
|
||||
import org.junit.After; |
||||
import org.junit.Test; |
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; |
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; |
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.transaction.PlatformTransactionManager; |
||||
import org.springframework.transaction.support.TransactionTemplate; |
||||
|
||||
import static org.junit.Assert.assertEquals; |
||||
import static org.junit.Assert.assertSame; |
||||
import static org.junit.Assert.assertTrue; |
||||
import static org.mockito.Mockito.mock; |
||||
|
||||
/** |
||||
* Tests for {@link TransactionAutoConfiguration}. |
||||
* |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
public class TransactionAutoConfigurationTests { |
||||
|
||||
private AnnotationConfigApplicationContext context; |
||||
|
||||
@After |
||||
public void tearDown() { |
||||
if (this.context != null) { |
||||
this.context.close(); |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
public void noTransactionManager() { |
||||
load(EmptyConfiguration.class); |
||||
assertEquals(0, this.context.getBeansOfType(TransactionTemplate.class).size()); |
||||
} |
||||
|
||||
@Test |
||||
public void singleTransactionManager() { |
||||
load(DataSourceAutoConfiguration.class, |
||||
DataSourceTransactionManagerAutoConfiguration.class); |
||||
PlatformTransactionManager transactionManager = this.context |
||||
.getBean(PlatformTransactionManager.class); |
||||
TransactionTemplate transactionTemplate = this.context |
||||
.getBean(TransactionTemplate.class); |
||||
assertSame(transactionManager, transactionTemplate.getTransactionManager()); |
||||
} |
||||
|
||||
@Test |
||||
public void severalTransactionManagers() { |
||||
load(SeveralTransactionManagersConfiguration.class); |
||||
assertEquals(0, this.context.getBeansOfType(TransactionTemplate.class).size()); |
||||
} |
||||
|
||||
@Test |
||||
public void customTransactionManager() { |
||||
load(CustomTransactionManagerConfiguration.class); |
||||
Map<String, TransactionTemplate> beans = this.context |
||||
.getBeansOfType(TransactionTemplate.class); |
||||
assertEquals(1, beans.size()); |
||||
assertTrue(beans.containsKey("transactionTemplateFoo")); |
||||
} |
||||
|
||||
private void load(Class<?>... configs) { |
||||
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); |
||||
applicationContext.register(configs); |
||||
applicationContext.register(TransactionAutoConfiguration.class); |
||||
applicationContext.refresh(); |
||||
this.context = applicationContext; |
||||
} |
||||
|
||||
@Configuration |
||||
static class EmptyConfiguration { |
||||
} |
||||
|
||||
@Configuration |
||||
static class SeveralTransactionManagersConfiguration { |
||||
|
||||
@Bean |
||||
public PlatformTransactionManager transactionManagerOne() { |
||||
return mock(PlatformTransactionManager.class); |
||||
} |
||||
|
||||
@Bean |
||||
public PlatformTransactionManager transactionManagerTwo() { |
||||
return mock(PlatformTransactionManager.class); |
||||
} |
||||
} |
||||
|
||||
@Configuration |
||||
static class CustomTransactionManagerConfiguration { |
||||
|
||||
@Bean |
||||
public TransactionTemplate transactionTemplateFoo() { |
||||
return new TransactionTemplate(transactionManagerFoo()); |
||||
} |
||||
|
||||
@Bean |
||||
public PlatformTransactionManager transactionManagerFoo() { |
||||
return mock(PlatformTransactionManager.class); |
||||
} |
||||
|
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue