diff --git a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java index 7b39cc21ecb..3514852dd4d 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -33,7 +33,7 @@ public class EnvironmentAccessor implements PropertyAccessor { @Override public Class[] getSpecificTargetClasses() { - return new Class[] { Environment.class }; + return new Class[] {Environment.class}; } /** @@ -51,12 +51,11 @@ public class EnvironmentAccessor implements PropertyAccessor { */ @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { - return new TypedValue(((Environment)target).getProperty(name)); + return new TypedValue(((Environment) target).getProperty(name)); } /** - * Read only. - * @return false + * Read-only: returns {@code false}. */ @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { @@ -64,7 +63,7 @@ public class EnvironmentAccessor implements PropertyAccessor { } /** - * Read only. No-op. + * Read-only: no-op. */ @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java index 46a2ffc08d7..aec30bcd06b 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -31,6 +31,7 @@ import org.springframework.util.StringUtils; * of {@link ObjectError ObjectErrors} and {@link FieldError FieldErrors}. * * @author Juergen Hoeller + * @author Rossen Stoyanchev * @since 2.5.3 */ @SuppressWarnings("serial") @@ -230,7 +231,7 @@ public abstract class AbstractErrors implements Errors, Serializable { if (field.equals(fieldError.getField())) { return true; } - // Optimization: use chatAt instead of endsWith (SPR-11304, VESC-165) + // Optimization: use charAt instead of endsWith (SPR-11304) int endIndex = field.length() - 1; return (field.charAt(endIndex) == '*' && fieldError.getField().startsWith(field.substring(0, endIndex))); } diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java index c317054e721..baa9666da53 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java @@ -247,10 +247,8 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe * transaction in case of a freshly obtained JMS {@code Connection} and {@code Session}, * which is why this listener container by default does not cache any of those. * However, if you want to optimize for a specific server, consider switching - * this setting to at least {@link #CACHE_CONNECTION} or {@link #CACHE_SESSION} even in - * conjunction with an external transaction manager. - *

Currently known servers that absolutely require {@link #CACHE_NONE} for XA - * transaction processing: JBoss 4. For any others, consider raising the cache level. + * this setting to at least {@link #CACHE_CONNECTION} or {@link #CACHE_SESSION} + * even in conjunction with an external transaction manager. * @see #CACHE_NONE * @see #CACHE_CONNECTION * @see #CACHE_SESSION diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java index 313ebbf563a..7818c7f1307 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java @@ -343,9 +343,11 @@ public class DefaultPersistenceUnitManager /** * Specify the Spring LoadTimeWeaver to use for class instrumentation according * to the JPA class transformer contract. - *

It is not required to specify a LoadTimeWeaver: Most providers will be - * able to provide a subset of their functionality without class instrumentation - * as well, or operate with their VM agent specified on JVM startup. + *

It is not required to specify a LoadTimeWeaver: Most providers will be able + * to provide a subset of their functionality without class instrumentation as well, + * or operate with their own VM agent specified on JVM startup. Furthermore, + * DefaultPersistenceUnitManager falls back to an InstrumentationLoadTimeWeaver + * if Spring's agent-based instrumentation is available at runtime. *

In terms of Spring-provided weaving options, the most important ones are * InstrumentationLoadTimeWeaver, which requires a Spring-specific (but very general) * VM agent specified on JVM startup, and ReflectiveLoadTimeWeaver, which interacts @@ -355,7 +357,6 @@ public class DefaultPersistenceUnitManager * such a shared LoadTimeWeaver (autodetecting the environment by default). * @see org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver - * @see org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader */ @Override public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) { @@ -486,7 +487,7 @@ public class DefaultPersistenceUnitManager } } catch (IOException ex) { - throw new PersistenceException("Failed to scan classpath for unlisted classes", ex); + throw new PersistenceException("Failed to scan classpath for unlisted entity classes", ex); } } } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index 776aaf5a277..0ed0bf79c55 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; - import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import javax.servlet.http.Cookie; @@ -70,10 +69,10 @@ import org.springframework.web.util.UriUtils; */ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable { - private final UriComponents uriComponents; - private final HttpMethod method; + private final UriComponents uriComponents; + private final MultiValueMap headers = new LinkedMultiValueMap(); private String contentType; @@ -88,10 +87,10 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable private String characterEncoding; - private Principal principal; - private Boolean secure; + private Principal principal; + private final Map attributes = new LinkedHashMap(); private MockHttpSession session; @@ -106,34 +105,28 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable private String pathInfo = ValueConstants.DEFAULT_NONE; - private final List postProcessors = - new ArrayList(); + private final List postProcessors = new ArrayList(); /** * Package private constructor. To get an instance, use static factory * methods in {@link MockMvcRequestBuilders}. - * *

Although this class cannot be extended, additional ways to initialize * the {@code MockHttpServletRequest} can be plugged in via * {@link #with(RequestPostProcessor)}. - * * @param urlTemplate a URL template; the resulting URL will be encoded * @param urlVariables zero or more URL variables */ MockHttpServletRequestBuilder(HttpMethod httpMethod, String urlTemplate, Object... urlVariables) { - - Assert.notNull(urlTemplate, "uriTemplate is required"); Assert.notNull(httpMethod, "httpMethod is required"); - - this.uriComponents = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVariables).encode(); + Assert.notNull(urlTemplate, "uriTemplate is required"); this.method = httpMethod; + this.uriComponents = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVariables).encode(); } /** * Add a request parameter to the {@link MockHttpServletRequest}. * If called more than once, the new values are added. - * * @param name the parameter name * @param values one or more values */ @@ -144,7 +137,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Add a header to the request. Values are always added. - * * @param name the header name * @param values one or more header values */ @@ -155,7 +147,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Add all headers to the request. Values are always added. - * * @param httpHeaders the headers and values to add */ public MockHttpServletRequestBuilder headers(HttpHeaders httpHeaders) { @@ -168,7 +159,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the 'Content-Type' header of the request. - * * @param mediaType the content type */ public MockHttpServletRequestBuilder contentType(MediaType mediaType) { @@ -180,7 +170,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the 'Accept' header to the given media type(s). - * * @param mediaTypes one or more media types */ public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) { @@ -191,7 +180,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the 'Accept' header to the given media type(s). - * * @param mediaTypes one or more media types */ public MockHttpServletRequestBuilder accept(String... mediaTypes) { @@ -206,7 +194,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the request body. - * * @param content the body content */ public MockHttpServletRequestBuilder content(byte[] content) { @@ -216,7 +203,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the request body as a UTF-8 String. - * * @param content the body content */ public MockHttpServletRequestBuilder content(String content) { @@ -231,7 +217,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Add the given cookies to the request. Cookies are always added. - * * @param cookies the cookies to add */ public MockHttpServletRequestBuilder cookie(Cookie... cookies) { @@ -243,7 +228,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the locale of the request. - * * @param locale the locale */ public MockHttpServletRequestBuilder locale(Locale locale) { @@ -253,7 +237,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the character encoding of the request. - * * @param encoding the character encoding */ public MockHttpServletRequestBuilder characterEncoding(String encoding) { @@ -263,7 +246,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set a request attribute. - * * @param name the attribute name * @param value the attribute value */ @@ -274,7 +256,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set a session attribute. - * * @param name the session attribute name * @param value the session attribute value */ @@ -285,7 +266,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set session attributes. - * * @param sessionAttributes the session attributes */ public MockHttpServletRequestBuilder sessionAttrs(Map sessionAttributes) { @@ -298,7 +278,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set an "input" flash attribute. - * * @param name the flash attribute name * @param value the flash attribute value */ @@ -309,7 +288,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set flash attributes. - * * @param flashAttributes the flash attributes */ public MockHttpServletRequestBuilder flashAttrs(Map flashAttributes) { @@ -322,10 +300,8 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the HTTP session to use, possibly re-used across requests. - * *

Individual attributes provided via {@link #sessionAttr(String, Object)} * override the content of the session provided here. - * * @param session the HTTP session */ public MockHttpServletRequestBuilder session(MockHttpSession session) { @@ -336,7 +312,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the principal of the request. - * * @param principal the principal */ public MockHttpServletRequestBuilder principal(Principal principal) { @@ -347,16 +322,12 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Specify the portion of the requestURI that represents the context path. - * The context path, if specified, must match to the start of the request - * URI. - * + * The context path, if specified, must match to the start of the request URI. *

In most cases, tests can be written by omitting the context path from * the requestURI. This is because most applications don't actually depend * on the name under which they're deployed. If specified here, the context * path must start with a "/" and must not end with a "/". - * - * @see HttpServletRequest.getContextPath() + * @see HttpServletRequest.getContextPath() */ public MockHttpServletRequestBuilder contextPath(String contextPath) { if (StringUtils.hasText(contextPath)) { @@ -371,7 +342,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable * Specify the portion of the requestURI that represents the path to which * the Servlet is mapped. This is typically a portion of the requestURI * after the context path. - * *

In most cases, tests can be written by omitting the servlet path from * the requestURI. This is because most applications don't actually depend * on the prefix to which a servlet is mapped. For example if a Servlet is @@ -379,9 +349,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable * {@code "/accounts/1"} as opposed to {@code "/main/accounts/1"}. * If specified here, the servletPath must start with a "/" and must not * end with a "/". - * - * @see HttpServletRequest.getServletPath() + * @see HttpServletRequest.getServletPath() */ public MockHttpServletRequestBuilder servletPath(String servletPath) { if (StringUtils.hasText(servletPath)) { @@ -394,14 +362,11 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Specify the portion of the requestURI that represents the pathInfo. - * *

If left unspecified (recommended), the pathInfo will be automatically * derived by removing the contextPath and the servletPath from the * requestURI and using any remaining part. If specified here, the pathInfo * must start with a "/". - * *

If specified, the pathInfo will be used as is. - * * @see HttpServletRequest.getServletPath() */ @@ -416,7 +381,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Set the secure property of the {@link ServletRequest} indicating use of a * secure channel, such as HTTPS. - * * @param secure whether the request is using a secure channel */ public MockHttpServletRequestBuilder secure(boolean secure){ @@ -429,7 +393,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable * in ways not built directly into the {@code MockHttpServletRequestBuilder}. * Implementation of this interface can have builder-style methods themselves * and be made accessible through static factory methods. - * * @param postProcessor a post-processor to add */ public MockHttpServletRequestBuilder with(RequestPostProcessor postProcessor) { @@ -450,7 +413,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable /** * Merges the properties of the "parent" RequestBuilder accepting values * only if not already set in "this" instance. - * * @param parent the parent {@code RequestBuilder} to inherit properties from * @return the result of the merge */ @@ -462,7 +424,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable if (!(parent instanceof MockHttpServletRequestBuilder)) { throw new IllegalArgumentException("Cannot merge with [" + parent.getClass().getName() + "]"); } - MockHttpServletRequestBuilder parentBuilder = (MockHttpServletRequestBuilder) parent; for (String headerName : parentBuilder.headers.keySet()) { @@ -474,7 +435,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable if (this.contentType == null) { this.contentType = parentBuilder.contentType; } - if (this.content == null) { this.content = parentBuilder.content; } @@ -484,7 +444,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable this.parameters.put(paramName, parentBuilder.parameters.get(paramName)); } } - for (Cookie cookie : parentBuilder.cookies) { if (!containsCookie(cookie)) { this.cookies.add(cookie); @@ -494,18 +453,17 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable if (this.locale == null) { this.locale = parentBuilder.locale; } - if (this.characterEncoding == null) { this.characterEncoding = parentBuilder.characterEncoding; } + if (this.secure == null) { + this.secure = parentBuilder.secure; + } if (this.principal == null) { this.principal = parentBuilder.principal; } - if (this.secure == null) { - this.secure = parentBuilder.secure; - } for (String attributeName : parentBuilder.attributes.keySet()) { if (!this.attributes.containsKey(attributeName)) { @@ -547,8 +505,8 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable } private boolean containsCookie(Cookie cookie) { - for (Cookie c : this.cookies) { - if (ObjectUtils.nullSafeEquals(c.getName(), cookie.getName())) { + for (Cookie cookieToCheck : this.cookies) { + if (ObjectUtils.nullSafeEquals(cookieToCheck.getName(), cookie.getName())) { return true; } } @@ -564,7 +522,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable String requestUri = this.uriComponents.getPath(); request.setRequestURI(requestUri); - updatePathRequestProperties(request, requestUri); if (this.uriComponents.getScheme() != null) { @@ -578,7 +535,6 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable } request.setMethod(this.method.name()); - for (String name : this.headers.keySet()) { for (Object value : this.headers.get(name)) { request.addHeader(name, value); @@ -610,31 +566,26 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable request.setContentType(this.contentType); request.setContent(this.content); - request.setCookies(this.cookies.toArray(new Cookie[this.cookies.size()])); if (this.locale != null) { request.addPreferredLocale(this.locale); } - request.setCharacterEncoding(this.characterEncoding); - request.setUserPrincipal(this.principal); - if (this.secure != null) { request.setSecure(this.secure); } + request.setUserPrincipal(this.principal); for (String name : this.attributes.keySet()) { request.setAttribute(name, this.attributes.get(name)); } // Set session before session and flash attributes - if (this.session != null) { request.setSession(this.session); } - for (String name : this.sessionAttributes.keySet()) { request.getSession().setAttribute(name, this.sessionAttributes.get(name)); } @@ -646,10 +597,11 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable flashMapManager.saveOutputFlashMap(flashMap, request, new MockHttpServletResponse()); // Apply post-processors at the very end - for (RequestPostProcessor postProcessor : this.postProcessors) { request = postProcessor.postProcessRequest(request); - Assert.notNull(request, "Post-processor [" + postProcessor.getClass().getName() + "] returned null"); + if (request == null) { + throw new IllegalStateException("Post-processor [" + postProcessor.getClass().getName() + "] returned null"); + } } request.setAsyncSupported(true); @@ -669,22 +621,16 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable * Update the contextPath, servletPath, and pathInfo of the request. */ private void updatePathRequestProperties(MockHttpServletRequest request, String requestUri) { - Assert.isTrue(requestUri.startsWith(this.contextPath), "requestURI [" + requestUri + "] does not start with contextPath [" + this.contextPath + "]"); - request.setContextPath(this.contextPath); request.setServletPath(this.servletPath); - if (ValueConstants.DEFAULT_NONE.equals(this.pathInfo)) { - Assert.isTrue(requestUri.startsWith(this.contextPath + this.servletPath), "Invalid servletPath [" + this.servletPath + "] for requestURI [" + requestUri + "]"); - String extraPath = requestUri.substring(this.contextPath.length() + this.servletPath.length()); this.pathInfo = (StringUtils.hasText(extraPath)) ? extraPath : null; } - request.setPathInfo(this.pathInfo); } @@ -696,10 +642,12 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable flashMapManager = wac.getBean(DispatcherServlet.FLASH_MAP_MANAGER_BEAN_NAME, FlashMapManager.class); } catch (IllegalStateException ex) { + // ignore } catch (NoSuchBeanDefinitionException ex) { + // ignore } - return (flashMapManager != null) ? flashMapManager : new SessionFlashMapManager(); + return (flashMapManager != null ? flashMapManager : new SessionFlashMapManager()); } private static void addToMultiValueMap(MultiValueMap map, String name, T[] values) { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java index 202f2c2fef9..ab0e25de3b5 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java @@ -39,13 +39,11 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque /** - * Package private constructor. Use static factory methods in + * Package-private constructor. Use static factory methods in * {@link MockMvcRequestBuilders}. - * *

For other ways to initialize a {@code MockMultipartHttpServletRequest}, * see {@link #with(RequestPostProcessor)} and the * {@link RequestPostProcessor} extension point. - * * @param urlTemplate a URL template; the resulting URL will be encoded * @param urlVariables zero or more URL variables */ @@ -54,9 +52,9 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque super.contentType(MediaType.MULTIPART_FORM_DATA); } + /** * Create a new MockMultipartFile with the given content. - * * @param name the name of the file * @param content the content of the file */ @@ -67,7 +65,6 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque /** * Add the given MockMultipartFile. - * * @param file the multipart file */ public MockMultipartHttpServletRequestBuilder file(MockMultipartFile file) { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java index cb2322e636f..f531fc07f4f 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.test.web.servlet.request; import org.springframework.mock.web.MockHttpServletRequest; @@ -20,12 +21,12 @@ import org.springframework.mock.web.MockHttpServletRequest; /** * Extension point for applications or 3rd party libraries that wish to further * initialize a {@link MockHttpServletRequest} instance after it has been built - * by {@link MockHttpServletRequestBuilder} or its sub-class + * by {@link MockHttpServletRequestBuilder} or its subclass * {@link MockMultipartHttpServletRequestBuilder}. * *

Implementations of this interface can be provided to * {@link MockHttpServletRequestBuilder#with(RequestPostProcessor)} at the time - * when a request is about to be performed. + * when a request is about to be constructed. * * @author Rossen Stoyanchev * @author Rob Winch @@ -36,9 +37,8 @@ public interface RequestPostProcessor { /** * Post-process the given {@code MockHttpServletRequest} after its creation * and initialization through a {@code MockHttpServletRequestBuilder}. - * * @param request the request to initialize - * @return the request to use, either the one passed in or a wrapped one; + * @return the request to use, either the one passed in or a wrapped one */ MockHttpServletRequest postProcessRequest(MockHttpServletRequest request);