Skip to content

Commit ff818d5

Browse files
committed
Correct description for class-level @transactional with AspectJ
Includes proper quoting of AspectJ expressions in Asciidoc. Issue: SPR-16552 Issue: SPR-16549
1 parent c543368 commit ff818d5

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/docs/asciidoc/data-access.adoc

+7-9
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ is controlled through the `Ordered` interface. For full details on advice orderi
15771577
----
15781578

15791579
[source,xml,indent=0]
1580-
[subs="verbatim,quotes"]
1580+
[subs="verbatim"]
15811581
----
15821582
<?xml version="1.0" encoding="UTF-8"?>
15831583
<beans xmlns="http://www.springframework.org/schema/beans"
@@ -1597,10 +1597,10 @@ is controlled through the `Ordered` interface. For full details on advice orderi
15971597
<!-- this is the aspect -->
15981598
<bean id="profiler" class="x.y.SimpleProfiler">
15991599
<!-- execute before the transactional advice (hence the lower order number) -->
1600-
<property name="order" __value="1"__/>
1600+
<property name="order" value="1"/>
16011601
</bean>
16021602
1603-
<tx:annotation-driven transaction-manager="txManager" __order="200"__/>
1603+
<tx:annotation-driven transaction-manager="txManager" order="200"/>
16041604
16051605
<aop:config>
16061606
<!-- this advice will execute around the transactional advice -->
@@ -1633,7 +1633,7 @@ The following example effects the same setup as above, but uses the purely XML
16331633
declarative approach.
16341634

16351635
[source,xml,indent=0]
1636-
[subs="verbatim,quotes"]
1636+
[subs="verbatim"]
16371637
----
16381638
<?xml version="1.0" encoding="UTF-8"?>
16391639
<beans xmlns="http://www.springframework.org/schema/beans"
@@ -1653,14 +1653,14 @@ declarative approach.
16531653
<!-- the profiling advice -->
16541654
<bean id="profiler" class="x.y.SimpleProfiler">
16551655
<!-- execute before the transactional advice (hence the lower order number) -->
1656-
__<property name="order" value="1__"/>
1656+
<property name="order" value="1"/>
16571657
</bean>
16581658
16591659
<aop:config>
16601660
<aop:pointcut id="entryPointMethod" expression="execution(* x.y..*Service.*(..))"/>
16611661
<!-- will execute after the profiling advice (c.f. the order attribute) -->
16621662
1663-
<aop:advisor advice-ref="txAdvice" pointcut-ref="entryPointMethod" __order="2__"/>
1663+
<aop:advisor advice-ref="txAdvice" pointcut-ref="entryPointMethod" order="2"/>
16641664
<!-- order value is higher than the profiling aspect -->
16651665
16661666
<aop:aspect id="profilingAspect" ref="profiler">
@@ -1733,7 +1733,7 @@ follows Java's rule that annotations on interfaces are __not inherited__.
17331733
====
17341734

17351735
The `@Transactional` annotation on a class specifies the default transaction semantics
1736-
for the execution of any method in the class.
1736+
for the execution of any public method in the class.
17371737

17381738
The `@Transactional` annotation on a method within the class overrides the default
17391739
transaction semantics given by the class annotation (if present). Any method may be
@@ -1794,7 +1794,6 @@ a transaction. You then pass an instance of your custom `TransactionCallback` to
17941794
17951795
// use constructor-injection to supply the PlatformTransactionManager
17961796
public SimpleService(PlatformTransactionManager transactionManager) {
1797-
Assert.notNull(transactionManager, "The 'transactionManager' argument must not be null.");
17981797
this.transactionTemplate = new TransactionTemplate(transactionManager);
17991798
}
18001799
@@ -1861,7 +1860,6 @@ a specific `TransactionTemplate:`
18611860
private final TransactionTemplate transactionTemplate;
18621861
18631862
public SimpleService(PlatformTransactionManager transactionManager) {
1864-
Assert.notNull(transactionManager, "The 'transactionManager' argument must not be null.");
18651863
this.transactionTemplate = new TransactionTemplate(transactionManager);
18661864
18671865
// the transaction settings can be set here explicitly if so desired

0 commit comments

Comments
 (0)