From 510dd9b7de5272fdc2ae5b625929eaadaa1a9903 Mon Sep 17 00:00:00 2001 From: nkjackzhang Date: Fri, 1 Jul 2016 17:04:54 +0800 Subject: [PATCH 1/6] Fix broken javadoc The javadoc is broken where lines start with with "@{". I have signed and agree to the terms of the Spring Individual Contributor License Agreement. --- .../java/org/springframework/context/annotation/Import.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Import.java b/spring-context/src/main/java/org/springframework/context/annotation/Import.java index e70c68ef42da..cf306ede6746 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Import.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Import.java @@ -54,7 +54,7 @@ public @interface Import { /** - * @{@link Configuration}, {@link ImportSelector}, {@link ImportBeanDefinitionRegistrar} + * {@link Configuration @Configuration}, {@link ImportSelector}, {@link ImportBeanDefinitionRegistrar} * or regular component classes to import. */ Class[] value(); From cd29efbcde3b30e1ae46a5472ce1d6a60e748273 Mon Sep 17 00:00:00 2001 From: nkjackzhang Date: Fri, 1 Jul 2016 17:12:49 +0800 Subject: [PATCH 2/6] Fix broken javadoc I have signed and agree to the terms of the Spring Individual Contributor License Agreement. --- .../annotation/ScheduledAnnotationBeanPostProcessor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java index 87431b95a746..6ffe92266d9c 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java @@ -64,8 +64,7 @@ * to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation. * *

This post-processor is automatically registered by Spring's - * {@code } XML element, and also by the - * @{@link EnableScheduling} annotation. + * {@code } XML element, and also by the @{@link EnableScheduling} annotation. * *

Autodetects any {@link SchedulingConfigurer} instances in the container, * allowing for customization of the scheduler to be used or for fine-grained From d2c1a8d9db798c5ef8864bb5f49c5e11f566c7b9 Mon Sep 17 00:00:00 2001 From: nkjackzhang Date: Fri, 1 Jul 2016 17:15:13 +0800 Subject: [PATCH 3/6] Fix broken javadoc --- .../scheduling/annotation/SchedulingConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java index b7c40b1dc991..2d5719719c74 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java @@ -26,8 +26,8 @@ * {@code @Configuration} class that registers a {@link ScheduledAnnotationBeanPostProcessor} * bean capable of processing Spring's @{@link Scheduled} annotation. * - *

This configuration class is automatically imported when using the - * @{@link EnableScheduling} annotation. See {@code @EnableScheduling}'s javadoc + *

This configuration class is automatically imported when using the @{@link EnableScheduling} + * annotation. See {@code @EnableScheduling}'s javadoc * for complete usage details. * * @author Chris Beams From 1989022b7c5ef72f17f033b9682de784cafc858c Mon Sep 17 00:00:00 2001 From: nkjackzhang Date: Fri, 1 Jul 2016 17:22:07 +0800 Subject: [PATCH 4/6] Fix broken javadoc --- .../transaction/annotation/EnableTransactionManagement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java index 5e3e22946302..7d9b6d11cb5b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java @@ -28,8 +28,8 @@ /** * Enables Spring's annotation-driven transaction management capability, similar to - * the support found in Spring's {@code } XML namespace. To be used on - * @{@link org.springframework.context.annotation.Configuration Configuration} classes + * the support found in Spring's {@code } XML namespace. To be used on @{@link org.springframework.context.annotation.Configuration Configuration} + * classes * as follows: * * 


From 7ac29f2d0f26cad98cabf332c7debaecb4ea3db8 Mon Sep 17 00:00:00 2001
From: nkjackzhang 
Date: Fri, 1 Jul 2016 17:24:32 +0800
Subject: [PATCH 5/6] Fix broken javadoc

---
 .../annotation/TransactionManagementConfigurer.java            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
index 1c7d43296057..0fb770c5581e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
@@ -31,8 +31,7 @@
  *
  * 
Note that in by-type lookup disambiguation cases, an alternative approach to
  * implementing this interface is to simply mark one of the offending
- * {@code PlatformTransactionManager} {@code @Bean} methods as
- * @{@link org.springframework.context.annotation.Primary Primary}.
+ * {@code PlatformTransactionManager} {@code @Bean} methods as @{@link org.springframework.context.annotation.Primary Primary}.
  * This is even generally preferred since it doesn't lead to early initialization
  * of the {@code PlatformTransactionManager} bean.
  *

From fc114fce97479dab597ad2e8cfaa93eeca5578af Mon Sep 17 00:00:00 2001
From: nkjackzhang 
Date: Fri, 1 Jul 2016 17:28:29 +0800
Subject: [PATCH 6/6] Fix broken javadoc

---
 .../method/annotation/RequestParamMethodArgumentResolver.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
index 5f6452cd4b8e..efb3b5ab62de 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
@@ -50,8 +50,8 @@
  * type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver}
  * abstraction, and arguments of type {@code javax.servlet.http.Part} in conjunction
  * with Servlet 3.0 multipart requests. This resolver can also be created in default
- * resolution mode in which simple types (int, long, etc.) not annotated with
- * @{@link RequestParam} are also treated as request parameters with the
+ * resolution mode in which simple types (int, long, etc.) not annotated with @{@link RequestParam}
+ * are also treated as request parameters with the
  * parameter name derived from the argument name.
  *
  * 
If the method parameter type is {@link Map}, the name specified in the