diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc index e141b48440a..c55389c3ee7 100644 --- a/src/docs/asciidoc/data-access.adoc +++ b/src/docs/asciidoc/data-access.adoc @@ -1577,7 +1577,7 @@ is controlled through the `Ordered` interface. For full details on advice orderi ---- [source,xml,indent=0] -[subs="verbatim,quotes"] +[subs="verbatim"] ---- - + - + @@ -1633,7 +1633,7 @@ The following example effects the same setup as above, but uses the purely XML declarative approach. [source,xml,indent=0] -[subs="verbatim,quotes"] +[subs="verbatim"] ---- - __ + - + @@ -1733,7 +1733,7 @@ follows Java's rule that annotations on interfaces are __not inherited__. ==== The `@Transactional` annotation on a class specifies the default transaction semantics -for the execution of any method in the class. +for the execution of any public method in the class. The `@Transactional` annotation on a method within the class overrides the default 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 // use constructor-injection to supply the PlatformTransactionManager public SimpleService(PlatformTransactionManager transactionManager) { - Assert.notNull(transactionManager, "The 'transactionManager' argument must not be null."); this.transactionTemplate = new TransactionTemplate(transactionManager); } @@ -1861,7 +1860,6 @@ a specific `TransactionTemplate:` private final TransactionTemplate transactionTemplate; public SimpleService(PlatformTransactionManager transactionManager) { - Assert.notNull(transactionManager, "The 'transactionManager' argument must not be null."); this.transactionTemplate = new TransactionTemplate(transactionManager); // the transaction settings can be set here explicitly if so desired