Note that readers for specific bean definition formats are typically - * implemented separately rather than as bean factory subclasses: - * see for example {@link PropertiesBeanDefinitionReader} and + * implemented separately rather than as bean factory subclasses: see for example * {@link org.springframework.beans.factory.xml.XmlBeanDefinitionReader}. * *
For an alternative implementation of the @@ -174,7 +173,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto private volatile String[] frozenBeanDefinitionNames; /** Whether bean definition metadata may be cached for all beans */ - private volatile boolean configurationFrozen = false; + private volatile boolean configurationFrozen; /** diff --git a/spring-context/src/main/java/org/springframework/cache/support/AbstractValueAdaptingCache.java b/spring-context/src/main/java/org/springframework/cache/support/AbstractValueAdaptingCache.java index 96091db9c3c..28beb6da531 100644 --- a/spring-context/src/main/java/org/springframework/cache/support/AbstractValueAdaptingCache.java +++ b/spring-context/src/main/java/org/springframework/cache/support/AbstractValueAdaptingCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -55,8 +55,7 @@ public abstract class AbstractValueAdaptingCache implements Cache { @Override @Nullable public ValueWrapper get(Object key) { - Object value = lookup(key); - return toValueWrapper(value); + return toValueWrapper(lookup(key)); } @Override @@ -123,5 +122,4 @@ public abstract class AbstractValueAdaptingCache implements Cache { return (storeValue != null ? new SimpleValueWrapper(fromStoreValue(storeValue)) : null); } - } diff --git a/spring-core/src/main/java/org/springframework/core/io/FileUrlResource.java b/spring-core/src/main/java/org/springframework/core/io/FileUrlResource.java index 0c94007a664..35a1e74e4f9 100644 --- a/spring-core/src/main/java/org/springframework/core/io/FileUrlResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/FileUrlResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -53,7 +53,7 @@ public class FileUrlResource extends UrlResource implements WritableResource { /** * Create a new {@code FileUrlResource} based on the given URL object. *
Note that this does not enforce "file" as URL protocol. If a protocol
- * is known to be resolvable to a file,
+ * is known to be resolvable to a file, it is acceptable for this purpose.
* @param url a URL
* @see ResourceUtils#isFileURL(URL)
* @see #getFile()
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
index 1c035451e95..757d1f9b591 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -146,7 +146,8 @@ public class PersistenceExceptionTranslationInterceptor
else {
PersistenceExceptionTranslator translator = this.persistenceExceptionTranslator;
if (translator == null) {
- Assert.state(this.beanFactory != null, "No PersistenceExceptionTranslator set");
+ Assert.state(this.beanFactory != null,
+ "Cannot use PersistenceExceptionTranslator autodetection without ListableBeanFactory");
translator = detectPersistenceExceptionTranslators(this.beanFactory);
this.persistenceExceptionTranslator = translator;
}
@@ -157,16 +158,15 @@ public class PersistenceExceptionTranslationInterceptor
/**
* Detect all PersistenceExceptionTranslators in the given BeanFactory.
- * @param beanFactory the ListableBeanFactory to obtaining all
- * PersistenceExceptionTranslators from
+ * @param bf the ListableBeanFactory to obtain PersistenceExceptionTranslators from
* @return a chained PersistenceExceptionTranslator, combining all
- * PersistenceExceptionTranslators found in the factory
+ * PersistenceExceptionTranslators found in the given bean factory
* @see ChainedPersistenceExceptionTranslator
*/
- protected PersistenceExceptionTranslator detectPersistenceExceptionTranslators(ListableBeanFactory beanFactory) {
+ protected PersistenceExceptionTranslator detectPersistenceExceptionTranslators(ListableBeanFactory bf) {
// Find all translators, being careful not to activate FactoryBeans.
Map This {@link MediaType#APPLICATION_JSON} variant should be used to set JSON
* content type because while
* RFC7159
@@ -107,7 +105,6 @@ public class MediaType extends MimeType implements Serializable {
/**
* A String equivalent of {@link MediaType#APPLICATION_JSON_UTF8}.
- *
* This {@link MediaType#APPLICATION_JSON_VALUE} variant should be used to set JSON
* content type because while
* RFC7159
@@ -406,7 +403,7 @@ public class MediaType extends MimeType implements Serializable {
/**
* Copy-constructor that copies the type and subtype of the given {@code MediaType},
- * and allows for different parameter.
+ * and allows for different parameters.
* @param other the other media type
* @param parameters the parameters, may be {@code null}
* @throws IllegalArgumentException if any of the parameters contain illegal characters
@@ -453,7 +450,7 @@ public class MediaType extends MimeType implements Serializable {
* For instance, {@code text/*} includes {@code text/plain} and {@code text/html},
* and {@code application/*+xml} includes {@code application/soap+xml}, etc.
* This method is not symmetric.
- * Simply calls {@link #includes(MimeType)} but declared with a
+ * Simply calls {@link MimeType#includes(MimeType)} but declared with a
* {@code MediaType} parameter for binary backwards compatibility.
* @param other the reference media type with which to compare
* @return {@code true} if this media type includes the given media type;
@@ -468,7 +465,7 @@ public class MediaType extends MimeType implements Serializable {
* For instance, {@code text/*} is compatible with {@code text/plain},
* {@code text/html}, and vice versa. In effect, this method is similar to
* {@link #includes}, except that it is symmetric.
- * Simply calls {@link #isCompatibleWith(MimeType)} but declared with a
+ * Simply calls {@link MimeType#isCompatibleWith(MimeType)} but declared with a
* {@code MediaType} parameter for binary backwards compatibility.
* @param other the reference media type with which to compare
* @return {@code true} if this media type is compatible with the given media type;
@@ -542,7 +539,7 @@ public class MediaType extends MimeType implements Serializable {
}
/**
- * Parse the given comma-separated string into a list of {@code MediaType} objects.
+ * Parse the comma-separated string into a list of {@code MediaType} objects.
* This method can be used to parse an Accept or Content-Type header.
* @param mediaTypes the string to parse
* @return the list of media types
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeDataBinder.java
index 4cb29e13f04..1114de7b612 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeDataBinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -64,7 +64,7 @@ public class WebExchangeDataBinder extends WebDataBinder {
/**
* Bind query params, form data, and or multipart form data to the binder target.
- * @param exchange the current exchange.
+ * @param exchange the current exchange
* @return a {@code Mono The type of the target property for a multipart file can be Part, MultipartFile,
* byte[], or String. The latter two receive the contents of the uploaded file;
* all metadata like original file name, content type, etc are lost in those cases.
- * @param request request with parameters to bind (can be multipart)
+ * @param request the request with parameters to bind (can be multipart)
* @see org.springframework.web.multipart.MultipartRequest
* @see org.springframework.web.multipart.MultipartFile
* @see javax.servlet.http.Part
@@ -109,12 +109,12 @@ public class WebRequestDataBinder extends WebDataBinder {
*/
public void bind(WebRequest request) {
MutablePropertyValues mpvs = new MutablePropertyValues(request.getParameterMap());
- if (isMultipartRequest(request) && request instanceof NativeWebRequest) {
+ if (request instanceof NativeWebRequest) {
MultipartRequest multipartRequest = ((NativeWebRequest) request).getNativeRequest(MultipartRequest.class);
if (multipartRequest != null) {
bindMultipart(multipartRequest.getMultiFileMap(), mpvs);
}
- else {
+ else if (isMultipartRequest(request)) {
HttpServletRequest servletRequest = ((NativeWebRequest) request).getNativeRequest(HttpServletRequest.class);
if (servletRequest != null) {
bindParts(servletRequest, mpvs);
@@ -126,11 +126,11 @@ public class WebRequestDataBinder extends WebDataBinder {
/**
* Check if the request is a multipart request (by checking its Content-Type header).
- * @param request request with parameters to bind
+ * @param request the request with parameters to bind
*/
private boolean isMultipartRequest(WebRequest request) {
String contentType = request.getHeader("Content-Type");
- return (contentType != null && StringUtils.startsWithIgnoreCase(contentType, "multipart"));
+ return StringUtils.startsWithIgnoreCase(contentType, "multipart/");
}
private void bindParts(HttpServletRequest request, MutablePropertyValues mpvs) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
index dbb6bc099a1..2d53ad24c31 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -55,8 +55,9 @@ import org.springframework.web.server.ServerWebExchange;
public class PathVariableMethodArgumentResolver extends AbstractNamedValueSyncArgumentResolver {
/**
- * @param factory a bean factory to use for resolving ${...}
- * placeholder and #{...} SpEL expressions in default values;
+ * Create a new {@link PathVariableMethodArgumentResolver}.
+ * @param factory a bean factory to use for resolving {@code ${...}}
+ * placeholder and {@code #{...}} SpEL expressions in default values;
* or {@code null} if default values are not expected to contain expressions
* @param registry for checking reactive type wrappers
*/
@@ -84,7 +85,6 @@ public class PathVariableMethodArgumentResolver extends AbstractNamedValueSyncAr
}
@Override
- @SuppressWarnings("unchecked")
protected Object resolveNamedValue(String name, MethodParameter parameter, ServerWebExchange exchange) {
String attributeName = HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE;
return exchange.getAttributeOrDefault(attributeName, Collections.emptyMap()).get(name);
@@ -96,7 +96,6 @@ public class PathVariableMethodArgumentResolver extends AbstractNamedValueSyncAr
}
@Override
- @SuppressWarnings("unchecked")
protected void handleResolvedValue(
@Nullable Object arg, String name, MethodParameter parameter, Model model, ServerWebExchange exchange) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
index 75ef60728d2..980291c97fe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -87,10 +87,16 @@ public class HandlerExecutionChain {
return this.handler;
}
+ /**
+ * Add the given interceptor to the end of this chain.
+ */
public void addInterceptor(HandlerInterceptor interceptor) {
initInterceptorList().add(interceptor);
}
+ /**
+ * Add the given interceptors to the end of this chain.
+ */
public void addInterceptors(HandlerInterceptor... interceptors) {
if (!ObjectUtils.isEmpty(interceptors)) {
CollectionUtils.mergeArrayIntoCollection(interceptors, initInterceptorList());
@@ -187,13 +193,16 @@ public class HandlerExecutionChain {
HandlerInterceptor[] interceptors = getInterceptors();
if (!ObjectUtils.isEmpty(interceptors)) {
for (int i = interceptors.length - 1; i >= 0; i--) {
- if (interceptors[i] instanceof AsyncHandlerInterceptor) {
+ HandlerInterceptor interceptor = interceptors[i];
+ if (interceptor instanceof AsyncHandlerInterceptor) {
try {
- AsyncHandlerInterceptor asyncInterceptor = (AsyncHandlerInterceptor) interceptors[i];
+ AsyncHandlerInterceptor asyncInterceptor = (AsyncHandlerInterceptor) interceptor;
asyncInterceptor.afterConcurrentHandlingStarted(request, response, this.handler);
}
catch (Throwable ex) {
- logger.error("Interceptor [" + interceptors[i] + "] failed in afterConcurrentHandlingStarted", ex);
+ if (logger.isErrorEnabled()) {
+ logger.error("Interceptor [" + interceptor + "] failed in afterConcurrentHandlingStarted", ex);
+ }
}
}
}
@@ -202,7 +211,7 @@ public class HandlerExecutionChain {
/**
- * Delegates to the handler's {@code toString()}.
+ * Delegates to the handler's {@code toString()} implementation.
*/
@Override
public String toString() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index 3239cbb10af..21b269523af 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -183,9 +183,8 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
}
/**
- * Set "global" CORS configuration based on URL patterns. By default the first
- * matching URL pattern is combined with the CORS configuration for the
- * handler, if any.
+ * Set the "global" CORS configurations based on URL patterns. By default the first
+ * matching URL pattern is combined with the CORS configuration for the handler, if any.
* @since 4.2
*/
public void setCorsConfigurations(Map This is called in addition to any {@link MappedInterceptor}s that may have been provided
- * via {@link #setInterceptors}, by default adding all beans of type {@link MappedInterceptor}
- * from the current context and its ancestors. Subclasses can override and refine this policy.
- * @param mappedInterceptors an empty list to add {@link MappedInterceptor} instances to
+ * Detect beans of type {@link MappedInterceptor} and add them to the list
+ * of mapped interceptors.
+ * This is called in addition to any {@link MappedInterceptor}s that may
+ * have been provided via {@link #setInterceptors}, by default adding all
+ * beans of type {@link MappedInterceptor} from the current context and its
+ * ancestors. Subclasses can override and refine this policy.
+ * @param mappedInterceptors an empty list to add to
*/
protected void detectMappedInterceptors(List By default, the supported interceptor types are {@link HandlerInterceptor}
- * and {@link WebRequestInterceptor}. Each given {@link WebRequestInterceptor}
- * will be wrapped in a {@link WebRequestHandlerInterceptorAdapter}.
- * Can be overridden in subclasses.
- * @param interceptor the specified interceptor object
- * @return the interceptor wrapped as HandlerInterceptor
+ * Adapt the given interceptor object to {@link HandlerInterceptor}.
+ * By default, the supported interceptor types are
+ * {@link HandlerInterceptor} and {@link WebRequestInterceptor}. Each given
+ * {@link WebRequestInterceptor} is wrapped with
+ * {@link WebRequestHandlerInterceptorAdapter}.
+ * @param interceptor the interceptor
+ * @return the interceptor downcast or adapted to HandlerInterceptor
* @see org.springframework.web.servlet.HandlerInterceptor
* @see org.springframework.web.context.request.WebRequestInterceptor
* @see WebRequestHandlerInterceptorAdapter
@@ -313,7 +313,8 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
/**
* Return the adapted interceptors as {@link HandlerInterceptor} array.
- * @return the array of {@link HandlerInterceptor}s, or {@code null} if none
+ * @return the array of {@link HandlerInterceptor HandlerInterceptor}s,
+ * or {@code null} if none
*/
@Nullable
protected final HandlerInterceptor[] getAdaptedInterceptors() {
@@ -393,8 +394,8 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* Build a {@link HandlerExecutionChain} for the given handler, including
* applicable interceptors.
* The default implementation builds a standard {@link HandlerExecutionChain}
- * with the given handler, the handler mapping's common interceptors, and any
- * {@link MappedInterceptor}s matching to the current request URL. Interceptors
+ * with the given handler, the common interceptors of the handler mapping, and any
+ * {@link MappedInterceptor MappedInterceptors} matching to the current request URL. Interceptors
* are added in the order they were registered. Subclasses may override this
* in order to extend/rearrange the list of interceptors.
* NOTE: The passed-in handler object may be a raw handler or a
@@ -464,12 +465,12 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
if (CorsUtils.isPreFlightRequest(request)) {
HandlerInterceptor[] interceptors = chain.getInterceptors();
- chain = new HandlerExecutionChain(new PreFlightHandler(config), interceptors);
+ return new HandlerExecutionChain(new PreFlightHandler(config), interceptors);
}
else {
chain.addInterceptor(new CorsInterceptor(config));
+ return chain;
}
- return chain;
}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 78a0b51118a..780d4eb36a1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -300,7 +300,6 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleConte
* @see #setDefaultLocale
* @see javax.servlet.http.HttpServletRequest#getLocale()
*/
- @Nullable
protected Locale determineDefaultLocale(HttpServletRequest request) {
Locale defaultLocale = getDefaultLocale();
if (defaultLocale == null) {