diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java index e42c334b94b..3f01b009c04 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2017 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. @@ -39,6 +39,7 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor context, CacheOperationInvoker invoker) { @@ -82,7 +83,6 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor context) { CacheResolver exceptionCacheResolver = context.getOperation().getExceptionCacheResolver(); if (exceptionCacheResolver != null) { @@ -101,9 +100,10 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptorClone the specified exception. If the exception is not {@code serializable}, * the original exception is returned. If no common ancestor can be found, returns * the original exception. @@ -111,8 +111,8 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptorAllows for programmatic management of JDBC 3.0 - * {@link java.sql.Savepoint Savepoints}. Spring's - * {@link org.springframework.transaction.support.DefaultTransactionStatus} - * will automatically delegate to this, as it autodetects transaction - * objects that implement the SavepointManager interface. + *

Allows for programmatic management of JDBC {@link java.sql.Savepoint Savepoints}. + * Spring's {@link org.springframework.transaction.support.DefaultTransactionStatus} + * automatically delegates to this, as it autodetects transaction objects which + * implement the {@link SavepointManager} interface. * * @author Juergen Hoeller * @since 1.1 + * @see DataSourceTransactionManager */ public abstract class JdbcTransactionObjectSupport implements SavepointManager, SmartTransactionObject { @@ -151,7 +150,7 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager, } if (!hasConnectionHolder()) { throw new TransactionUsageException( - "Cannot create nested transaction if not exposing a JDBC transaction"); + "Cannot create nested transaction when not exposing a JDBC transaction"); } return getConnectionHolder(); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java index bea1e3e864a..ea3af799c94 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2017 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. @@ -23,9 +23,9 @@ import org.springframework.transaction.TransactionTimedOutException; /** * Convenient base class for resource holders. * - *

Features rollback-only support for nested transactions. - * Can expire after a certain number of seconds or milliseconds, - * to determine transactional timeouts. + *

Features rollback-only support for participating transactions. + * Can expire after a certain number of seconds or milliseconds + * in order to determine a transactional timeout. * * @author Juergen Hoeller * @since 02.02.2004 diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java index 5b6dc0aab03..daa7a3892fc 100644 --- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java @@ -141,8 +141,7 @@ class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements for (Map.Entry> entry : headers.entrySet()) { nettyRequest.headers().add(entry.getKey(), entry.getValue()); } - if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH) - && this.body.buffer().readableBytes() > 0) { + if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH) && this.body.buffer().readableBytes() > 0) { nettyRequest.headers().set(HttpHeaders.CONTENT_LENGTH, this.body.buffer().readableBytes()); } diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java index 8c82eefdd58..755de18e313 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -54,8 +54,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; * @author Rossen Stoyanchev * @since 3.1 */ -public class ModelAttributeMethodProcessor - implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler { +public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler { protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index c37735ad3b2..eeaacfa3b99 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -251,7 +251,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements } /** - * Validate the request part if applicable. + * Validate the binding target if applicable. *

The default implementation checks for {@code @javax.validation.Valid}, * Spring's {@link org.springframework.validation.annotation.Validated}, * and custom annotations whose name starts with "Valid". diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java index 541eae26904..d1f7a1e0096 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -110,8 +110,8 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod { * @param mavContainer the ModelAndViewContainer for this request * @param providedArgs "given" arguments matched by type (not resolved) */ - public void invokeAndHandle(ServletWebRequest webRequest, - ModelAndViewContainer mavContainer, Object... providedArgs) throws Exception { + public void invokeAndHandle(ServletWebRequest webRequest, ModelAndViewContainer mavContainer, + Object... providedArgs) throws Exception { Object returnValue = invokeForRequest(webRequest, mavContainer, providedArgs); setResponseStatus(webRequest); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 7e5d368cf6b..d54c28772d1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -144,7 +144,6 @@ import org.springframework.web.servlet.view.velocity.VelocityConfigurer; import org.springframework.web.servlet.view.velocity.VelocityViewResolver; import org.springframework.web.util.UrlPathHelper; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -161,7 +160,9 @@ import static org.junit.Assert.*; */ public class MvcNamespaceTests { - public static final String VIEWCONTROLLER_BEAN_NAME = "org.springframework.web.servlet.config.viewControllerHandlerMapping"; + public static final String VIEWCONTROLLER_BEAN_NAME = + "org.springframework.web.servlet.config.viewControllerHandlerMapping"; + private GenericWebApplicationContext appContext; @@ -199,7 +200,7 @@ public class MvcNamespaceTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.json"); NativeWebRequest webRequest = new ServletWebRequest(request); ContentNegotiationManager manager = mapping.getContentNegotiationManager(); - assertEquals(Arrays.asList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(webRequest)); + assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(webRequest)); RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class); assertNotNull(adapter); @@ -707,7 +708,8 @@ public class MvcNamespaceTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.xml"); NativeWebRequest webRequest = new ServletWebRequest(request); - assertEquals(Arrays.asList(MediaType.valueOf("application/rss+xml")), manager.resolveMediaTypes(webRequest)); + assertEquals(Collections.singletonList(MediaType.valueOf("application/rss+xml")), + manager.resolveMediaTypes(webRequest)); ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); assertNotNull(compositeResolver); @@ -927,14 +929,14 @@ public class MvcNamespaceTests { assertArrayEquals(new String[]{"header1", "header2", "header3"}, config.getAllowedHeaders().toArray()); assertArrayEquals(new String[]{"header1", "header2"}, config.getExposedHeaders().toArray()); assertFalse(config.getAllowCredentials()); - assertEquals(new Long(123), config.getMaxAge()); + assertEquals(Long.valueOf(123), config.getMaxAge()); config = configs.get("/resources/**"); assertArrayEquals(new String[]{"http://domain1.com"}, config.getAllowedOrigins().toArray()); assertArrayEquals(new String[]{"GET", "HEAD", "POST"}, config.getAllowedMethods().toArray()); assertArrayEquals(new String[]{"*"}, config.getAllowedHeaders().toArray()); assertNull(config.getExposedHeaders()); assertTrue(config.getAllowCredentials()); - assertEquals(new Long(1800), config.getMaxAge()); + assertEquals(Long.valueOf(1800), config.getMaxAge()); } } @@ -950,21 +952,21 @@ public class MvcNamespaceTests { @DateTimeFormat(iso = ISO.DATE) - @Target({ElementType.PARAMETER}) + @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface IsoDate { } @NumberFormat(style = NumberFormat.Style.PERCENT) - @Target({ElementType.PARAMETER}) + @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface PercentNumber { } @Validated(MyGroup.class) - @Target({ElementType.PARAMETER}) + @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface MyValid { } @@ -983,6 +985,7 @@ public class MvcNamespaceTests { public void testBind(@RequestParam @IsoDate Date date, @RequestParam(required = false) @PercentNumber Double percent, @MyValid TestBean bean, BindingResult result) { + this.date = date; this.percent = percent; this.recordedValidationError = (result.getErrorCount() == 1);