diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java index c8d4615660..ea21cc7fb7 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -24,14 +24,12 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; /** - *

Test annotation to indicate that the annotated {@code public void} - * method should be executed after a transaction is ended for test - * methods configured to run within a transaction via the - * {@code @Transactional} annotation. + *

Test annotation to indicate that the annotated {@code public void} method + * should be executed after a transaction is ended for a test method + * configured to run within a transaction via the {@code @Transactional} annotation. * - *

- * The {@code @AfterTransaction} methods of superclasses will be - * executed after those of the current class. + *

The {@code @AfterTransaction} methods of superclasses will be executed + * after those of the current class. * *

As of Spring Framework 4.0, this annotation may be used as a * meta-annotation to create custom composed annotations. diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java index f995f7c78d..05106390ca 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -24,14 +24,12 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; /** - *

Test annotation to indicate that the annotated {@code public void} - * method should be executed before a transaction is started for test - * methods configured to run within a transaction via the - * {@code @Transactional} annotation. + *

Test annotation to indicate that the annotated {@code public void} method + * should be executed before a transaction is started for a test method + * configured to run within a transaction via the {@code @Transactional} annotation. * - *

The {@code @BeforeTransaction} methods of superclasses will be - * executed before those of the current class. - *

+ *

The {@code @BeforeTransaction} methods of superclasses will be executed + * before those of the current class. * *

As of Spring Framework 4.0, this annotation may be used as a * meta-annotation to create custom composed annotations. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java index 1c5475873b..6775b9d3b8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -51,8 +51,8 @@ import org.springframework.transaction.annotation.Transactional; *

  • {@link TransactionalTestExecutionListener}
  • * *

    - * This class specifically tests usage of {@code @Transactional} - * defined at the class level. + * This class specifically tests usage of {@code @Transactional} defined at the + * class level. *

    * * @author Sam Brannen diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java index 6cc35c641b..a3502fdada 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -50,10 +50,10 @@ import org.springframework.transaction.annotation.Transactional; *
  • {@link TransactionalTestExecutionListener}
  • * *

    - * This class specifically tests usage of {@code @Transactional} - * defined at the method level. In contrast to + * This class specifically tests usage of {@code @Transactional} defined at the + * method level. In contrast to * {@link ClassLevelTransactionalSpringRunnerTests}, this class omits usage of - * {@code @NotTransactional}. + * {@code @NotTransactional}. *

    * * @author Sam Brannen diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java index a77f7239d1..b996ccffe7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -28,7 +28,7 @@ import org.springframework.util.ResourceUtils; * As of Spring 3.0, * {@code MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests} is also used * to verify support for the new {@code value} attribute alias for - * {@code @ContextConfiguration}'s {@code locations} attribute. + * {@code @ContextConfiguration}'s {@code locations} attribute. *

    * * @author Sam Brannen