From c0252f8758db901d8ac5b7af798099db4e95f4dc Mon Sep 17 00:00:00 2001 From: John Lin Date: Wed, 17 Apr 2019 11:40:46 +0800 Subject: [PATCH 1/2] Remove PROPAGATION_ prefix in Javadoc See gh-22809 --- .../springframework/transaction/annotation/Propagation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java index fc6b8f020c..c791989b1a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java @@ -40,7 +40,7 @@ public enum Propagation { * Support a current transaction, execute non-transactionally if none exists. * Analogous to EJB transaction attribute of the same name. *

Note: For transaction managers with transaction synchronization, - * PROPAGATION_SUPPORTS is slightly different from no transaction at all, + * SUPPORTS is slightly different from no transaction at all, * as it defines a transaction scope that synchronization will apply for. * As a consequence, the same resources (JDBC Connection, Hibernate Session, etc) * will be shared for the entire specified scope. Note that this depends on @@ -87,7 +87,7 @@ public enum Propagation { /** * Execute within a nested transaction if a current transaction exists, - * behave like PROPAGATION_REQUIRED else. There is no analogous feature in EJB. + * behave like REQUIRED else. There is no analogous feature in EJB. *

Note: Actual creation of a nested transaction will only work on specific * transaction managers. Out of the box, this only applies to the JDBC * DataSourceTransactionManager when working on a JDBC 3.0 driver. From b7415ec92cb77be49aa415d7a01a26c034891da2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 17 Apr 2019 11:49:04 +0200 Subject: [PATCH 2/2] Polish "Remove PROPAGATION_ prefix in Javadoc" Closes gh-22809 --- .../springframework/transaction/annotation/Propagation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java index c791989b1a..95cc22fc9e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -40,7 +40,7 @@ public enum Propagation { * Support a current transaction, execute non-transactionally if none exists. * Analogous to EJB transaction attribute of the same name. *

Note: For transaction managers with transaction synchronization, - * SUPPORTS is slightly different from no transaction at all, + * {@code SUPPORTS} is slightly different from no transaction at all, * as it defines a transaction scope that synchronization will apply for. * As a consequence, the same resources (JDBC Connection, Hibernate Session, etc) * will be shared for the entire specified scope. Note that this depends on @@ -87,7 +87,7 @@ public enum Propagation { /** * Execute within a nested transaction if a current transaction exists, - * behave like REQUIRED else. There is no analogous feature in EJB. + * behave like {@code REQUIRED} else. There is no analogous feature in EJB. *

Note: Actual creation of a nested transaction will only work on specific * transaction managers. Out of the box, this only applies to the JDBC * DataSourceTransactionManager when working on a JDBC 3.0 driver.