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
This commit is contained in:
@@ -35,7 +35,7 @@ import org.springframework.util.ObjectUtils;
|
|||||||
* Spring's {@link Qualifier @Qualifier} annotation.
|
* Spring's {@link Qualifier @Qualifier} annotation.
|
||||||
*
|
*
|
||||||
* @author Chris Beams
|
* @author Chris Beams
|
||||||
* @since 3.2
|
* @since 3.1.2
|
||||||
* @see BeanFactoryUtils
|
* @see BeanFactoryUtils
|
||||||
*/
|
*/
|
||||||
public class BeanFactoryAnnotationUtils {
|
public class BeanFactoryAnnotationUtils {
|
||||||
@@ -49,7 +49,6 @@ public class BeanFactoryAnnotationUtils {
|
|||||||
* @param qualifier the qualifier for selecting between multiple bean matches
|
* @param qualifier the qualifier for selecting between multiple bean matches
|
||||||
* @return the matching bean of type {@code T} (never {@code null})
|
* @return the matching bean of type {@code T} (never {@code null})
|
||||||
* @throws IllegalStateException if no matching bean of type {@code T} found
|
* @throws IllegalStateException if no matching bean of type {@code T} found
|
||||||
* @since 3.2
|
|
||||||
*/
|
*/
|
||||||
public static <T> T qualifiedBeanOfType(BeanFactory beanFactory, Class<T> beanType, String qualifier) {
|
public static <T> T qualifiedBeanOfType(BeanFactory beanFactory, Class<T> beanType, String qualifier) {
|
||||||
if (beanFactory instanceof ConfigurableListableBeanFactory) {
|
if (beanFactory instanceof ConfigurableListableBeanFactory) {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ import org.springframework.validation.annotation.Validated;
|
|||||||
* of that class. By default, JSR-303 will validate against its default group only.
|
* of that class. By default, JSR-303 will validate against its default group only.
|
||||||
*
|
*
|
||||||
* <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher.
|
* <p>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).
|
* and automatically use the standard method validation support there (once available).
|
||||||
*
|
*
|
||||||
* @author Juergen Hoeller
|
* @author Juergen Hoeller
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ import org.springframework.validation.annotation.Validated;
|
|||||||
* as well. By default, JSR-303 will validate against its default group only.
|
* as well. By default, JSR-303 will validate against its default group only.
|
||||||
*
|
*
|
||||||
* <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher.
|
* <p>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).
|
* and automatically use the standard method validation support there (once available).
|
||||||
*
|
*
|
||||||
* @author Juergen Hoeller
|
* @author Juergen Hoeller
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ public interface ConfigurableEnvironment extends Environment, ConfigurableProper
|
|||||||
* reflected in the child. Therefore, care should be taken to configure parent
|
* reflected in the child. Therefore, care should be taken to configure parent
|
||||||
* property sources and profile information prior to calling {@code merge}.
|
* property sources and profile information prior to calling {@code merge}.
|
||||||
* @param parent the environment to merge with
|
* @param parent the environment to merge with
|
||||||
* @since 3.2
|
* @since 3.1.2
|
||||||
* @see org.springframework.context.support.AbstractApplicationContext#setParent
|
* @see org.springframework.context.support.AbstractApplicationContext#setParent
|
||||||
*/
|
*/
|
||||||
void merge(ConfigurableEnvironment parent);
|
void merge(ConfigurableEnvironment parent);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import org.springframework.transaction.PlatformTransactionManager;
|
|||||||
* @author Juergen Hoeller
|
* @author Juergen Hoeller
|
||||||
* @author Chris Beams
|
* @author Chris Beams
|
||||||
* @since 3.0.2
|
* @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
|
@Deprecated
|
||||||
public abstract class TransactionAspectUtils {
|
public abstract class TransactionAspectUtils {
|
||||||
@@ -40,7 +40,7 @@ public abstract class TransactionAspectUtils {
|
|||||||
* @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches
|
* @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches
|
||||||
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
|
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
|
||||||
* @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found
|
* @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)}
|
* {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
|
||||||
*/
|
*/
|
||||||
public static PlatformTransactionManager getTransactionManager(BeanFactory beanFactory, String qualifier) {
|
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
|
* @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches
|
||||||
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
|
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
|
||||||
* @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found
|
* @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)}
|
* {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
|
||||||
*/
|
*/
|
||||||
public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) {
|
public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
|
|||||||
*
|
*
|
||||||
* @author Arjen Poutsma
|
* @author Arjen Poutsma
|
||||||
* @author Keith Donald
|
* @author Keith Donald
|
||||||
* @since 3.2
|
* @since 3.1.2
|
||||||
* @see org.springframework.web.servlet.view.json.MappingJackson2JsonView
|
* @see org.springframework.web.servlet.view.json.MappingJackson2JsonView
|
||||||
*/
|
*/
|
||||||
public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter<Object> {
|
public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter<Object> {
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class HttpClientErrorException extends HttpStatusCodeException {
|
|||||||
* @param responseHeaders the response headers, may be {@code null}
|
* @param responseHeaders the response headers, may be {@code null}
|
||||||
* @param responseBody the response body content, may be {@code null}
|
* @param responseBody the response body content, may be {@code null}
|
||||||
* @param responseCharset the response body charset, 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,
|
public HttpClientErrorException(HttpStatus statusCode, String statusText,
|
||||||
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public class HttpServerErrorException extends HttpStatusCodeException {
|
|||||||
* @param responseHeaders the response headers, may be {@code null}
|
* @param responseHeaders the response headers, may be {@code null}
|
||||||
* @param responseBody the response body content, may be {@code null}
|
* @param responseBody the response body content, may be {@code null}
|
||||||
* @param responseCharset the response body charset, 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,
|
public HttpServerErrorException(HttpStatus statusCode, String statusText,
|
||||||
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ public abstract class HttpStatusCodeException extends RestClientException {
|
|||||||
* @param responseHeaders the response headers, may be {@code null}
|
* @param responseHeaders the response headers, may be {@code null}
|
||||||
* @param responseBody the response body content, may be {@code null}
|
* @param responseBody the response body content, may be {@code null}
|
||||||
* @param responseCharset the response body charset, 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,
|
protected HttpStatusCodeException(HttpStatus statusCode, String statusText,
|
||||||
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
|
||||||
@@ -118,7 +118,7 @@ public abstract class HttpStatusCodeException extends RestClientException {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the HTTP response headers.
|
* Return the HTTP response headers.
|
||||||
* @since 3.2
|
* @since 3.1.2
|
||||||
*/
|
*/
|
||||||
public HttpHeaders getResponseHeaders() {
|
public HttpHeaders getResponseHeaders() {
|
||||||
return this.responseHeaders;
|
return this.responseHeaders;
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ import org.springframework.web.servlet.view.AbstractView;
|
|||||||
* @author Jeremy Grelle
|
* @author Jeremy Grelle
|
||||||
* @author Arjen Poutsma
|
* @author Arjen Poutsma
|
||||||
* @author Rossen Stoyanchev
|
* @author Rossen Stoyanchev
|
||||||
* @since 3.2
|
* @since 3.1.2
|
||||||
* @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
|
* @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
|
||||||
*/
|
*/
|
||||||
public class MappingJackson2JsonView extends AbstractView {
|
public class MappingJackson2JsonView extends AbstractView {
|
||||||
|
|||||||
Reference in New Issue
Block a user