From dc822cdca0b8d62eee848b1a7201bef83a51dbcd Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 27 Jun 2012 22:58:46 +0200 Subject: [PATCH] Reflect 3.2=>3.1.2 backports in @since tags etc Issue: SPR-9443, SPR-6847, SPR-9446, SPR-9444, SPR-9439, SPR-9302, SPR-9507, SPR-9238, SPR-9397, SPR-9406, SPR-9502 --- .../factory/annotation/BeanFactoryAnnotationUtils.java | 3 +-- .../beanvalidation/MethodValidationInterceptor.java | 2 +- .../beanvalidation/MethodValidationPostProcessor.java | 2 +- .../springframework/core/env/ConfigurableEnvironment.java | 2 +- .../transaction/interceptor/TransactionAspectUtils.java | 6 +++--- .../converter/json/MappingJackson2HttpMessageConverter.java | 2 +- .../web/client/HttpClientErrorException.java | 2 +- .../web/client/HttpServerErrorException.java | 2 +- .../springframework/web/client/HttpStatusCodeException.java | 4 ++-- .../web/servlet/view/json/MappingJackson2JsonView.java | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java index 878e4907dc2..612aba8fa0a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java @@ -35,7 +35,7 @@ import org.springframework.util.ObjectUtils; * Spring's {@link Qualifier @Qualifier} annotation. * * @author Chris Beams - * @since 3.2 + * @since 3.1.2 * @see BeanFactoryUtils */ public class BeanFactoryAnnotationUtils { @@ -49,7 +49,6 @@ public class BeanFactoryAnnotationUtils { * @param qualifier the qualifier for selecting between multiple bean matches * @return the matching bean of type {@code T} (never {@code null}) * @throws IllegalStateException if no matching bean of type {@code T} found - * @since 3.2 */ public static T qualifiedBeanOfType(BeanFactory beanFactory, Class beanType, String qualifier) { if (beanFactory instanceof ConfigurableListableBeanFactory) { diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java index e856247d240..6e92e38fd99 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java @@ -46,7 +46,7 @@ import org.springframework.validation.annotation.Validated; * of that class. By default, JSR-303 will validate against its default group only. * *

As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher. - * In Spring 3.2, this class will autodetect a Bean Validation 1.1 compliant provider + * In Spring 3.1.2, this class will autodetect a Bean Validation 1.1 compliant provider * and automatically use the standard method validation support there (once available). * * @author Juergen Hoeller diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java index 52dee7a9c23..531a984c98d 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java @@ -58,7 +58,7 @@ import org.springframework.validation.annotation.Validated; * as well. By default, JSR-303 will validate against its default group only. * *

As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher. - * In Spring 3.2, this class will autodetect a Bean Validation 1.1 compliant provider + * In Spring 3.1.2, this class will autodetect a Bean Validation 1.1 compliant provider * and automatically use the standard method validation support there (once available). * * @author Juergen Hoeller diff --git a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java index 0972d962e70..9e7cb58e7d2 100644 --- a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java @@ -164,7 +164,7 @@ public interface ConfigurableEnvironment extends Environment, ConfigurableProper * reflected in the child. Therefore, care should be taken to configure parent * property sources and profile information prior to calling {@code merge}. * @param parent the environment to merge with - * @since 3.2 + * @since 3.1.2 * @see org.springframework.context.support.AbstractApplicationContext#setParent */ void merge(ConfigurableEnvironment parent); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java index 703f4a0bb2e..e6cdebadd8b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java @@ -29,7 +29,7 @@ import org.springframework.transaction.PlatformTransactionManager; * @author Juergen Hoeller * @author Chris Beams * @since 3.0.2 - * @deprecated as of Spring 3.2 in favor of {@link BeanFactoryUtils} + * @deprecated as of Spring 3.1.2 in favor of {@link BeanFactoryUtils} */ @Deprecated public abstract class TransactionAspectUtils { @@ -40,7 +40,7 @@ public abstract class TransactionAspectUtils { * @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches * @return the chosen {@code PlatformTransactionManager} (never {@code null}) * @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found - * @deprecated as of Spring 3.2 in favor of + * @deprecated as of Spring 3.1.2 in favor of * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)} */ public static PlatformTransactionManager getTransactionManager(BeanFactory beanFactory, String qualifier) { @@ -53,7 +53,7 @@ public abstract class TransactionAspectUtils { * @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches * @return the chosen {@code PlatformTransactionManager} (never {@code null}) * @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found - * @deprecated as of Spring 3.2 in favor of + * @deprecated as of Spring 3.1.2 in favor of * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)} */ public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) { diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index 4e01b51f12d..327f529dd23 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -47,7 +47,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; * * @author Arjen Poutsma * @author Keith Donald - * @since 3.2 + * @since 3.1.2 * @see org.springframework.web.servlet.view.json.MappingJackson2JsonView */ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter { diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java index 5d5ef0b40e3..a768dfb78f2 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java @@ -73,7 +73,7 @@ public class HttpClientErrorException extends HttpStatusCodeException { * @param responseHeaders the response headers, may be {@code null} * @param responseBody the response body content, may be {@code null} * @param responseCharset the response body charset, may be {@code null} - * @since 3.2 + * @since 3.1.2 */ public HttpClientErrorException(HttpStatus statusCode, String statusText, HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) { diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java index 07bd013a52d..5f9ba72cd54 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java @@ -74,7 +74,7 @@ public class HttpServerErrorException extends HttpStatusCodeException { * @param responseHeaders the response headers, may be {@code null} * @param responseBody the response body content, may be {@code null} * @param responseCharset the response body charset, may be {@code null} - * @since 3.2 + * @since 3.1.2 */ public HttpServerErrorException(HttpStatus statusCode, String statusText, HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) { diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java b/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java index 106ec761d65..10f1d22f173 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java @@ -89,7 +89,7 @@ public abstract class HttpStatusCodeException extends RestClientException { * @param responseHeaders the response headers, may be {@code null} * @param responseBody the response body content, may be {@code null} * @param responseCharset the response body charset, may be {@code null} - * @since 3.2 + * @since 3.1.2 */ protected HttpStatusCodeException(HttpStatus statusCode, String statusText, HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) { @@ -118,7 +118,7 @@ public abstract class HttpStatusCodeException extends RestClientException { /** * Return the HTTP response headers. - * @since 3.2 + * @since 3.1.2 */ public HttpHeaders getResponseHeaders() { return this.responseHeaders; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java index d62149c7d7f..994213a3343 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java @@ -48,7 +48,7 @@ import org.springframework.web.servlet.view.AbstractView; * @author Jeremy Grelle * @author Arjen Poutsma * @author Rossen Stoyanchev - * @since 3.2 + * @since 3.1.2 * @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter */ public class MappingJackson2JsonView extends AbstractView {