From 2cf45bad860f560d3a5806eb23ffe1669e907673 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Dec 2012 14:55:41 -0800 Subject: [PATCH] Replace space indentation with tabs Issue: SPR-10127 --- .../framework/ReflectiveMethodInvocation.java | 4 +- .../aop/target/ThreadLocalTargetSource.java | 6 +- .../TigerAspectJExpressionPointcutTests.java | 10 +- .../TrickyAspectJPointcutExpressionTests.java | 16 +- .../aspectj/TypePatternClassFilterTests.java | 2 +- .../AbstractAspectJAdvisorFactoryTests.java | 9 +- .../aop/framework/MethodInvocationTests.java | 2 +- ...nterfaceDrivenDependencyInjectionAspect.aj | 2 +- .../aspectj/JpaExceptionTranslatorAspect.aj | 20 +- .../aspectj/AbstractTransactionAspect.aj | 2 +- .../mock/staticmock/Person_Roo_Entity.aj | 128 +-- .../beans/AbstractPropertyAccessor.java | 2 +- .../beans/BeanWrapperImpl.java | 2 +- .../beans/DirectFieldAccessor.java | 2 +- .../beans/PropertyAccessor.java | 4 +- .../config/FieldRetrievingFactoryBean.java | 2 +- .../PreferencesPlaceholderConfigurer.java | 4 +- .../config/PropertyPathFactoryBean.java | 6 +- .../support/BeanDefinitionResource.java | 2 +- .../support/BeanDefinitionValueResolver.java | 4 +- .../support/DefaultListableBeanFactory.java | 2 +- .../propertyeditors/CustomNumberEditor.java | 4 +- .../beans/support/MutableSortDefinition.java | 3 +- .../springframework/beans/BeanUtilsTests.java | 20 +- .../java/test/util/TestResourceUtils.java | 30 +- .../mail/javamail/MimeMessageHelper.java | 30 +- .../quartz/LocalDataSourceJobStore.java | 6 +- .../quartz/LocalTaskExecutorThreadPool.java | 4 +- .../quartz/ResourceLoaderClassLoadHelper.java | 4 +- .../quartz/CronTriggerBeanTests.java | 2 +- .../support/AbstractApplicationContext.java | 2 +- .../access/LocalSlsbInvokerInterceptor.java | 2 +- .../SimpleRemoteSlsbInvokerInterceptor.java | 2 +- .../rmi/JndiRmiClientInterceptor.java | 6 +- .../remoting/rmi/RmiClientInterceptor.java | 4 +- .../remoting/rmi/RmiInvocationHandler.java | 2 +- .../remoting/rmi/RmiInvocationWrapper.java | 2 +- .../aop/framework/ProxyFactoryBeanTests.java | 4 +- .../AutowiredConfigurationTests.java | 6 +- .../configuration/ImportResourceTests.java | 222 ++--- .../ClassPathXmlApplicationContextTests.java | 3 +- .../context/support/NoOpAdvice.java | 2 +- .../context/support/Spr7283Tests.java | 20 +- .../scripting/groovy/LogUserAdvice.java | 16 +- .../org/springframework/core/Constants.java | 22 +- .../convert/converter/GenericConverter.java | 24 +- .../core/io/AbstractResource.java | 2 +- .../core/io/ByteArrayResource.java | 2 +- .../core/io/DescriptiveResource.java | 2 +- .../core/io/FileSystemResource.java | 2 +- .../core/io/InputStreamResource.java | 2 +- .../springframework/core/io/UrlResource.java | 2 +- .../springframework/util/FileCopyUtils.java | 2 +- .../core/ExceptionDepthComparatorTests.java | 118 +-- .../core/GenericTypeResolverTests.java | 48 +- .../spel/support/ReflectionHelper.java | 2 +- .../spel/ConstructorInvocationTests.java | 2 +- .../spel/SpelDocumentationTests.java | 40 +- .../jdbc/core/JdbcOperations.java | 10 +- .../DataSourceTransactionManager.java | 2 +- .../jdbc/support/lob/LobCreatorUtils.java | 4 +- .../jdbc/support/lob/OracleLobHandler.java | 6 +- .../nativejdbc/JBossNativeJdbcExtractor.java | 6 +- .../jms/core/JmsOperations.java | 6 +- .../springframework/jms/core/JmsTemplate.java | 2 +- .../jms/core/JmsTemplate102Tests.java | 8 +- .../HibernateTransactionManager.java | 2 +- .../HibernateTransactionManager.java | 2 +- .../hibernate3/LocalCacheProviderProxy.java | 2 +- .../LocalDataSourceConnectionProvider.java | 2 +- .../hibernate3/LocalRegionFactoryProxy.java | 2 +- .../LocalTransactionManagerLookup.java | 2 +- .../orm/hibernate3/SessionFactoryUtils.java | 8 +- .../hibernate3/support/AbstractLobType.java | 8 +- .../support/HibernateDaoSupport.java | 6 +- .../support/OpenSessionInViewInterceptor.java | 2 +- .../support/AbstractLobTypeHandler.java | 2 +- .../springframework/orm/jdo/JdoTemplate.java | 4 +- .../LocalPersistenceManagerFactoryBean.java | 2 +- .../jdo/PersistenceManagerFactoryUtils.java | 6 +- .../orm/jdo/support/JdoDaoSupport.java | 2 +- .../orm/jpa/JpaTransactionManager.java | 2 +- .../support/OpenSessionInViewTests.java | 6 +- .../OpenPersistenceManagerInViewTests.java | 2 +- .../support/OpenEntityManagerInViewTests.java | 4 +- .../oxm/XmlMappingException.java | 12 +- .../oxm/xstream/XStreamMarshaller.java | 12 +- .../oxm/jaxb/BinaryObject.java | 46 +- .../org/springframework/oxm/jibx/Flights.java | 20 +- .../xmlbeans/XmlOptionsFactoryBeanTests.java | 16 +- .../springframework/oxm/xstream/Flight.java | 18 +- .../tiles/ComponentControllerSupport.java | 4 +- .../web/servlet/view/tiles/TilesView.java | 2 +- .../web/struts/ContextLoaderPlugIn.java | 2 +- .../test/util/MatcherAssertionErrors.java | 6 +- .../test/web/servlet/RequestBuilder.java | 2 +- .../servlet/result/StatusResultMatchers.java | 828 +++++++++--------- .../setup/PatternMappingFilterProxy.java | 4 +- .../MockHttpServletRequestBuilderTests.java | 6 +- .../standalone/ExceptionHandlerTests.java | 2 +- .../samples/standalone/RedirectTests.java | 28 +- .../FlashAttributeAssertionTests.java | 20 +- .../RequestAttributeAssertionTests.java | 12 +- .../SessionAttributeAssertionTests.java | 6 +- .../test/util/AssertionErrors.java | 30 +- .../CciLocalTransactionManager.java | 2 +- .../jta/JtaTransactionManager.java | 10 +- .../jta/WebLogicJtaTransactionManager.java | 2 +- .../AbstractPlatformTransactionManager.java | 2 +- .../support/DefaultTransactionStatus.java | 2 +- .../TransactionSynchronizationManager.java | 2 +- ...TransactionAttributeSourceEditorTests.java | 40 +- .../org/springframework/http/HttpHeaders.java | 6 +- .../org/springframework/http/MediaType.java | 2 +- .../HttpComponentsClientHttpRequest.java | 6 +- ...ttpComponentsClientHttpRequestFactory.java | 22 +- .../SimpleStreamingClientHttpRequest.java | 50 +- .../caucho/BurlapClientInterceptor.java | 2 +- .../caucho/HessianClientInterceptor.java | 2 +- .../HttpInvokerClientInterceptor.java | 2 +- .../web/filter/GenericFilterBean.java | 8 +- .../web/jsf/FacesContextUtils.java | 2 +- .../web/util/UriComponentsBuilder.java | 6 +- .../springframework/web/util/UriTemplate.java | 16 +- .../springframework/web/util/WebUtils.java | 18 +- .../AbstractHttpRequestFactoryTestCase.java | 4 +- .../http/client/FreePortScanner.java | 112 +-- .../CommonsMultipartResolverTests.java | 8 +- .../web/util/UriComponentsBuilderTests.java | 104 +-- .../web/util/UriComponentsTests.java | 34 +- .../web/util/UriTemplateTests.java | 32 +- .../PortletApplicationContextUtils.java | 2 +- .../DefaultAnnotationHandlerMapping.java | 4 +- .../ComplexPortletApplicationContext.java | 10 +- .../Portlet20AnnotationControllerTests.java | 2 +- ...ildcardServletTilesApplicationContext.java | 108 +-- .../web/servlet/HttpServletBean.java | 8 +- .../web/servlet/ResourceServlet.java | 8 +- .../config/ResourcesBeanDefinitionParser.java | 4 +- .../handler/HandlerInterceptorAdapter.java | 2 +- .../mvc/AbstractWizardFormController.java | 12 +- .../servlet/mvc/BaseCommandController.java | 2 +- .../servlet/mvc/WebContentInterceptor.java | 2 +- .../AnnotationMethodHandlerAdapter.java | 6 +- ...stractMessageConverterMethodProcessor.java | 22 +- .../servlet/support/RequestContextUtils.java | 2 +- .../web/servlet/tags/form/ButtonTag.java | 16 +- .../http/client/FreePortScanner.java | 112 +-- .../servlet/ComplexWebApplicationContext.java | 12 +- .../mvc/WizardFormControllerTests.java | 6 +- .../servlet/mvc/annotation/Spr7839Tests.java | 24 +- .../RequestPartIntegrationTests.java | 10 +- .../DispatcherServletInitializerTests.java | 2 +- .../json/MappingJackson2JsonViewTests.java | 2 +- 154 files changed, 1481 insertions(+), 1476 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java index 458cc465180..10578d9960f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java @@ -151,12 +151,12 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea } Object interceptorOrInterceptionAdvice = - this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex); + this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex); if (interceptorOrInterceptionAdvice instanceof InterceptorAndDynamicMethodMatcher) { // Evaluate dynamic method matcher here: static part will already have // been evaluated and found to match. InterceptorAndDynamicMethodMatcher dm = - (InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice; + (InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice; if (dm.methodMatcher.matches(this.method, this.targetClass, this.arguments)) { return dm.interceptor.invoke(this); } diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java index b57ecae2357..dd39eecbcb7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java @@ -78,8 +78,10 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource Object target = this.targetInThread.get(); if (target == null) { if (logger.isDebugEnabled()) { - logger.debug("No target for prototype '" + getTargetBeanName() + "' bound to thread: " + - "creating one and binding it to thread '" + Thread.currentThread().getName() + "'"); + logger.debug("No target for prototype '" + getTargetBeanName() + + "' bound to thread: " + + "creating one and binding it to thread '" + + Thread.currentThread().getName() + "'"); } // Associate target with ThreadLocal. target = newPrototypeInstance(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java index e6ca2ce3cf3..c3e1f0c120b 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java @@ -90,9 +90,9 @@ public final class TigerAspectJExpressionPointcutTests { @Test public void testMatchVarargs() throws SecurityException, NoSuchMethodException { class MyTemplate { - public int queryForInt(String sql, Object... params) { - return 0; - } + public int queryForInt(String sql, Object... params) { + return 0; + } } String expression = "execution(int *.*(String, Object...))"; @@ -101,8 +101,8 @@ public final class TigerAspectJExpressionPointcutTests { // TODO: the expression above no longer matches Object[] // assertFalse(jdbcVarArgs.matches( - // JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class), - // JdbcTemplate.class)); + // JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class), + // JdbcTemplate.class)); assertTrue(jdbcVarArgs.matches( MyTemplate.class.getMethod("queryForInt", String.class, Object[].class), diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index 2d8acfe9925..18e0bd56ad3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -131,14 +131,14 @@ public class TrickyAspectJPointcutExpressionTests { } public static interface TestService { - public String sayHello(); + public String sayHello(); } @Log - public static class TestServiceImpl implements TestService{ - public String sayHello() { - throw new TestException("TestServiceImpl"); - } + public static class TestServiceImpl implements TestService { + public String sayHello() { + throw new TestException("TestServiceImpl"); + } } public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice { @@ -149,12 +149,12 @@ public class TrickyAspectJPointcutExpressionTests { public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; - } + } public void afterThrowing(Exception e) throws Throwable { countThrows++; - throw e; - } + throw e; + } public int getCountBefore() { return countBefore; diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java index 7b6811aee86..7ad0b7c7682 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java @@ -80,7 +80,7 @@ public final class TypePatternClassFilterTests { @Test(expected=IllegalArgumentException.class) public void testSetTypePatternWithNullArgument() throws Exception { - new TypePatternClassFilter(null); + new TypePatternClassFilter(null); } @Test(expected=IllegalStateException.class) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 89716a8789d..0a485087c3f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -411,6 +411,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests { CannotBeUnlocked.class); assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable); } + /* prereq AspectJ 1.6.7 @Test public void testIntroductionBasedOnAnnotationMatch_Spr5307() { @@ -426,8 +427,10 @@ public abstract class AbstractAspectJAdvisorFactoryTests { Lockable lockable = (Lockable)proxy; lockable.locked(); } - */ + */ + // TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed... + public void XtestIntroductionWithArgumentBinding() { TestBean target = new TestBean(); @@ -764,8 +767,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests { public void setAge(int a) {} @Around(value="setAge(age)",argNames="age") - // @ArgNames({"age"}) // AMC needs more work here? ignoring pjp arg... ok?? - // // argNames should be suported in Around as it is in Pointcut + // @ArgNames({"age"}) // AMC needs more work here? ignoring pjp arg... ok?? + // argNames should be suported in Around as it is in Pointcut public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable { pjp.proceed(new Object[] {age*2}); } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java index 9b102261196..f5c4a8edcae 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java @@ -68,7 +68,7 @@ public final class MethodInvocationTests { Method m = Object.class.getMethod("hashCode", (Class[]) null); Object proxy = new Object(); ReflectiveMethodInvocation invocation = - new ReflectiveMethodInvocation(proxy, target, m, null, null, is); + new ReflectiveMethodInvocation(proxy, target, m, null, null, is); // If it hits target, the test will fail with the UnsupportedOpException // in the inner class above. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj index 61a8b90d742..bee02ac9be3 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj @@ -41,7 +41,7 @@ package org.springframework.beans.factory.aspectj; * @since 3.0.0 */ public abstract aspect GenericInterfaceDrivenDependencyInjectionAspect extends AbstractInterfaceDrivenDependencyInjectionAspect { - declare parents: I implements ConfigurableObject; + declare parents: I implements ConfigurableObject; public pointcut inConfigurableBean() : within(I+); diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj index 134cfcdf26a..491f666992e 100644 --- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj @@ -9,14 +9,14 @@ import org.springframework.dao.DataAccessException; import org.springframework.orm.jpa.EntityManagerFactoryUtils; public aspect JpaExceptionTranslatorAspect { - pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..)); + pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..)); - after() throwing(RuntimeException re): entityManagerCall() { - DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re); - if (dex != null) { - throw dex; - } else { - throw re; - } - } -} \ No newline at end of file + after() throwing(RuntimeException re): entityManagerCall() { + DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re); + if (dex != null) { + throw dex; + } else { + throw re; + } + } +} diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj index c1b23c1bcb4..27a09bb4620 100644 --- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj @@ -66,7 +66,7 @@ public abstract aspect AbstractTransactionAspect extends TransactionAspectSuppor @SuppressAjWarnings("adviceDidNotMatch") after(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) { try { - completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t); + completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t); } catch (Throwable t2) { logger.error("Failed to close transaction after throwing in a transactional method", t2); diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj index 7e50ab4a7f3..9e13013bb1f 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj @@ -18,83 +18,83 @@ package org.springframework.mock.staticmock; privileged aspect Person_Roo_Entity { - @javax.persistence.PersistenceContext - transient javax.persistence.EntityManager Person.entityManager; + @javax.persistence.PersistenceContext + transient javax.persistence.EntityManager Person.entityManager; - @javax.persistence.Id - @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) - @javax.persistence.Column(name = "id") - private java.lang.Long Person.id; + @javax.persistence.Id + @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @javax.persistence.Column(name = "id") + private java.lang.Long Person.id; - @javax.persistence.Version - @javax.persistence.Column(name = "version") - private java.lang.Integer Person.version; + @javax.persistence.Version + @javax.persistence.Column(name = "version") + private java.lang.Integer Person.version; - public java.lang.Long Person.getId() { - return this.id; - } + public java.lang.Long Person.getId() { + return this.id; + } - public void Person.setId(java.lang.Long id) { - this.id = id; - } + public void Person.setId(java.lang.Long id) { + this.id = id; + } - public java.lang.Integer Person.getVersion() { - return this.version; - } + public java.lang.Integer Person.getVersion() { + return this.version; + } - public void Person.setVersion(java.lang.Integer version) { - this.version = version; - } + public void Person.setVersion(java.lang.Integer version) { + this.version = version; + } - @org.springframework.transaction.annotation.Transactional - public void Person.persist() { - if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - this.entityManager.persist(this); - } + @org.springframework.transaction.annotation.Transactional + public void Person.persist() { + if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + this.entityManager.persist(this); + } - @org.springframework.transaction.annotation.Transactional - public void Person.remove() { - if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - this.entityManager.remove(this); - } + @org.springframework.transaction.annotation.Transactional + public void Person.remove() { + if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + this.entityManager.remove(this); + } - @org.springframework.transaction.annotation.Transactional - public void Person.flush() { - if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - this.entityManager.flush(); - } + @org.springframework.transaction.annotation.Transactional + public void Person.flush() { + if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + this.entityManager.flush(); + } - @org.springframework.transaction.annotation.Transactional - public void Person.merge() { - if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - Person merged = this.entityManager.merge(this); - this.entityManager.flush(); - this.id = merged.getId(); - } + @org.springframework.transaction.annotation.Transactional + public void Person.merge() { + if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + Person merged = this.entityManager.merge(this); + this.entityManager.flush(); + this.id = merged.getId(); + } - public static long Person.countPeople() { - javax.persistence.EntityManager em = new Person().entityManager; - if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - return (Long) em.createQuery("select count(o) from Person o").getSingleResult(); - } + public static long Person.countPeople() { + javax.persistence.EntityManager em = new Person().entityManager; + if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + return (Long) em.createQuery("select count(o) from Person o").getSingleResult(); + } - public static java.util.List Person.findAllPeople() { - javax.persistence.EntityManager em = new Person().entityManager; - if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - return em.createQuery("select o from Person o").getResultList(); - } + public static java.util.List Person.findAllPeople() { + javax.persistence.EntityManager em = new Person().entityManager; + if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + return em.createQuery("select o from Person o").getResultList(); + } - public static Person Person.findPerson(java.lang.Long id) { - if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person"); - javax.persistence.EntityManager em = new Person().entityManager; - if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - return em.find(Person.class, id); - } + public static Person Person.findPerson(java.lang.Long id) { + if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person"); + javax.persistence.EntityManager em = new Person().entityManager; + if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + return em.find(Person.class, id); + } - public static java.util.List Person.findPersonEntries(int firstResult, int maxResults) { - javax.persistence.EntityManager em = new Person().entityManager; - if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); - return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } + public static java.util.List Person.findPersonEntries(int firstResult, int maxResults) { + javax.persistence.EntityManager em = new Person().entityManager; + if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)"); + return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java index c72277d2cf2..258313c90f3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java @@ -103,7 +103,7 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl } - // Redefined with public visibility. + // Redefined with public visibility. @Override public Class getPropertyType(String propertyPath) { return null; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index b4c13315e72..1754c8745d0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java @@ -738,7 +738,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } } else { - value = readMethod.invoke(object, (Object[]) null); + value = readMethod.invoke(object, (Object[]) null); } if (tokens.keys != null) { diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java index caaa069b066..4aafd433565 100644 --- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java @@ -64,7 +64,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor { if (fieldMap.containsKey(field.getName())) { // ignore superclass declarations of fields already found in a subclass } - else { + else { fieldMap.put(field.getName(), field); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java index c8b8edb63f7..280f1d90eb2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java @@ -191,7 +191,7 @@ public interface PropertyAccessor { * @see #setPropertyValues(PropertyValues, boolean, boolean) */ void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown) - throws BeansException; + throws BeansException; /** * Perform a batch update with full control over behavior. @@ -213,6 +213,6 @@ public interface PropertyAccessor { * successfully updated. */ void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown, boolean ignoreInvalid) - throws BeansException; + throws BeansException; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java index e84f61c4d5b..b0583f58865 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java @@ -159,7 +159,7 @@ public class FieldRetrievingFactoryBean if (this.targetClass == null && this.targetObject == null) { if (this.targetField != null) { throw new IllegalArgumentException( - "Specify targetClass or targetObject in combination with targetField"); + "Specify targetClass or targetObject in combination with targetField"); } // If no other property specified, consider bean name as static field expression. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java index f025a941c1d..2e0aabceba6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java @@ -76,9 +76,9 @@ public class PreferencesPlaceholderConfigurer extends PropertyPlaceholderConfigu */ public void afterPropertiesSet() { this.systemPrefs = (this.systemTreePath != null) ? - Preferences.systemRoot().node(this.systemTreePath) : Preferences.systemRoot(); + Preferences.systemRoot().node(this.systemTreePath) : Preferences.systemRoot(); this.userPrefs = (this.userTreePath != null) ? - Preferences.userRoot().node(this.userTreePath) : Preferences.userRoot(); + Preferences.userRoot().node(this.userTreePath) : Preferences.userRoot(); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java index c15c47090e3..8032c163350 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java @@ -162,15 +162,15 @@ public class PropertyPathFactoryBean implements FactoryBean, BeanNameAwa if (this.targetBeanWrapper == null && this.targetBeanName == null) { if (this.propertyPath != null) { throw new IllegalArgumentException( - "Specify 'targetObject' or 'targetBeanName' in combination with 'propertyPath'"); + "Specify 'targetObject' or 'targetBeanName' in combination with 'propertyPath'"); } // No other properties specified: check bean name. int dotIndex = this.beanName.indexOf('.'); if (dotIndex == -1) { throw new IllegalArgumentException( - "Neither 'targetObject' nor 'targetBeanName' specified, and PropertyPathFactoryBean " + - "bean name '" + this.beanName + "' does not follow 'beanName.property' syntax"); + "Neither 'targetObject' nor 'targetBeanName' specified, and PropertyPathFactoryBean " + + "bean name '" + this.beanName + "' does not follow 'beanName.property' syntax"); } this.targetBeanName = this.beanName.substring(0, dotIndex); this.propertyPath = this.beanName.substring(dotIndex + 1); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java index e5fb9c6afbe..f14db8c8bca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java @@ -80,7 +80,7 @@ class BeanDefinitionResource extends AbstractResource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof BeanDefinitionResource && + (obj instanceof BeanDefinitionResource && ((BeanDefinitionResource) obj).beanDefinition.equals(this.beanDefinition))); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java index d794b3a4efb..83bc48f20b4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java @@ -339,7 +339,7 @@ class BeanDefinitionValueResolver { Object resolved = Array.newInstance(elementType, ml.size()); for (int i = 0; i < ml.size(); i++) { Array.set(resolved, i, - resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i))); + resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i))); } return resolved; } @@ -351,7 +351,7 @@ class BeanDefinitionValueResolver { List resolved = new ArrayList(ml.size()); for (int i = 0; i < ml.size(); i++) { resolved.add( - resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i))); + resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i))); } return resolved; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index 3dfa8e893e4..306ffa03f58 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -744,7 +744,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter()); return (descriptor.getField() != null ? converter.convertIfNecessary(value, type, descriptor.getField()) : - converter.convertIfNecessary(value, type, descriptor.getMethodParameter())); + converter.convertIfNecessary(value, type, descriptor.getMethodParameter())); } if (type.isArray()) { diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java index b1d960bbfc2..eaf799f5282 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java @@ -85,8 +85,8 @@ public class CustomNumberEditor extends PropertyEditorSupport { * @see java.text.NumberFormat#parse * @see java.text.NumberFormat#format */ - public CustomNumberEditor(Class numberClass, NumberFormat numberFormat, boolean allowEmpty) - throws IllegalArgumentException { + public CustomNumberEditor(Class numberClass, + NumberFormat numberFormat, boolean allowEmpty) throws IllegalArgumentException { if (numberClass == null || !Number.class.isAssignableFrom(numberClass)) { throw new IllegalArgumentException("Property class must be a subclass of Number"); diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java index e227dd59afa..c9a369c6398 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java @@ -159,7 +159,8 @@ public class MutableSortDefinition implements SortDefinition, Serializable { } SortDefinition otherSd = (SortDefinition) other; return (getProperty().equals(otherSd.getProperty()) && - isAscending() == otherSd.isAscending() && isIgnoreCase() == otherSd.isIgnoreCase()); + isAscending() == otherSd.isAscending() && + isIgnoreCase() == otherSd.isIgnoreCase()); } @Override diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java index 25331d6606d..fb6831eb8c2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -250,17 +250,17 @@ public final class BeanUtilsTests { } @Test - public void testSPR6063() { - PropertyDescriptor[] descrs = BeanUtils.getPropertyDescriptors(Bean.class); + public void testSPR6063() { + PropertyDescriptor[] descrs = BeanUtils.getPropertyDescriptors(Bean.class); - PropertyDescriptor keyDescr = BeanUtils.getPropertyDescriptor(Bean.class, "value"); - assertEquals(String.class, keyDescr.getPropertyType()); - for (PropertyDescriptor propertyDescriptor : descrs) { - if (propertyDescriptor.getName().equals(keyDescr.getName())) { - assertEquals(propertyDescriptor.getName() + " has unexpected type", keyDescr.getPropertyType(), propertyDescriptor.getPropertyType()); - } - } - } + PropertyDescriptor keyDescr = BeanUtils.getPropertyDescriptor(Bean.class, "value"); + assertEquals(String.class, keyDescr.getPropertyType()); + for (PropertyDescriptor propertyDescriptor : descrs) { + if (propertyDescriptor.getName().equals(keyDescr.getName())) { + assertEquals(propertyDescriptor.getName() + " has unexpected type", keyDescr.getPropertyType(), propertyDescriptor.getPropertyType()); + } + } + } private void assertSignatureEquals(Method desiredMethod, String signature) { assertEquals(desiredMethod, BeanUtils.resolveSignature(signature, MethodSignatureBean.class)); diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java index cad4aeae224..c137adffe4c 100644 --- a/spring-beans/src/test/java/test/util/TestResourceUtils.java +++ b/spring-beans/src/test/java/test/util/TestResourceUtils.java @@ -27,20 +27,20 @@ import org.springframework.core.io.ClassPathResource; */ public class TestResourceUtils { - /** - * Loads a {@link ClassPathResource} qualified by the simple name of clazz, - * and relative to the package for clazz. - * - *

Example: given a clazz 'com.foo.BarTests' and a resourceSuffix of 'context.xml', - * this method will return a ClassPathResource representing com/foo/BarTests-context.xml - * - *

Intended for use loading context configuration XML files within JUnit tests. - * - * @param clazz - * @param resourceSuffix - */ - public static ClassPathResource qualifiedResource(Class clazz, String resourceSuffix) { - return new ClassPathResource(format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz); - } + /** + * Loads a {@link ClassPathResource} qualified by the simple name of clazz, + * and relative to the package for clazz. + * + *

Example: given a clazz 'com.foo.BarTests' and a resourceSuffix of 'context.xml', + * this method will return a ClassPathResource representing com/foo/BarTests-context.xml + * + *

Intended for use loading context configuration XML files within JUnit tests. + * + * @param clazz + * @param resourceSuffix + */ + public static ClassPathResource qualifiedResource(Class clazz, String resourceSuffix) { + return new ClassPathResource(format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz); + } } diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java index b4984c693de..bef2498eea0 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java @@ -241,7 +241,7 @@ public class MimeMessageHelper { * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, int, String) */ public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart, String encoding) - throws MessagingException { + throws MessagingException { this(mimeMessage, (multipart ? MULTIPART_MODE_MIXED_RELATED : MULTIPART_MODE_NO), encoding); } @@ -283,7 +283,7 @@ public class MimeMessageHelper { * @see #MULTIPART_MODE_MIXED_RELATED */ public MimeMessageHelper(MimeMessage mimeMessage, int multipartMode, String encoding) - throws MessagingException { + throws MessagingException { this.mimeMessage = mimeMessage; createMimeMultiparts(mimeMessage, multipartMode); @@ -380,8 +380,8 @@ public class MimeMessageHelper { private void checkMultipart() throws IllegalStateException { if (!isMultipart()) { throw new IllegalStateException("Not in multipart mode - " + - "create an appropriate MimeMessageHelper via a constructor that takes a 'multipart' flag " + - "if you need to set alternative texts or add inline elements or attachments."); + "create an appropriate MimeMessageHelper via a constructor that takes a 'multipart' flag " + + "if you need to set alternative texts or add inline elements or attachments."); } } @@ -546,7 +546,7 @@ public class MimeMessageHelper { public void setFrom(String from, String personal) throws MessagingException, UnsupportedEncodingException { Assert.notNull(from, "From address must not be null"); setFrom(getEncoding() != null ? - new InternetAddress(from, personal, getEncoding()) : new InternetAddress(from, personal)); + new InternetAddress(from, personal, getEncoding()) : new InternetAddress(from, personal)); } public void setReplyTo(InternetAddress replyTo) throws MessagingException { @@ -608,8 +608,8 @@ public class MimeMessageHelper { public void addTo(String to, String personal) throws MessagingException, UnsupportedEncodingException { Assert.notNull(to, "To address must not be null"); addTo(getEncoding() != null ? - new InternetAddress(to, personal, getEncoding()) : - new InternetAddress(to, personal)); + new InternetAddress(to, personal, getEncoding()) : + new InternetAddress(to, personal)); } @@ -653,8 +653,8 @@ public class MimeMessageHelper { public void addCc(String cc, String personal) throws MessagingException, UnsupportedEncodingException { Assert.notNull(cc, "Cc address must not be null"); addCc(getEncoding() != null ? - new InternetAddress(cc, personal, getEncoding()) : - new InternetAddress(cc, personal)); + new InternetAddress(cc, personal, getEncoding()) : + new InternetAddress(cc, personal)); } @@ -698,8 +698,8 @@ public class MimeMessageHelper { public void addBcc(String bcc, String personal) throws MessagingException, UnsupportedEncodingException { Assert.notNull(bcc, "Bcc address must not be null"); addBcc(getEncoding() != null ? - new InternetAddress(bcc, personal, getEncoding()) : - new InternetAddress(bcc, personal)); + new InternetAddress(bcc, personal, getEncoding()) : + new InternetAddress(bcc, personal)); } private InternetAddress parseAddress(String address) throws MessagingException { @@ -960,7 +960,7 @@ public class MimeMessageHelper { * @see #addInline(String, javax.activation.DataSource) */ public void addInline(String contentId, InputStreamSource inputStreamSource, String contentType) - throws MessagingException { + throws MessagingException { Assert.notNull(inputStreamSource, "InputStreamSource must not be null"); if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) { @@ -1035,7 +1035,7 @@ public class MimeMessageHelper { * @see org.springframework.core.io.Resource */ public void addAttachment(String attachmentFilename, InputStreamSource inputStreamSource) - throws MessagingException { + throws MessagingException { String contentType = getFileTypeMap().getContentType(attachmentFilename); addAttachment(attachmentFilename, inputStreamSource, contentType); @@ -1059,7 +1059,7 @@ public class MimeMessageHelper { */ public void addAttachment( String attachmentFilename, InputStreamSource inputStreamSource, String contentType) - throws MessagingException { + throws MessagingException { Assert.notNull(inputStreamSource, "InputStreamSource must not be null"); if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) { @@ -1079,7 +1079,7 @@ public class MimeMessageHelper { * @return the Activation Framework DataSource */ protected DataSource createDataSource( - final InputStreamSource inputStreamSource, final String contentType, final String name) { + final InputStreamSource inputStreamSource, final String contentType, final String name) { return new DataSource() { public InputStream getInputStream() throws IOException { diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java index 139febeb7d2..2b1f04a48b1 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java @@ -83,14 +83,14 @@ public class LocalDataSourceJobStore extends JobStoreCMT { @Override public void initialize(ClassLoadHelper loadHelper, SchedulerSignaler signaler) - throws SchedulerConfigException { + throws SchedulerConfigException { // Absolutely needs thread-bound DataSource to initialize. this.dataSource = SchedulerFactoryBean.getConfigTimeDataSource(); if (this.dataSource == null) { throw new SchedulerConfigException( - "No local DataSource found for configuration - " + - "'dataSource' property must be set on SchedulerFactoryBean"); + "No local DataSource found for configuration - " + + "'dataSource' property must be set on SchedulerFactoryBean"); } // Configure transactional connection settings for Quartz. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java index 8738e21a519..71bcd7852c4 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java @@ -52,8 +52,8 @@ public class LocalTaskExecutorThreadPool implements ThreadPool { this.taskExecutor = SchedulerFactoryBean.getConfigTimeTaskExecutor(); if (this.taskExecutor == null) { throw new SchedulerConfigException( - "No local TaskExecutor found for configuration - " + - "'taskExecutor' property must be set on SchedulerFactoryBean"); + "No local TaskExecutor found for configuration - " + + "'taskExecutor' property must be set on SchedulerFactoryBean"); } } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java index c77a1480a50..a81e39c83fc 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java @@ -77,8 +77,8 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper { @SuppressWarnings("unchecked") public Class loadClass(String name, Class clazz) throws ClassNotFoundException { - return loadClass(name); - } + return loadClass(name); + } public URL getResource(String name) { Resource resource = this.resourceLoader.getResource(name); diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java index fcd1a2f7c59..ca7bb45d657 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java @@ -32,7 +32,7 @@ public class CronTriggerBeanTests { @Test public void testStartTime() throws Exception { - CronTriggerBean bean = createTriggerBean(); + CronTriggerBean bean = createTriggerBean(); Date startTime = new Date(System.currentTimeMillis() + 1234L); bean.setStartTime(startTime); bean.afterPropertiesSet(); diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index b1e7726ed6f..120ee421541 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -1257,7 +1257,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader */ protected MessageSource getInternalParentMessageSource() { return (getParent() instanceof AbstractApplicationContext) ? - ((AbstractApplicationContext) getParent()).messageSource : getParent(); + ((AbstractApplicationContext) getParent()).messageSource : getParent(); } diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java index 6364f8592fa..789130620c6 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java @@ -93,7 +93,7 @@ public class LocalSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor } catch (IllegalAccessException ex) { throw new EjbAccessException("Could not access method [" + invocation.getMethod().getName() + - "] of local EJB [" + getJndiName() + "]", ex); + "] of local EJB [" + getJndiName() + "]", ex); } finally { if (ejb instanceof EJBLocalObject) { diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java index c133a61f65b..c459d22a9ae 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java @@ -106,7 +106,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke if (targetEx instanceof RemoteException) { RemoteException rex = (RemoteException) targetEx; throw RmiClientInterceptorUtils.convertRmiAccessException( - invocation.getMethod(), rex, isConnectFailure(rex), getJndiName()); + invocation.getMethod(), rex, isConnectFailure(rex), getJndiName()); } else if (targetEx instanceof CreateException) { throw RmiClientInterceptorUtils.convertRmiAccessException( diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java index 9c4373f1259..eb07d65c20d 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java @@ -190,8 +190,8 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho else if (getServiceInterface() != null) { boolean isImpl = getServiceInterface().isInstance(remoteObj); logger.debug("Using service interface [" + getServiceInterface().getName() + - "] for JNDI RMI object [" + getJndiName() + "] - " + - (!isImpl ? "not " : "") + "directly implemented"); + "] for JNDI RMI object [" + getJndiName() + "] - " + + (!isImpl ? "not " : "") + "directly implemented"); } } if (this.cacheStub) { @@ -426,7 +426,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho * @see org.springframework.remoting.support.RemoteInvocation */ protected Object doInvoke(MethodInvocation methodInvocation, RmiInvocationHandler invocationHandler) - throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { if (AopUtils.isToStringMethod(methodInvocation.getMethod())) { return "RMI invoker proxy for service URL [" + getJndiName() + "]"; diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java index f3d08416b3e..0ef03a4ef2a 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java @@ -152,8 +152,8 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor else if (getServiceInterface() != null) { boolean isImpl = getServiceInterface().isInstance(remoteObj); logger.debug("Using service interface [" + getServiceInterface().getName() + - "] for RMI stub [" + getServiceUrl() + "] - " + - (!isImpl ? "not " : "") + "directly implemented"); + "] for RMI stub [" + getServiceUrl() + "] - " + + (!isImpl ? "not " : "") + "directly implemented"); } } if (this.cacheStub) { diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java index 0849cd8fe89..e16b8158ca4 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java @@ -54,6 +54,6 @@ public interface RmiInvocationHandler extends Remote { * @throws InvocationTargetException if the method invocation resulted in an exception */ public Object invoke(RemoteInvocation invocation) - throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException; + throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException; } diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java index 299f5cc6fba..5d028402bc7 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java @@ -67,7 +67,7 @@ class RmiInvocationWrapper implements RmiInvocationHandler { * @see RmiBasedExporter#invoke(org.springframework.remoting.support.RemoteInvocation, Object) */ public Object invoke(RemoteInvocation invocation) - throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { return this.rmiExporter.invoke(invocation, this.wrappedObject); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index ff3e33442e8..eb5f420b034 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -678,8 +678,8 @@ public final class ProxyFactoryBeanTests { public void testFrozenFactoryBean() { BeanFactory bf = new XmlBeanFactory(new ClassPathResource(FROZEN_CONTEXT, CLASS)); - Advised advised = (Advised)bf.getBean("frozen"); - assertTrue("The proxy should be frozen", advised.isFrozen()); + Advised advised = (Advised)bf.getBean("frozen"); + assertTrue("The proxy should be frozen", advised.isFrozen()); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java index 71f2f9e3d59..e061bc7edf5 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java @@ -46,7 +46,7 @@ public class AutowiredConfigurationTests { @Test public void testAutowiredConfigurationDependencies() { ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext( - AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class); + AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class); assertThat(factory.getBean("colour", Colour.class), equalTo(Colour.RED)); assertThat(factory.getBean("testBean", TestBean.class).getName(), equalTo(Colour.RED.toString())); @@ -100,7 +100,7 @@ public class AutowiredConfigurationTests { @Test public void testValueInjection() { ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext( - "ValueInjectionTests.xml", AutowiredConfigurationTests.class); + "ValueInjectionTests.xml", AutowiredConfigurationTests.class); System.clearProperty("myProp"); @@ -155,7 +155,7 @@ public class AutowiredConfigurationTests { @Test public void testCustomProperties() { ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext( - "AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class); + "AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class); TestBean testBean = factory.getBean("testBean", TestBean.class); assertThat(testBean.getName(), equalTo("localhost")); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java index 9dc9e980d4a..7bdf1daac51 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java @@ -42,140 +42,140 @@ import org.springframework.context.annotation.ImportResource; * @author Juergen Hoeller */ public class ImportResourceTests { - @Test - public void testImportXml() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlConfig.class); - assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean")); - assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); + @Test + public void testImportXml() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlConfig.class); + assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean")); + assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); TestBean tb = ctx.getBean("javaDeclaredBean", TestBean.class); assertEquals("myName", tb.getName()); - } + } - @Configuration - @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") - static class ImportXmlConfig { + @Configuration + @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") + static class ImportXmlConfig { @Value("${name}") private String name; - public @Bean TestBean javaDeclaredBean() { - return new TestBean(this.name); - } - } + public @Bean TestBean javaDeclaredBean() { + return new TestBean(this.name); + } + } - @Ignore // TODO: SPR-6310 - @Test - public void testImportXmlWithRelativePath() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithRelativePathConfig.class); - assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean")); - assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); + @Ignore // TODO: SPR-6310 + @Test + public void testImportXmlWithRelativePath() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithRelativePathConfig.class); + assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean")); + assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); TestBean tb = ctx.getBean("javaDeclaredBean", TestBean.class); assertEquals("myName", tb.getName()); - } + } - @Configuration - @ImportResource("ImportXmlConfig-context.xml") - static class ImportXmlWithRelativePathConfig { - public @Bean TestBean javaDeclaredBean() { - return new TestBean("java.declared"); - } - } + @Configuration + @ImportResource("ImportXmlConfig-context.xml") + static class ImportXmlWithRelativePathConfig { + public @Bean TestBean javaDeclaredBean() { + return new TestBean("java.declared"); + } + } - @Ignore // TODO: SPR-6310 - @Test - public void testImportXmlByConvention() { - ApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlByConventionConfig.class); - assertTrue("context does not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); - } + @Ignore // TODO: SPR-6310 + @Test + public void testImportXmlByConvention() { + ApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlByConventionConfig.class); + assertTrue("context does not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean")); + } - @Configuration - //@ImportXml - static class ImportXmlByConventionConfig { - } + @Configuration + //@ImportXml + static class ImportXmlByConventionConfig { + } - @Test - public void testImportXmlIsInheritedFromSuperclassDeclarations() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FirstLevelSubConfig.class); - assertTrue(ctx.containsBean("xmlDeclaredBean")); - } + @Test + public void testImportXmlIsInheritedFromSuperclassDeclarations() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FirstLevelSubConfig.class); + assertTrue(ctx.containsBean("xmlDeclaredBean")); + } - @Test - public void testImportXmlIsMergedFromSuperclassDeclarations() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SecondLevelSubConfig.class); - assertTrue("failed to pick up second-level-declared XML bean", ctx.containsBean("secondLevelXmlDeclaredBean")); - assertTrue("failed to pick up parent-declared XML bean", ctx.containsBean("xmlDeclaredBean")); - } + @Test + public void testImportXmlIsMergedFromSuperclassDeclarations() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SecondLevelSubConfig.class); + assertTrue("failed to pick up second-level-declared XML bean", ctx.containsBean("secondLevelXmlDeclaredBean")); + assertTrue("failed to pick up parent-declared XML bean", ctx.containsBean("xmlDeclaredBean")); + } - @Configuration - @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") - static class BaseConfig { - } + @Configuration + @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") + static class BaseConfig { + } - @Configuration - static class FirstLevelSubConfig extends BaseConfig { - } + @Configuration + static class FirstLevelSubConfig extends BaseConfig { + } - @Configuration - @ImportResource("classpath:org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml") - static class SecondLevelSubConfig extends BaseConfig { - } + @Configuration + @ImportResource("classpath:org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml") + static class SecondLevelSubConfig extends BaseConfig { + } - @Test - public void testImportXmlWithNamespaceConfig() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithAopNamespaceConfig.class); - Object bean = ctx.getBean("proxiedXmlBean"); - assertTrue(AopUtils.isAopProxy(bean)); - } + @Test + public void testImportXmlWithNamespaceConfig() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithAopNamespaceConfig.class); + Object bean = ctx.getBean("proxiedXmlBean"); + assertTrue(AopUtils.isAopProxy(bean)); + } - @Configuration - @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml") - static class ImportXmlWithAopNamespaceConfig { - } + @Configuration + @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml") + static class ImportXmlWithAopNamespaceConfig { + } - @Aspect - static class AnAspect { - @Before("execution(* test.beans.TestBean.*(..))") - public void advice() { } - } + @Aspect + static class AnAspect { + @Before("execution(* test.beans.TestBean.*(..))") + public void advice() { } + } - @Test - public void testImportXmlWithAutowiredConfig() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlAutowiredConfig.class); - String name = ctx.getBean("xmlBeanName", String.class); - assertThat(name, equalTo("xml.declared")); - } + @Test + public void testImportXmlWithAutowiredConfig() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlAutowiredConfig.class); + String name = ctx.getBean("xmlBeanName", String.class); + assertThat(name, equalTo("xml.declared")); + } - @Configuration - @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") - static class ImportXmlAutowiredConfig { - @Autowired TestBean xmlDeclaredBean; + @Configuration + @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml") + static class ImportXmlAutowiredConfig { + @Autowired TestBean xmlDeclaredBean; - public @Bean String xmlBeanName() { - return xmlDeclaredBean.getName(); - } - } + public @Bean String xmlBeanName() { + return xmlDeclaredBean.getName(); + } + } - @Test - public void testImportNonXmlResource() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportNonXmlResourceConfig.class); - assertTrue(ctx.containsBean("propertiesDeclaredBean")); - } + @Test + public void testImportNonXmlResource() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportNonXmlResourceConfig.class); + assertTrue(ctx.containsBean("propertiesDeclaredBean")); + } - @Configuration - @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties", - reader=PropertiesBeanDefinitionReader.class) - static class ImportNonXmlResourceConfig { - } + @Configuration + @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties", + reader=PropertiesBeanDefinitionReader.class) + static class ImportNonXmlResourceConfig { + } - @Ignore // TODO: SPR-6327 - @Test - public void testImportDifferentResourceTypes() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubResourceConfig.class); - assertTrue(ctx.containsBean("propertiesDeclaredBean")); - assertTrue(ctx.containsBean("xmlDeclaredBean")); - } + @Ignore // TODO: SPR-6327 + @Test + public void testImportDifferentResourceTypes() { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubResourceConfig.class); + assertTrue(ctx.containsBean("propertiesDeclaredBean")); + assertTrue(ctx.containsBean("xmlDeclaredBean")); + } - @Configuration - @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml", - reader=XmlBeanDefinitionReader.class) - static class SubResourceConfig extends ImportNonXmlResourceConfig { - } -} \ No newline at end of file + @Configuration + @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml", + reader=XmlBeanDefinitionReader.class) + static class SubResourceConfig extends ImportNonXmlResourceConfig { + } +} diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index f55a47870cc..68ddae1f8c2 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -319,8 +319,7 @@ public final class ClassPathXmlApplicationContextTests { @Test public void testResourceAndInputStream() throws IOException { - ClassPathXmlApplicationContext ctx = - new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) { + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) { public Resource getResource(String location) { if (TEST_PROPERTIES.equals(location)) { return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class); diff --git a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java index 87d195dc1c4..68f1ce529c4 100644 --- a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java +++ b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java @@ -26,7 +26,7 @@ import org.springframework.aop.ThrowsAdvice; public class NoOpAdvice implements ThrowsAdvice { public void afterThrowing(Exception ex) throws Throwable { - // no-op + // no-op } } diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java index 910200918a4..d734c34f0a7 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java +++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java @@ -27,22 +27,22 @@ import org.junit.Test; */ public class Spr7283Tests { - @Test - public void testListWithInconsistentElementType() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass()); + @Test + public void testListWithInconsistentElementType() { + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass()); List list = ctx.getBean("list", List.class); assertEquals(2, list.size()); assertTrue(list.get(0) instanceof A); assertTrue(list.get(1) instanceof B); - } + } - public static class A { - public A() {} - } + public static class A { + public A() {} + } - public static class B { - public B() {} - } + public static class B { + public B() {} + } } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java index f3be4d65c45..a7066c828c0 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java @@ -13,17 +13,17 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice { public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; - System.out.println("Method:"+method.getName()); - } + System.out.println("Method:"+method.getName()); + } public void afterThrowing(Exception e) throws Throwable { countThrows++; - System.out.println("***********************************************************************************"); - System.out.println("Exception caught:"); - System.out.println("***********************************************************************************"); - e.printStackTrace(); - throw e; - } + System.out.println("***********************************************************************************"); + System.out.println("Exception caught:"); + System.out.println("***********************************************************************************"); + e.printStackTrace(); + throw e; + } public int getCountBefore() { return countBefore; diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java index 792c1a20569..67621e01f0f 100644 --- a/spring-core/src/main/java/org/springframework/core/Constants.java +++ b/spring-core/src/main/java/org/springframework/core/Constants.java @@ -319,17 +319,17 @@ public class Constants { * @see #toCodeForProperty */ public String propertyToConstantNamePrefix(String propertyName) { - StringBuilder parsedPrefix = new StringBuilder(); - for(int i = 0; i < propertyName.length(); i++) { - char c = propertyName.charAt(i); - if (Character.isUpperCase(c)) { - parsedPrefix.append("_"); - parsedPrefix.append(c); - } - else { - parsedPrefix.append(Character.toUpperCase(c)); - } - } + StringBuilder parsedPrefix = new StringBuilder(); + for (int i = 0; i < propertyName.length(); i++) { + char c = propertyName.charAt(i); + if (Character.isUpperCase(c)) { + parsedPrefix.append("_"); + parsedPrefix.append(c); + } + else { + parsedPrefix.append(Character.toUpperCase(c)); + } + } return parsedPrefix.toString(); } diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java index 83923a778e9..68261559898 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java @@ -94,23 +94,23 @@ public interface GenericConverter { return this.targetType; } - @Override - public boolean equals(Object obj) { - if (this == obj) { + @Override + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (obj == null || obj.getClass() != ConvertiblePair.class) { + if (obj == null || obj.getClass() != ConvertiblePair.class) { return false; } - ConvertiblePair other = (ConvertiblePair) obj; - return this.sourceType.equals(other.sourceType) && this.targetType.equals(other.targetType); + ConvertiblePair other = (ConvertiblePair) obj; + return this.sourceType.equals(other.sourceType) && this.targetType.equals(other.targetType); - } + } - @Override - public int hashCode() { - return this.sourceType.hashCode() * 31 + this.targetType.hashCode(); - } - } + @Override + public int hashCode() { + return this.sourceType.hashCode() * 31 + this.targetType.hashCode(); + } + } } diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java index 3933128d645..637d36d6fa2 100644 --- a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java @@ -194,7 +194,7 @@ public abstract class AbstractResource implements Resource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof Resource && ((Resource) obj).getDescription().equals(getDescription()))); + (obj instanceof Resource && ((Resource) obj).getDescription().equals(getDescription()))); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java index 008d93dc9d0..0e67b3b1fe9 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java @@ -112,7 +112,7 @@ public class ByteArrayResource extends AbstractResource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof ByteArrayResource && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray))); + (obj instanceof ByteArrayResource && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray))); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java index df3aaad2cf6..d7ee370df99 100644 --- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java @@ -70,7 +70,7 @@ public class DescriptiveResource extends AbstractResource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof DescriptiveResource && ((DescriptiveResource) obj).description.equals(this.description))); + (obj instanceof DescriptiveResource && ((DescriptiveResource) obj).description.equals(this.description))); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java index 3d0805c3452..12daadd2088 100644 --- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java @@ -204,7 +204,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof FileSystemResource && this.path.equals(((FileSystemResource) obj).path))); + (obj instanceof FileSystemResource && this.path.equals(((FileSystemResource) obj).path))); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java index e9c1c7d4ae4..d9558c51823 100644 --- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java @@ -111,7 +111,7 @@ public class InputStreamResource extends AbstractResource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof InputStreamResource && ((InputStreamResource) obj).inputStream.equals(this.inputStream))); + (obj instanceof InputStreamResource && ((InputStreamResource) obj).inputStream.equals(this.inputStream))); } /** diff --git a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java index 2f9f162d787..ae760378e74 100644 --- a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java @@ -207,7 +207,7 @@ public class UrlResource extends AbstractFileResolvingResource { @Override public boolean equals(Object obj) { return (obj == this || - (obj instanceof UrlResource && this.cleanedUrl.equals(((UrlResource) obj).cleanedUrl))); + (obj instanceof UrlResource && this.cleanedUrl.equals(((UrlResource) obj).cleanedUrl))); } /** diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java index 1153c475fa2..25f7fa9aba5 100644 --- a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java +++ b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java @@ -61,7 +61,7 @@ public abstract class FileCopyUtils { Assert.notNull(in, "No input File specified"); Assert.notNull(out, "No output File specified"); return copy(new BufferedInputStream(new FileInputStream(in)), - new BufferedOutputStream(new FileOutputStream(out))); + new BufferedOutputStream(new FileOutputStream(out))); } /** diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java index 0e18a067db0..196f2e65771 100644 --- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java @@ -28,78 +28,78 @@ import static org.junit.Assert.*; */ public class ExceptionDepthComparatorTests { - @Test - public void targetBeforeSameDepth() throws Exception { - Class foundClass = findClosestMatch(TargetException.class, SameDepthException.class); - assertEquals(TargetException.class, foundClass); - } + @Test + public void targetBeforeSameDepth() throws Exception { + Class foundClass = findClosestMatch(TargetException.class, SameDepthException.class); + assertEquals(TargetException.class, foundClass); + } - @Test - public void sameDepthBeforeTarget() throws Exception { - Class foundClass = findClosestMatch(SameDepthException.class, TargetException.class); - assertEquals(TargetException.class, foundClass); - } + @Test + public void sameDepthBeforeTarget() throws Exception { + Class foundClass = findClosestMatch(SameDepthException.class, TargetException.class); + assertEquals(TargetException.class, foundClass); + } - @Test - public void lowestDepthBeforeTarget() throws Exception { - Class foundClass = findClosestMatch(LowestDepthException.class, TargetException.class); - assertEquals(TargetException.class, foundClass); - } + @Test + public void lowestDepthBeforeTarget() throws Exception { + Class foundClass = findClosestMatch(LowestDepthException.class, TargetException.class); + assertEquals(TargetException.class, foundClass); + } - @Test - public void targetBeforeLowestDepth() throws Exception { - Class foundClass = findClosestMatch(TargetException.class, LowestDepthException.class); - assertEquals(TargetException.class, foundClass); - } + @Test + public void targetBeforeLowestDepth() throws Exception { + Class foundClass = findClosestMatch(TargetException.class, LowestDepthException.class); + assertEquals(TargetException.class, foundClass); + } - @Test - public void noDepthBeforeTarget() throws Exception { - Class foundClass = findClosestMatch(NoDepthException.class, TargetException.class); - assertEquals(TargetException.class, foundClass); - } + @Test + public void noDepthBeforeTarget() throws Exception { + Class foundClass = findClosestMatch(NoDepthException.class, TargetException.class); + assertEquals(TargetException.class, foundClass); + } - @Test - public void noDepthBeforeHighestDepth() throws Exception { - Class foundClass = findClosestMatch(NoDepthException.class, HighestDepthException.class); - assertEquals(HighestDepthException.class, foundClass); - } + @Test + public void noDepthBeforeHighestDepth() throws Exception { + Class foundClass = findClosestMatch(NoDepthException.class, HighestDepthException.class); + assertEquals(HighestDepthException.class, foundClass); + } - @Test - public void highestDepthBeforeNoDepth() throws Exception { - Class foundClass = findClosestMatch(HighestDepthException.class, NoDepthException.class); - assertEquals(HighestDepthException.class, foundClass); - } + @Test + public void highestDepthBeforeNoDepth() throws Exception { + Class foundClass = findClosestMatch(HighestDepthException.class, NoDepthException.class); + assertEquals(HighestDepthException.class, foundClass); + } - @Test - public void highestDepthBeforeLowestDepth() throws Exception { - Class foundClass = findClosestMatch(HighestDepthException.class, LowestDepthException.class); - assertEquals(LowestDepthException.class, foundClass); - } + @Test + public void highestDepthBeforeLowestDepth() throws Exception { + Class foundClass = findClosestMatch(HighestDepthException.class, LowestDepthException.class); + assertEquals(LowestDepthException.class, foundClass); + } - @Test - public void lowestDepthBeforeHighestDepth() throws Exception { - Class foundClass = findClosestMatch(LowestDepthException.class, HighestDepthException.class); - assertEquals(LowestDepthException.class, foundClass); - } + @Test + public void lowestDepthBeforeHighestDepth() throws Exception { + Class foundClass = findClosestMatch(LowestDepthException.class, HighestDepthException.class); + assertEquals(LowestDepthException.class, foundClass); + } - private Class findClosestMatch(Class... classes) { - return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException()); - } + private Class findClosestMatch( + Class... classes) { + return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException()); + } + public class HighestDepthException extends Throwable { + } - public class HighestDepthException extends Throwable { - } + public class LowestDepthException extends HighestDepthException { + } - public class LowestDepthException extends HighestDepthException { - } + public class TargetException extends LowestDepthException { + } - public class TargetException extends LowestDepthException { - } + public class SameDepthException extends LowestDepthException { + } - public class SameDepthException extends LowestDepthException { - } - - public class NoDepthException extends TargetException { - } + public class NoDepthException extends TargetException { + } } diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index cdb201c6025..5bdc32d9a2c 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -130,26 +130,26 @@ public class GenericTypeResolverTests { assertEquals(Object.class, resolveReturnTypeForGenericMethod(extractMagicValue, new Object[] { map })); } - /** - * @since 3.2 - */ - @Test - public void testResolveType() { - Method intMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class); - MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0); - assertEquals(MyInterfaceType.class, - resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap())); + /** + * @since 3.2 + */ + @Test + public void testResolveType() { + Method intMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class); + MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0); + assertEquals(MyInterfaceType.class, + resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap())); - Method intArrMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerArrayInputMessage", MyInterfaceType[].class); - MethodParameter intArrMessageMethodParam = new MethodParameter(intArrMessageMethod, 0); - assertEquals(MyInterfaceType[].class, - resolveType(intArrMessageMethodParam.getGenericParameterType(), new HashMap())); + Method intArrMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerArrayInputMessage", MyInterfaceType[].class); + MethodParameter intArrMessageMethodParam = new MethodParameter(intArrMessageMethod, 0); + assertEquals(MyInterfaceType[].class, + resolveType(intArrMessageMethodParam.getGenericParameterType(), new HashMap())); - Method genericArrMessageMethod = findMethod(MySimpleTypeWithMethods.class, "readGenericArrayInputMessage", Object[].class); - MethodParameter genericArrMessageMethodParam = new MethodParameter(genericArrMessageMethod, 0); - Map varMap = getTypeVariableMap(MySimpleTypeWithMethods.class); - assertEquals(Integer[].class, resolveType(genericArrMessageMethodParam.getGenericParameterType(), varMap)); - } + Method genericArrMessageMethod = findMethod(MySimpleTypeWithMethods.class, "readGenericArrayInputMessage", Object[].class); + MethodParameter genericArrMessageMethodParam = new MethodParameter(genericArrMessageMethod, 0); + Map varMap = getTypeVariableMap(MySimpleTypeWithMethods.class); + assertEquals(Integer[].class, resolveType(genericArrMessageMethodParam.getGenericParameterType(), varMap)); + } public interface MyInterfaceType { @@ -234,14 +234,14 @@ public class GenericTypeResolverTests { return null; } - public void readIntegerInputMessage(MyInterfaceType message) { - } + public void readIntegerInputMessage(MyInterfaceType message) { + } - public void readIntegerArrayInputMessage(MyInterfaceType[] message) { - } + public void readIntegerArrayInputMessage(MyInterfaceType[] message) { + } - public void readGenericArrayInputMessage(T[] message) { - } + public void readGenericArrayInputMessage(T[] message) { + } } public static class MySimpleTypeWithMethods extends MyTypeWithMethods { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java index a6beaafe6cd..33a40425ca6 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java @@ -124,7 +124,7 @@ public class ReflectionHelper { Class paramTypeClazz = paramType.getType(); if (paramTypeClazz.isPrimitive()) { paramTypeClazz = Object.class; - } + } Class superClass = argType.getClass().getSuperclass(); while (superClass != null) { if (paramType.equals(superClass)) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index eab2a6f0c28..aa3f27509f5 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -192,7 +192,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { @Test public void testVarargsInvocation02() { - // Calling 'Fruit(int i, String... strings)' - returns int+length_of_strings + // Calling 'Fruit(int i, String... strings)' - returns int+length_of_strings evaluate("new org.springframework.expression.spel.testresources.Fruit(5,'a','b','c').stringscount()", 8, Integer.class); evaluate("new org.springframework.expression.spel.testresources.Fruit(2,'a').stringscount()", 3, Integer.class); evaluate("new org.springframework.expression.spel.testresources.Fruit(4).stringscount()", 4, Integer.class); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index ada7b35acfe..6876afb0e10 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -435,8 +435,8 @@ public class SpelDocumentationTests extends ExpressionTestCase { ExpressionParser parser = new SpelExpressionParser(); StandardEvaluationContext context = new StandardEvaluationContext(); - context.registerFunction("reverseString", - StringUtils.class.getDeclaredMethod("reverseString", new Class[] { String.class })); + context.registerFunction("reverseString", StringUtils.class.getDeclaredMethod( + "reverseString", new Class[] { String.class })); String helloWorldReversed = parser.parseExpression("#reverseString('hello world')").getValue(context, String.class); Assert.assertEquals("dlrow olleh",helloWorldReversed); @@ -456,8 +456,8 @@ public class SpelDocumentationTests extends ExpressionTestCase { parser.parseExpression("Name").setValue(societyContext, "IEEE"); societyContext.setVariable("queryName", "Nikola Tesla"); - String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " + - "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'"; + String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " + + "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'"; String queryResultString = parser.parseExpression(expression).getValue(societyContext, String.class); Assert.assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString); @@ -487,28 +487,28 @@ public class SpelDocumentationTests extends ExpressionTestCase { static class TemplatedParserContext implements ParserContext { - public String getExpressionPrefix() { - return "${"; - } + public String getExpressionPrefix() { + return "${"; + } - public String getExpressionSuffix() { - return "}"; - } + public String getExpressionSuffix() { + return "}"; + } - public boolean isTemplate() { - return true; - } + public boolean isTemplate() { + return true; + } } static class StringUtils { - public static String reverseString(String input) { - StringBuilder backwards = new StringBuilder(); - for (int i = 0; i < input.length(); i++) { - backwards.append(input.charAt(input.length() - 1 - i)); - } - return backwards.toString(); - } + public static String reverseString(String input) { + StringBuilder backwards = new StringBuilder(); + for (int i = 0; i < input.length(); i++) { + backwards.append(input.charAt(input.length() - 1 - i)); + } + return backwards.toString(); + } } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java index e199293cee4..e97d7cccbca 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java @@ -364,7 +364,7 @@ public interface JdbcOperations { * @see java.sql.Types */ T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor rse) - throws DataAccessException; + throws DataAccessException; /** * Query given SQL to create a prepared statement from SQL and a list @@ -422,7 +422,7 @@ public interface JdbcOperations { * @throws DataAccessException if the query fails */ void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch) - throws DataAccessException; + throws DataAccessException; /** * Query given SQL to create a prepared statement from SQL and a list of @@ -437,7 +437,7 @@ public interface JdbcOperations { * @see java.sql.Types */ void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch) - throws DataAccessException; + throws DataAccessException; /** * Query given SQL to create a prepared statement from SQL and a list of @@ -510,7 +510,7 @@ public interface JdbcOperations { * @see java.sql.Types */ List query(String sql, Object[] args, int[] argTypes, RowMapper rowMapper) - throws DataAccessException; + throws DataAccessException; /** * Query given SQL to create a prepared statement from SQL and a list @@ -614,7 +614,7 @@ public interface JdbcOperations { * @see java.sql.Types */ T queryForObject(String sql, Object[] args, int[] argTypes, Class requiredType) - throws DataAccessException; + throws DataAccessException; /** * Query given SQL to create a prepared statement from SQL and a diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java index 5bf57f3e369..e2b4fb89513 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java @@ -177,7 +177,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan DataSourceTransactionObject txObject = new DataSourceTransactionObject(); txObject.setSavepointAllowed(isNestedTransactionAllowed()); ConnectionHolder conHolder = - (ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource); + (ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource); txObject.setConnectionHolder(conHolder, false); return txObject; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java index 77afaba1d15..b6d57ee63f0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java @@ -58,7 +58,7 @@ public abstract class LobCreatorUtils { if (TransactionSynchronizationManager.isSynchronizationActive()) { logger.debug("Registering Spring transaction synchronization for LobCreator"); TransactionSynchronizationManager.registerSynchronization( - new SpringLobCreatorSynchronization(lobCreator)); + new SpringLobCreatorSynchronization(lobCreator)); } else { if (jtaTransactionManager != null) { @@ -77,7 +77,7 @@ public abstract class LobCreatorUtils { } } throw new IllegalStateException("Active Spring transaction synchronization or active " + - "JTA transaction with specified [javax.transaction.TransactionManager] required"); + "JTA transaction with specified [javax.transaction.TransactionManager] required"); } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java index e55342b36f2..10b02fdc2b5 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java @@ -414,7 +414,7 @@ public class OracleLobHandler extends AbstractLobHandler { } public void setClobAsString(PreparedStatement ps, int paramIndex, final String content) - throws SQLException { + throws SQLException { if (content != null) { Clob clob = (Clob) createLob(ps, true, new LobCallback() { @@ -437,7 +437,7 @@ public class OracleLobHandler extends AbstractLobHandler { public void setClobAsAsciiStream( PreparedStatement ps, int paramIndex, final InputStream asciiStream, int contentLength) - throws SQLException { + throws SQLException { if (asciiStream != null) { Clob clob = (Clob) createLob(ps, true, new LobCallback() { @@ -460,7 +460,7 @@ public class OracleLobHandler extends AbstractLobHandler { public void setClobAsCharacterStream( PreparedStatement ps, int paramIndex, final Reader characterStream, int contentLength) - throws SQLException { + throws SQLException { if (characterStream != null) { Clob clob = (Clob) createLob(ps, true, new LobCallback() { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java index 739b3fb1c40..b7c9553f2d6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java @@ -94,11 +94,11 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { this.wrappedStatementClass = getClass().getClassLoader().loadClass(prefix + "WrappedStatement"); this.wrappedResultSetClass = getClass().getClassLoader().loadClass(prefix + "WrappedResultSet"); this.getUnderlyingConnectionMethod = - this.wrappedConnectionClass.getMethod("getUnderlyingConnection", (Class[]) null); + this.wrappedConnectionClass.getMethod("getUnderlyingConnection", (Class[]) null); this.getUnderlyingStatementMethod = - this.wrappedStatementClass.getMethod("getUnderlyingStatement", (Class[]) null); + this.wrappedStatementClass.getMethod("getUnderlyingStatement", (Class[]) null); this.getUnderlyingResultSetMethod = - this.wrappedResultSetClass.getMethod("getUnderlyingResultSet", (Class[]) null); + this.wrappedResultSetClass.getMethod("getUnderlyingResultSet", (Class[]) null); } catch (Exception ex) { throw new IllegalStateException( diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java index 7d0871abb8c..039e69680dc 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java @@ -160,7 +160,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ void convertAndSend(Object message, MessagePostProcessor postProcessor) - throws JmsException; + throws JmsException; /** * Send the given object to the specified destination, converting the object @@ -172,7 +172,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ void convertAndSend(Destination destination, Object message, MessagePostProcessor postProcessor) - throws JmsException; + throws JmsException; /** * Send the given object to the specified destination, converting the object @@ -185,7 +185,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ void convertAndSend(String destinationName, Object message, MessagePostProcessor postProcessor) - throws JmsException; + throws JmsException; //------------------------------------------------------------------------- diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index 189a88a89c0..66c5d8750ac 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -648,7 +648,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations public void convertAndSend( String destinationName, final Object message, final MessagePostProcessor postProcessor) - throws JmsException { + throws JmsException { send(destinationName, new MessageCreator() { public Message createMessage(Session session) throws JMSException { diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java index c9890fd55b4..b37037c4440 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java @@ -366,7 +366,7 @@ public class JmsTemplate102Tests extends TestCase { template.execute(new ProducerCallback() { public Object doInJms(Session session, MessageProducer producer) - throws JMSException { + throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); return null; @@ -627,7 +627,7 @@ public class JmsTemplate102Tests extends TestCase { else { template.send("testQueue", new MessageCreator() { public Message createMessage(Session session) - throws JMSException { + throws JMSException { return session.createTextMessage("just testing"); } }); @@ -690,7 +690,7 @@ public class JmsTemplate102Tests extends TestCase { if (explicitTopic) { template.send(mockTopic, new MessageCreator() { public Message createMessage(Session session) - throws JMSException { + throws JMSException { return session.createTextMessage("just testing"); } }); @@ -698,7 +698,7 @@ public class JmsTemplate102Tests extends TestCase { else { template.send("testTopic", new MessageCreator() { public Message createMessage(Session session) - throws JMSException { + throws JMSException { return session.createTextMessage("just testing"); } }); diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java index 250334fd637..19d6588b04f 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java @@ -660,7 +660,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana @Override public void flush() { try { - this.sessionHolder.getSession().flush(); + this.sessionHolder.getSession().flush(); } catch (HibernateException ex) { throw convertHibernateAccessException(ex); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index ae5f3853b3c..66d38bde677 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -888,7 +888,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana public void flush() { try { - this.sessionHolder.getSession().flush(); + this.sessionHolder.getSession().flush(); } catch (HibernateException ex) { throw convertHibernateAccessException(ex); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java index e240800e0f3..e48abde632e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java @@ -41,7 +41,7 @@ public class LocalCacheProviderProxy implements CacheProvider { // absolutely needs thread-bound CacheProvider to initialize if (cp == null) { throw new IllegalStateException("No Hibernate CacheProvider found - " + - "'cacheProvider' property must be set on LocalSessionFactoryBean"); + "'cacheProvider' property must be set on LocalSessionFactoryBean"); } this.cacheProvider = cp; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java index 498c53c6b7f..3f97a1d7b97 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java @@ -49,7 +49,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider { // absolutely needs thread-bound DataSource to initialize if (this.dataSource == null) { throw new HibernateException("No local DataSource found for configuration - " + - "'dataSource' property must be set on LocalSessionFactoryBean"); + "'dataSource' property must be set on LocalSessionFactoryBean"); } this.dataSourceToUse = getDataSourceToUse(this.dataSource); } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java index e0665941572..0a46bc5e9f3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java @@ -56,7 +56,7 @@ public class LocalRegionFactoryProxy implements RegionFactory { // absolutely needs thread-bound RegionFactory to initialize if (rf == null) { throw new IllegalStateException("No Hibernate RegionFactory found - " + - "'cacheRegionFactory' property must be set on LocalSessionFactoryBean"); + "'cacheRegionFactory' property must be set on LocalSessionFactoryBean"); } this.regionFactory = rf; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java index 0990f8384fc..e8d0f2f4626 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java @@ -53,7 +53,7 @@ public class LocalTransactionManagerLookup implements TransactionManagerLookup { // absolutely needs thread-bound TransactionManager to initialize if (tm == null) { throw new IllegalStateException("No JTA TransactionManager found - " + - "'jtaTransactionManager' property must be set on LocalSessionFactoryBean"); + "'jtaTransactionManager' property must be set on LocalSessionFactoryBean"); } this.transactionManager = tm; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java index 0fbddd87f7b..73aeefdd1fb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java @@ -354,7 +354,7 @@ public abstract class SessionFactoryUtils { if (!allowCreate && !isSessionTransactional(session, sessionFactory)) { closeSession(session); throw new IllegalStateException("No Hibernate Session bound to thread, " + - "and configuration does not allow creation of non-transactional one here"); + "and configuration does not allow creation of non-transactional one here"); } return session; @@ -371,8 +371,8 @@ public abstract class SessionFactoryUtils { * @throws DataAccessResourceFailureException if the Session couldn't be created */ private static Session getJtaSynchronizedSession( - SessionHolder sessionHolder, SessionFactory sessionFactory, - SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException { + SessionHolder sessionHolder, SessionFactory sessionFactory, + SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException { // JTA synchronization is only possible with a javax.transaction.TransactionManager. // We'll check the Hibernate SessionFactory: If a TransactionManagerLookup is specified @@ -612,7 +612,7 @@ public abstract class SessionFactoryUtils { public static void applyTransactionTimeout(Criteria criteria, SessionFactory sessionFactory) { Assert.notNull(criteria, "No Criteria object specified"); SessionHolder sessionHolder = - (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); + (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); if (sessionHolder != null && sessionHolder.hasTimeout()) { criteria.setTimeout(sessionHolder.getTimeToLiveInSeconds()); } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java index 5ab3c68bbbe..814da123704 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java @@ -76,7 +76,7 @@ public abstract class AbstractLobType implements UserType { */ protected AbstractLobType() { this(LocalSessionFactoryBean.getConfigTimeLobHandler(), - LocalSessionFactoryBean.getConfigTimeTransactionManager()); + LocalSessionFactoryBean.getConfigTimeTransactionManager()); } /** @@ -150,7 +150,7 @@ public abstract class AbstractLobType implements UserType { if (this.lobHandler == null) { throw new IllegalStateException("No LobHandler found for configuration - " + - "lobHandler property must be set on LocalSessionFactoryBean"); + "lobHandler property must be set on LocalSessionFactoryBean"); } try { @@ -172,7 +172,7 @@ public abstract class AbstractLobType implements UserType { if (this.lobHandler == null) { throw new IllegalStateException("No LobHandler found for configuration - " + - "lobHandler property must be set on LocalSessionFactoryBean"); + "lobHandler property must be set on LocalSessionFactoryBean"); } LobCreator lobCreator = this.lobHandler.getLobCreator(); @@ -211,7 +211,7 @@ public abstract class AbstractLobType implements UserType { * @throws HibernateException in case of any other exceptions */ protected abstract void nullSafeSetInternal( - PreparedStatement ps, int index, Object value, LobCreator lobCreator) + PreparedStatement ps, int index, Object value, LobCreator lobCreator) throws SQLException, IOException, HibernateException; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java index 5428baeed51..644103394e6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java @@ -138,7 +138,7 @@ public abstract class HibernateDaoSupport extends DaoSupport { * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean) */ protected final Session getSession() - throws DataAccessResourceFailureException, IllegalStateException { + throws DataAccessResourceFailureException, IllegalStateException { return getSession(this.hibernateTemplate.isAllowCreate()); } @@ -163,10 +163,10 @@ public abstract class HibernateDaoSupport extends DaoSupport { * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean) */ protected final Session getSession(boolean allowCreate) - throws DataAccessResourceFailureException, IllegalStateException { + throws DataAccessResourceFailureException, IllegalStateException { return (!allowCreate ? - SessionFactoryUtils.getSession(getSessionFactory(), false) : + SessionFactoryUtils.getSession(getSessionFactory(), false) : SessionFactoryUtils.getSession( getSessionFactory(), this.hibernateTemplate.getEntityInterceptor(), diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java index 068424acd7b..59bdc8e6420 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java @@ -156,7 +156,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A } if ((isSingleSession() && TransactionSynchronizationManager.hasResource(getSessionFactory())) || - SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) { + SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) { // Do not modify the Session: just mark the request accordingly. Integer count = (Integer) request.getAttribute(participateAttributeName, WebRequest.SCOPE_REQUEST); int newCount = (count != null ? count + 1 : 1); diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java index 9519e654dda..aa227bcaad6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java @@ -79,7 +79,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler { protected AbstractLobTypeHandler(LobHandler lobHandler) { if (lobHandler == null) { throw new IllegalStateException("No LobHandler found for configuration - " + - "lobHandler property must be set on SqlMapClientFactoryBean"); + "lobHandler property must be set on SqlMapClientFactoryBean"); } this.lobHandler = lobHandler; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java index 0f25a17d63b..397f58c3f42 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java @@ -201,9 +201,9 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations { Assert.notNull(action, "Callback object must not be null"); PersistenceManager pm = PersistenceManagerFactoryUtils.getPersistenceManager( - getPersistenceManagerFactory(), isAllowCreate()); + getPersistenceManagerFactory(), isAllowCreate()); boolean existingTransaction = - TransactionSynchronizationManager.hasResource(getPersistenceManagerFactory()); + TransactionSynchronizationManager.hasResource(getPersistenceManagerFactory()); try { PersistenceManager pmToExpose = (exposeNativePersistenceManager ? pm : createPersistenceManagerProxy(pm)); T result = action.doInJdo(pmToExpose); diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java index 09ce80a2dd5..723445fcb91 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java @@ -281,7 +281,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean getObjectType() { return (this.persistenceManagerFactory != null ? - this.persistenceManagerFactory.getClass() : PersistenceManagerFactory.class); + this.persistenceManagerFactory.getClass() : PersistenceManagerFactory.class); } public boolean isSingleton() { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java index b6983a4c5c1..0ec7f40a25a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java @@ -106,7 +106,7 @@ public abstract class PersistenceManagerFactoryUtils { * @see JdoTransactionManager */ public static PersistenceManager getPersistenceManager(PersistenceManagerFactory pmf, boolean allowCreate) - throws DataAccessResourceFailureException, IllegalStateException { + throws DataAccessResourceFailureException, IllegalStateException { try { return doGetPersistenceManager(pmf, allowCreate); @@ -133,7 +133,7 @@ public abstract class PersistenceManagerFactoryUtils { * @see JdoTransactionManager */ public static PersistenceManager doGetPersistenceManager(PersistenceManagerFactory pmf, boolean allowCreate) - throws JDOException, IllegalStateException { + throws JDOException, IllegalStateException { Assert.notNull(pmf, "No PersistenceManagerFactory specified"); @@ -204,7 +204,7 @@ public abstract class PersistenceManagerFactoryUtils { Assert.notNull(query, "No Query object specified"); PersistenceManagerHolder pmHolder = - (PersistenceManagerHolder) TransactionSynchronizationManager.getResource(pmf); + (PersistenceManagerHolder) TransactionSynchronizationManager.getResource(pmf); if (pmHolder != null && pmHolder.hasTimeout()) { jdoDialect.applyQueryTimeout(query, pmHolder.getTimeToLiveInSeconds()); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java index 23feeb358ad..5b0ec257b1a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java @@ -144,7 +144,7 @@ public abstract class JdoDaoSupport extends DaoSupport { * @see org.springframework.orm.jdo.PersistenceManagerFactoryUtils#getPersistenceManager */ protected final PersistenceManager getPersistenceManager(boolean allowCreate) - throws DataAccessResourceFailureException, IllegalStateException { + throws DataAccessResourceFailureException, IllegalStateException { return PersistenceManagerFactoryUtils.getPersistenceManager(getPersistenceManagerFactory(), allowCreate); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java index efd2ef1a649..a01f5ca69da 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java @@ -659,7 +659,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager public void flush() { try { - this.entityManagerHolder.getEntityManager().flush(); + this.entityManagerHolder.getEntityManager().flush(); } catch (RuntimeException ex) { throw DataAccessUtils.translateIfNecessary(ex, getJpaDialect()); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java index e7fa3d76ef7..2c7c2d4f8aa 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java @@ -436,7 +436,7 @@ public class OpenSessionInViewTests { final FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(sf2)); filter.doFilter(servletRequest, servletResponse, filterChain); } @@ -665,7 +665,7 @@ public class OpenSessionInViewTests { final FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { HibernateTransactionManager tm = new HibernateTransactionManager(sf2); TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); @@ -767,7 +767,7 @@ public class OpenSessionInViewTests { FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { filter.doFilter(servletRequest, servletResponse, filterChain); } }; diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java index 133e08311eb..c01d831d8a4 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java @@ -154,7 +154,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase { final FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(pmf2)); filter.doFilter(servletRequest, servletResponse, filterChain); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index c03e6a4b1e7..5fe4923a676 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -265,7 +265,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); filter.doFilter(servletRequest, servletResponse, filterChain); } @@ -334,7 +334,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final FilterChain filterChain2 = new FilterChain() { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) - throws IOException, ServletException { + throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); filter.doFilter(servletRequest, servletResponse, filterChain); count2.incrementAndGet(); diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java index bdcef11a4ca..62f2c6ff469 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java @@ -30,9 +30,9 @@ public abstract class XmlMappingException extends NestedRuntimeException { * Construct an XmlMappingException with the specified detail message. * @param msg the detail message */ - public XmlMappingException(String msg) { - super(msg); - } + public XmlMappingException(String msg) { + super(msg); + } /** * Construct an XmlMappingException with the specified detail message @@ -40,8 +40,8 @@ public abstract class XmlMappingException extends NestedRuntimeException { * @param msg the detail message * @param cause the nested exception */ - public XmlMappingException(String msg, Throwable cause) { - super(msg, cause); - } + public XmlMappingException(String msg, Throwable cause) { + super(msg, cause); + } } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index 6a33cf2c5fb..a4bb7486c75 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -425,12 +425,12 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin @Override protected void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { - if (this.streamDriver != null) { - marshal(graph, this.streamDriver.createWriter(outputStream)); - } - else { - marshalWriter(graph, new OutputStreamWriter(outputStream, this.encoding)); - } + if (this.streamDriver != null) { + marshal(graph, this.streamDriver.createWriter(outputStream)); + } + else { + marshalWriter(graph, new OutputStreamWriter(outputStream, this.encoding)); + } } @Override diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java index 7f15d0417f3..503b01cc016 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java @@ -24,34 +24,34 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(namespace = "http://springframework.org/spring-ws") public class BinaryObject { - @XmlElement(namespace = "http://springframework.org/spring-ws") - private byte[] bytes; + @XmlElement(namespace = "http://springframework.org/spring-ws") + private byte[] bytes; - @XmlElement(namespace = "http://springframework.org/spring-ws") - private DataHandler dataHandler; + @XmlElement(namespace = "http://springframework.org/spring-ws") + private DataHandler dataHandler; - @XmlElement(namespace = "http://springframework.org/spring-ws") - @XmlAttachmentRef - private DataHandler swaDataHandler; + @XmlElement(namespace = "http://springframework.org/spring-ws") + @XmlAttachmentRef + private DataHandler swaDataHandler; - public BinaryObject() { - } + public BinaryObject() { + } - public BinaryObject(byte[] bytes, DataHandler dataHandler) { - this.bytes = bytes; - this.dataHandler = dataHandler; - swaDataHandler = dataHandler; - } + public BinaryObject(byte[] bytes, DataHandler dataHandler) { + this.bytes = bytes; + this.dataHandler = dataHandler; + swaDataHandler = dataHandler; + } - public byte[] getBytes() { - return bytes; - } + public byte[] getBytes() { + return bytes; + } - public DataHandler getDataHandler() { - return dataHandler; - } + public DataHandler getDataHandler() { + return dataHandler; + } - public DataHandler getSwaDataHandler() { - return swaDataHandler; - } + public DataHandler getSwaDataHandler() { + return swaDataHandler; + } } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java index 739a3ab9bf2..aa445748bdf 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java @@ -20,17 +20,17 @@ import java.util.ArrayList; public class Flights { - protected ArrayList flightList = new ArrayList(); + protected ArrayList flightList = new ArrayList(); - public void addFlight(FlightType flight) { - flightList.add(flight); - } + public void addFlight(FlightType flight) { + flightList.add(flight); + } - public FlightType getFlight(int index) { - return (FlightType) flightList.get(index); - } + public FlightType getFlight(int index) { + return (FlightType) flightList.get(index); + } - public int sizeFlightList() { - return flightList.size(); - } + public int sizeFlightList() { + return flightList.size(); + } } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java index 70bd44b5d17..0c3b71eca5a 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java @@ -27,15 +27,15 @@ import org.junit.Test; */ public class XmlOptionsFactoryBeanTests { - private XmlOptionsFactoryBean factoryBean = new XmlOptionsFactoryBean(); + private XmlOptionsFactoryBean factoryBean = new XmlOptionsFactoryBean(); - @Test + @Test public void xmlOptionsFactoryBean() throws Exception { - factoryBean.setOptions(Collections.singletonMap(XmlOptions.SAVE_PRETTY_PRINT, Boolean.TRUE)); - XmlOptions xmlOptions = factoryBean.getObject(); - assertNotNull("No XmlOptions returned", xmlOptions); - assertTrue("Option not set", xmlOptions.hasOption(XmlOptions.SAVE_PRETTY_PRINT)); - assertFalse("Invalid option set", xmlOptions.hasOption(XmlOptions.LOAD_LINE_NUMBERS)); - } + factoryBean.setOptions(Collections.singletonMap(XmlOptions.SAVE_PRETTY_PRINT, Boolean.TRUE)); + XmlOptions xmlOptions = factoryBean.getObject(); + assertNotNull("No XmlOptions returned", xmlOptions); + assertTrue("Option not set", xmlOptions.hasOption(XmlOptions.SAVE_PRETTY_PRINT)); + assertFalse("Invalid option set", xmlOptions.hasOption(XmlOptions.LOAD_LINE_NUMBERS)); + } } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java index 8152f1e2d2d..0f6698f8dbb 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java @@ -21,14 +21,14 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; @XStreamAlias("flight") public class Flight { - @XStreamAlias("number") - private long flightNumber; + @XStreamAlias("number") + private long flightNumber; - public long getFlightNumber() { - return flightNumber; - } + public long getFlightNumber() { + return flightNumber; + } - public void setFlightNumber(long number) { - this.flightNumber = number; - } -} \ No newline at end of file + public void setFlightNumber(long number) { + this.flightNumber = number; + } +} diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java index 45274b8a600..051e9a63947 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java @@ -69,7 +69,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport { public final void perform( ComponentContext componentContext, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) - throws ServletException, IOException { + throws ServletException, IOException { try { execute(componentContext, request, response, servletContext); @@ -97,7 +97,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport { public final void execute( ComponentContext componentContext, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) - throws Exception { + throws Exception { synchronized (this) { if (this.webApplicationContext == null) { diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java index 2ec68703757..61f8d927bf7 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java @@ -138,7 +138,7 @@ public class TilesView extends InternalResourceView { * @return the component definition */ protected ComponentDefinition getComponentDefinition(DefinitionsFactory factory, HttpServletRequest request) - throws Exception { + throws Exception { return factory.getDefinition(getUrl(), request, getServletContext()); } diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java index 3f1cf061183..50919592b82 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java @@ -340,7 +340,7 @@ public class ContextLoaderPlugIn implements PlugIn { wac.setNamespace(getNamespace()); if (getContextConfigLocation() != null) { wac.setConfigLocations( - StringUtils.tokenizeToStringArray( + StringUtils.tokenizeToStringArray( getContextConfigLocation(), ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS)); } wac.addBeanFactoryPostProcessor( diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java b/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java index 6aa4cbdd7a5..809daf3f6cd 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java @@ -37,7 +37,7 @@ public abstract class MatcherAssertionErrors { private MatcherAssertionErrors() { - } + } /** * Asserts that the given matcher matches the actual value. @@ -65,8 +65,8 @@ public abstract class MatcherAssertionErrors { description.appendText("\nExpected: "); description.appendDescriptionOf(matcher); if (describeMismatchMethod != null) { - description.appendText("\n but: "); - matcher.describeMismatch(actual, description); + description.appendText("\n but: "); + matcher.describeMismatch(actual, description); } else { description.appendText("\n got: "); diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java index 17d9290c7b4..f82e6aae027 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java @@ -22,6 +22,6 @@ public interface RequestBuilder { * @param servletContext the {@link ServletContext} to use to create the request * @return the request */ - MockHttpServletRequest buildRequest(ServletContext servletContext); + MockHttpServletRequest buildRequest(ServletContext servletContext); } diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java index bec4b84b1a5..93534aae6f6 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java @@ -86,461 +86,461 @@ public class StatusResultMatchers { }; } - /** - * Assert the response status code is {@code HttpStatus.CONTINUE} (100). - */ - public ResultMatcher isContinue() { - return matcher(HttpStatus.CONTINUE); - } - - /** - * Assert the response status code is {@code HttpStatus.SWITCHING_PROTOCOLS} (101). - */ - public ResultMatcher isSwitchingProtocols() { - return matcher(HttpStatus.SWITCHING_PROTOCOLS); - } - - /** - * Assert the response status code is {@code HttpStatus.PROCESSING} (102). - */ - public ResultMatcher isProcessing() { - return matcher(HttpStatus.PROCESSING); - } - - /** - * Assert the response status code is {@code HttpStatus.CHECKPOINT} (103). - */ - public ResultMatcher isCheckpoint() { - return matcher(HttpStatus.valueOf(103)); - } - - /** - * Assert the response status code is {@code HttpStatus.OK} (200). - */ - public ResultMatcher isOk() { - return matcher(HttpStatus.OK); - } - - /** - * Assert the response status code is {@code HttpStatus.CREATED} (201). - */ - public ResultMatcher isCreated() { - return matcher(HttpStatus.CREATED); - } - - /** - * Assert the response status code is {@code HttpStatus.ACCEPTED} (202). - */ - public ResultMatcher isAccepted() { - return matcher(HttpStatus.ACCEPTED); - } - - /** - * Assert the response status code is {@code HttpStatus.NON_AUTHORITATIVE_INFORMATION} (203). - */ - public ResultMatcher isNonAuthoritativeInformation() { - return matcher(HttpStatus.NON_AUTHORITATIVE_INFORMATION); - } - - /** - * Assert the response status code is {@code HttpStatus.NO_CONTENT} (204). - */ - public ResultMatcher isNoContent() { - return matcher(HttpStatus.NO_CONTENT); - } - - /** - * Assert the response status code is {@code HttpStatus.RESET_CONTENT} (205). - */ - public ResultMatcher isResetContent() { - return matcher(HttpStatus.RESET_CONTENT); - } - - /** - * Assert the response status code is {@code HttpStatus.PARTIAL_CONTENT} (206). - */ - public ResultMatcher isPartialContent() { - return matcher(HttpStatus.PARTIAL_CONTENT); - } - - /** - * Assert the response status code is {@code HttpStatus.MULTI_STATUS} (207). - */ - public ResultMatcher isMultiStatus() { - return matcher(HttpStatus.MULTI_STATUS); - } - - /** - * Assert the response status code is {@code HttpStatus.ALREADY_REPORTED} (208). - */ - public ResultMatcher isAlreadyReported() { - return matcher(HttpStatus.ALREADY_REPORTED); - } - - /** - * Assert the response status code is {@code HttpStatus.IM_USED} (226). - */ - public ResultMatcher isImUsed() { - return matcher(HttpStatus.IM_USED); - } - - /** - * Assert the response status code is {@code HttpStatus.MULTIPLE_CHOICES} (300). - */ - public ResultMatcher isMultipleChoices() { - return matcher(HttpStatus.MULTIPLE_CHOICES); - } - - /** - * Assert the response status code is {@code HttpStatus.MOVED_PERMANENTLY} (301). - */ - public ResultMatcher isMovedPermanently() { - return matcher(HttpStatus.MOVED_PERMANENTLY); - } - - /** - * Assert the response status code is {@code HttpStatus.FOUND} (302). - */ - public ResultMatcher isFound() { - return matcher(HttpStatus.FOUND); - } - - /** - * Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302). - */ - public ResultMatcher isMovedTemporarily() { - return matcher(HttpStatus.MOVED_TEMPORARILY); - } - - /** - * Assert the response status code is {@code HttpStatus.SEE_OTHER} (303). - */ - public ResultMatcher isSeeOther() { - return matcher(HttpStatus.SEE_OTHER); - } - - /** - * Assert the response status code is {@code HttpStatus.NOT_MODIFIED} (304). - */ - public ResultMatcher isNotModified() { - return matcher(HttpStatus.NOT_MODIFIED); - } - - /** - * Assert the response status code is {@code HttpStatus.USE_PROXY} (305). - */ - public ResultMatcher isUseProxy() { - return matcher(HttpStatus.USE_PROXY); - } - - /** - * Assert the response status code is {@code HttpStatus.TEMPORARY_REDIRECT} (307). - */ - public ResultMatcher isTemporaryRedirect() { - return matcher(HttpStatus.TEMPORARY_REDIRECT); - } - - /** - * Assert the response status code is {@code HttpStatus.RESUME_INCOMPLETE} (308). - */ - public ResultMatcher isResumeIncomplete() { - return matcher(HttpStatus.valueOf(308)); - } - - /** - * Assert the response status code is {@code HttpStatus.BAD_REQUEST} (400). - */ - public ResultMatcher isBadRequest() { - return matcher(HttpStatus.BAD_REQUEST); - } - - /** - * Assert the response status code is {@code HttpStatus.UNAUTHORIZED} (401). - */ - public ResultMatcher isUnauthorized() { - return matcher(HttpStatus.UNAUTHORIZED); - } - - /** - * Assert the response status code is {@code HttpStatus.PAYMENT_REQUIRED} (402). - */ - public ResultMatcher isPaymentRequired() { - return matcher(HttpStatus.PAYMENT_REQUIRED); - } - - /** - * Assert the response status code is {@code HttpStatus.FORBIDDEN} (403). - */ - public ResultMatcher isForbidden() { - return matcher(HttpStatus.FORBIDDEN); - } + /** + * Assert the response status code is {@code HttpStatus.CONTINUE} (100). + */ + public ResultMatcher isContinue() { + return matcher(HttpStatus.CONTINUE); + } /** - * Assert the response status code is {@code HttpStatus.NOT_FOUND} (404). - */ - public ResultMatcher isNotFound() { - return matcher(HttpStatus.NOT_FOUND); - } + * Assert the response status code is {@code HttpStatus.SWITCHING_PROTOCOLS} (101). + */ + public ResultMatcher isSwitchingProtocols() { + return matcher(HttpStatus.SWITCHING_PROTOCOLS); + } - /** - * Assert the response status code is {@code HttpStatus.METHOD_NOT_ALLOWED} (405). - */ - public ResultMatcher isMethodNotAllowed() { - return matcher(HttpStatus.METHOD_NOT_ALLOWED); - } + /** + * Assert the response status code is {@code HttpStatus.PROCESSING} (102). + */ + public ResultMatcher isProcessing() { + return matcher(HttpStatus.PROCESSING); + } - /** - * Assert the response status code is {@code HttpStatus.NOT_ACCEPTABLE} (406). - */ - public ResultMatcher isNotAcceptable() { - return matcher(HttpStatus.NOT_ACCEPTABLE); - } + /** + * Assert the response status code is {@code HttpStatus.CHECKPOINT} (103). + */ + public ResultMatcher isCheckpoint() { + return matcher(HttpStatus.valueOf(103)); + } - /** - * Assert the response status code is {@code HttpStatus.PROXY_AUTHENTICATION_REQUIRED} (407). - */ - public ResultMatcher isProxyAuthenticationRequired() { - return matcher(HttpStatus.PROXY_AUTHENTICATION_REQUIRED); - } + /** + * Assert the response status code is {@code HttpStatus.OK} (200). + */ + public ResultMatcher isOk() { + return matcher(HttpStatus.OK); + } - /** - * Assert the response status code is {@code HttpStatus.REQUEST_TIMEOUT} (408). - */ - public ResultMatcher isRequestTimeout() { - return matcher(HttpStatus.REQUEST_TIMEOUT); - } + /** + * Assert the response status code is {@code HttpStatus.CREATED} (201). + */ + public ResultMatcher isCreated() { + return matcher(HttpStatus.CREATED); + } - /** - * Assert the response status code is {@code HttpStatus.CONFLICT} (409). - */ - public ResultMatcher isConflict() { - return matcher(HttpStatus.CONFLICT); - } + /** + * Assert the response status code is {@code HttpStatus.ACCEPTED} (202). + */ + public ResultMatcher isAccepted() { + return matcher(HttpStatus.ACCEPTED); + } - /** - * Assert the response status code is {@code HttpStatus.GONE} (410). - */ - public ResultMatcher isGone() { - return matcher(HttpStatus.GONE); - } + /** + * Assert the response status code is {@code HttpStatus.NON_AUTHORITATIVE_INFORMATION} (203). + */ + public ResultMatcher isNonAuthoritativeInformation() { + return matcher(HttpStatus.NON_AUTHORITATIVE_INFORMATION); + } - /** - * Assert the response status code is {@code HttpStatus.LENGTH_REQUIRED} (411). - */ - public ResultMatcher isLengthRequired() { - return matcher(HttpStatus.LENGTH_REQUIRED); - } + /** + * Assert the response status code is {@code HttpStatus.NO_CONTENT} (204). + */ + public ResultMatcher isNoContent() { + return matcher(HttpStatus.NO_CONTENT); + } - /** - * Assert the response status code is {@code HttpStatus.PRECONDITION_FAILED} (412). - */ - public ResultMatcher isPreconditionFailed() { - return matcher(HttpStatus.PRECONDITION_FAILED); - } + /** + * Assert the response status code is {@code HttpStatus.RESET_CONTENT} (205). + */ + public ResultMatcher isResetContent() { + return matcher(HttpStatus.RESET_CONTENT); + } - /** - * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413). - */ - public ResultMatcher isRequestEntityTooLarge() { - return matcher(HttpStatus.REQUEST_ENTITY_TOO_LARGE); - } + /** + * Assert the response status code is {@code HttpStatus.PARTIAL_CONTENT} (206). + */ + public ResultMatcher isPartialContent() { + return matcher(HttpStatus.PARTIAL_CONTENT); + } - /** - * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414). - */ - public ResultMatcher isRequestUriTooLong() { - return matcher(HttpStatus.REQUEST_URI_TOO_LONG); - } + /** + * Assert the response status code is {@code HttpStatus.MULTI_STATUS} (207). + */ + public ResultMatcher isMultiStatus() { + return matcher(HttpStatus.MULTI_STATUS); + } - /** - * Assert the response status code is {@code HttpStatus.UNSUPPORTED_MEDIA_TYPE} (415). - */ - public ResultMatcher isUnsupportedMediaType() { - return matcher(HttpStatus.UNSUPPORTED_MEDIA_TYPE); - } + /** + * Assert the response status code is {@code HttpStatus.ALREADY_REPORTED} (208). + */ + public ResultMatcher isAlreadyReported() { + return matcher(HttpStatus.ALREADY_REPORTED); + } - /** - * Assert the response status code is {@code HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE} (416). - */ - public ResultMatcher isRequestedRangeNotSatisfiable() { - return matcher(HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE); - } + /** + * Assert the response status code is {@code HttpStatus.IM_USED} (226). + */ + public ResultMatcher isImUsed() { + return matcher(HttpStatus.IM_USED); + } - /** - * Assert the response status code is {@code HttpStatus.EXPECTATION_FAILED} (417). - */ - public ResultMatcher isExpectationFailed() { - return matcher(HttpStatus.EXPECTATION_FAILED); - } + /** + * Assert the response status code is {@code HttpStatus.MULTIPLE_CHOICES} (300). + */ + public ResultMatcher isMultipleChoices() { + return matcher(HttpStatus.MULTIPLE_CHOICES); + } - /** - * Assert the response status code is {@code HttpStatus.I_AM_A_TEAPOT} (418). - */ - public ResultMatcher isIAmATeapot() { - return matcher(HttpStatus.valueOf(418)); - } + /** + * Assert the response status code is {@code HttpStatus.MOVED_PERMANENTLY} (301). + */ + public ResultMatcher isMovedPermanently() { + return matcher(HttpStatus.MOVED_PERMANENTLY); + } - /** - * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419). - * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE - */ - public ResultMatcher isInsufficientSpaceOnResource() { - return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE); - } + /** + * Assert the response status code is {@code HttpStatus.FOUND} (302). + */ + public ResultMatcher isFound() { + return matcher(HttpStatus.FOUND); + } - /** - * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420). - * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE - */ - public ResultMatcher isMethodFailure() { - return matcher(HttpStatus.METHOD_FAILURE); - } + /** + * Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302). + */ + public ResultMatcher isMovedTemporarily() { + return matcher(HttpStatus.MOVED_TEMPORARILY); + } - /** - * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421). - * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED - */ - public ResultMatcher isDestinationLocked() { - return matcher(HttpStatus.DESTINATION_LOCKED); - } + /** + * Assert the response status code is {@code HttpStatus.SEE_OTHER} (303). + */ + public ResultMatcher isSeeOther() { + return matcher(HttpStatus.SEE_OTHER); + } - /** - * Assert the response status code is {@code HttpStatus.UNPROCESSABLE_ENTITY} (422). - */ - public ResultMatcher isUnprocessableEntity() { - return matcher(HttpStatus.UNPROCESSABLE_ENTITY); - } + /** + * Assert the response status code is {@code HttpStatus.NOT_MODIFIED} (304). + */ + public ResultMatcher isNotModified() { + return matcher(HttpStatus.NOT_MODIFIED); + } - /** - * Assert the response status code is {@code HttpStatus.LOCKED} (423). - */ - public ResultMatcher isLocked() { - return matcher(HttpStatus.LOCKED); - } + /** + * Assert the response status code is {@code HttpStatus.USE_PROXY} (305). + */ + public ResultMatcher isUseProxy() { + return matcher(HttpStatus.USE_PROXY); + } - /** - * Assert the response status code is {@code HttpStatus.FAILED_DEPENDENCY} (424). - */ - public ResultMatcher isFailedDependency() { - return matcher(HttpStatus.FAILED_DEPENDENCY); - } + /** + * Assert the response status code is {@code HttpStatus.TEMPORARY_REDIRECT} (307). + */ + public ResultMatcher isTemporaryRedirect() { + return matcher(HttpStatus.TEMPORARY_REDIRECT); + } - /** - * Assert the response status code is {@code HttpStatus.UPGRADE_REQUIRED} (426). - */ - public ResultMatcher isUpgradeRequired() { - return matcher(HttpStatus.UPGRADE_REQUIRED); - } + /** + * Assert the response status code is {@code HttpStatus.RESUME_INCOMPLETE} (308). + */ + public ResultMatcher isResumeIncomplete() { + return matcher(HttpStatus.valueOf(308)); + } - /** - * Assert the response status code is {@code HttpStatus.PRECONDITION_REQUIRED} (428). - */ - public ResultMatcher isPreconditionRequired() { - return matcher(HttpStatus.valueOf(428)); - } + /** + * Assert the response status code is {@code HttpStatus.BAD_REQUEST} (400). + */ + public ResultMatcher isBadRequest() { + return matcher(HttpStatus.BAD_REQUEST); + } - /** - * Assert the response status code is {@code HttpStatus.TOO_MANY_REQUESTS} (429). - */ - public ResultMatcher isTooManyRequests() { - return matcher(HttpStatus.valueOf(429)); - } + /** + * Assert the response status code is {@code HttpStatus.UNAUTHORIZED} (401). + */ + public ResultMatcher isUnauthorized() { + return matcher(HttpStatus.UNAUTHORIZED); + } - /** - * Assert the response status code is {@code HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE} (431). - */ - public ResultMatcher isRequestHeaderFieldsTooLarge() { - return matcher(HttpStatus.valueOf(431)); - } + /** + * Assert the response status code is {@code HttpStatus.PAYMENT_REQUIRED} (402). + */ + public ResultMatcher isPaymentRequired() { + return matcher(HttpStatus.PAYMENT_REQUIRED); + } - /** - * Assert the response status code is {@code HttpStatus.INTERNAL_SERVER_ERROR} (500). - */ - public ResultMatcher isInternalServerError() { - return matcher(HttpStatus.INTERNAL_SERVER_ERROR); - } + /** + * Assert the response status code is {@code HttpStatus.FORBIDDEN} (403). + */ + public ResultMatcher isForbidden() { + return matcher(HttpStatus.FORBIDDEN); + } - /** - * Assert the response status code is {@code HttpStatus.NOT_IMPLEMENTED} (501). - */ - public ResultMatcher isNotImplemented() { - return matcher(HttpStatus.NOT_IMPLEMENTED); - } + /** + * Assert the response status code is {@code HttpStatus.NOT_FOUND} (404). + */ + public ResultMatcher isNotFound() { + return matcher(HttpStatus.NOT_FOUND); + } - /** - * Assert the response status code is {@code HttpStatus.BAD_GATEWAY} (502). - */ - public ResultMatcher isBadGateway() { - return matcher(HttpStatus.BAD_GATEWAY); - } + /** + * Assert the response status code is {@code HttpStatus.METHOD_NOT_ALLOWED} (405). + */ + public ResultMatcher isMethodNotAllowed() { + return matcher(HttpStatus.METHOD_NOT_ALLOWED); + } - /** - * Assert the response status code is {@code HttpStatus.SERVICE_UNAVAILABLE} (503). - */ - public ResultMatcher isServiceUnavailable() { - return matcher(HttpStatus.SERVICE_UNAVAILABLE); - } + /** + * Assert the response status code is {@code HttpStatus.NOT_ACCEPTABLE} (406). + */ + public ResultMatcher isNotAcceptable() { + return matcher(HttpStatus.NOT_ACCEPTABLE); + } - /** - * Assert the response status code is {@code HttpStatus.GATEWAY_TIMEOUT} (504). - */ - public ResultMatcher isGatewayTimeout() { - return matcher(HttpStatus.GATEWAY_TIMEOUT); - } + /** + * Assert the response status code is {@code HttpStatus.PROXY_AUTHENTICATION_REQUIRED} (407). + */ + public ResultMatcher isProxyAuthenticationRequired() { + return matcher(HttpStatus.PROXY_AUTHENTICATION_REQUIRED); + } - /** - * Assert the response status code is {@code HttpStatus.HTTP_VERSION_NOT_SUPPORTED} (505). - */ - public ResultMatcher isHttpVersionNotSupported() { - return matcher(HttpStatus.HTTP_VERSION_NOT_SUPPORTED); - } + /** + * Assert the response status code is {@code HttpStatus.REQUEST_TIMEOUT} (408). + */ + public ResultMatcher isRequestTimeout() { + return matcher(HttpStatus.REQUEST_TIMEOUT); + } - /** - * Assert the response status code is {@code HttpStatus.VARIANT_ALSO_NEGOTIATES} (506). - */ - public ResultMatcher isVariantAlsoNegotiates() { - return matcher(HttpStatus.VARIANT_ALSO_NEGOTIATES); - } + /** + * Assert the response status code is {@code HttpStatus.CONFLICT} (409). + */ + public ResultMatcher isConflict() { + return matcher(HttpStatus.CONFLICT); + } - /** - * Assert the response status code is {@code HttpStatus.INSUFFICIENT_STORAGE} (507). - */ - public ResultMatcher isInsufficientStorage() { - return matcher(HttpStatus.INSUFFICIENT_STORAGE); - } + /** + * Assert the response status code is {@code HttpStatus.GONE} (410). + */ + public ResultMatcher isGone() { + return matcher(HttpStatus.GONE); + } - /** - * Assert the response status code is {@code HttpStatus.LOOP_DETECTED} (508). - */ - public ResultMatcher isLoopDetected() { - return matcher(HttpStatus.LOOP_DETECTED); - } + /** + * Assert the response status code is {@code HttpStatus.LENGTH_REQUIRED} (411). + */ + public ResultMatcher isLengthRequired() { + return matcher(HttpStatus.LENGTH_REQUIRED); + } - /** - * Assert the response status code is {@code HttpStatus.BANDWIDTH_LIMIT_EXCEEDED} (509). - */ - public ResultMatcher isBandwidthLimitExceeded() { - return matcher(HttpStatus.valueOf(509)); - } + /** + * Assert the response status code is {@code HttpStatus.PRECONDITION_FAILED} (412). + */ + public ResultMatcher isPreconditionFailed() { + return matcher(HttpStatus.PRECONDITION_FAILED); + } - /** - * Assert the response status code is {@code HttpStatus.NOT_EXTENDED} (510). - */ - public ResultMatcher isNotExtended() { - return matcher(HttpStatus.NOT_EXTENDED); - } + /** + * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413). + */ + public ResultMatcher isRequestEntityTooLarge() { + return matcher(HttpStatus.REQUEST_ENTITY_TOO_LARGE); + } - /** - * Assert the response status code is {@code HttpStatus.NETWORK_AUTHENTICATION_REQUIRED} (511). - */ - public ResultMatcher isNetworkAuthenticationRequired() { - return matcher(HttpStatus.valueOf(511)); - } + /** + * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414). + */ + public ResultMatcher isRequestUriTooLong() { + return matcher(HttpStatus.REQUEST_URI_TOO_LONG); + } - /** + /** + * Assert the response status code is {@code HttpStatus.UNSUPPORTED_MEDIA_TYPE} (415). + */ + public ResultMatcher isUnsupportedMediaType() { + return matcher(HttpStatus.UNSUPPORTED_MEDIA_TYPE); + } + + /** + * Assert the response status code is {@code HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE} (416). + */ + public ResultMatcher isRequestedRangeNotSatisfiable() { + return matcher(HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE); + } + + /** + * Assert the response status code is {@code HttpStatus.EXPECTATION_FAILED} (417). + */ + public ResultMatcher isExpectationFailed() { + return matcher(HttpStatus.EXPECTATION_FAILED); + } + + /** + * Assert the response status code is {@code HttpStatus.I_AM_A_TEAPOT} (418). + */ + public ResultMatcher isIAmATeapot() { + return matcher(HttpStatus.valueOf(418)); + } + + /** + * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419). + * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE + */ + public ResultMatcher isInsufficientSpaceOnResource() { + return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE); + } + + /** + * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420). + * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE + */ + public ResultMatcher isMethodFailure() { + return matcher(HttpStatus.METHOD_FAILURE); + } + + /** + * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421). + * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED + */ + public ResultMatcher isDestinationLocked() { + return matcher(HttpStatus.DESTINATION_LOCKED); + } + + /** + * Assert the response status code is {@code HttpStatus.UNPROCESSABLE_ENTITY} (422). + */ + public ResultMatcher isUnprocessableEntity() { + return matcher(HttpStatus.UNPROCESSABLE_ENTITY); + } + + /** + * Assert the response status code is {@code HttpStatus.LOCKED} (423). + */ + public ResultMatcher isLocked() { + return matcher(HttpStatus.LOCKED); + } + + /** + * Assert the response status code is {@code HttpStatus.FAILED_DEPENDENCY} (424). + */ + public ResultMatcher isFailedDependency() { + return matcher(HttpStatus.FAILED_DEPENDENCY); + } + + /** + * Assert the response status code is {@code HttpStatus.UPGRADE_REQUIRED} (426). + */ + public ResultMatcher isUpgradeRequired() { + return matcher(HttpStatus.UPGRADE_REQUIRED); + } + + /** + * Assert the response status code is {@code HttpStatus.PRECONDITION_REQUIRED} (428). + */ + public ResultMatcher isPreconditionRequired() { + return matcher(HttpStatus.valueOf(428)); + } + + /** + * Assert the response status code is {@code HttpStatus.TOO_MANY_REQUESTS} (429). + */ + public ResultMatcher isTooManyRequests() { + return matcher(HttpStatus.valueOf(429)); + } + + /** + * Assert the response status code is {@code HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE} (431). + */ + public ResultMatcher isRequestHeaderFieldsTooLarge() { + return matcher(HttpStatus.valueOf(431)); + } + + /** + * Assert the response status code is {@code HttpStatus.INTERNAL_SERVER_ERROR} (500). + */ + public ResultMatcher isInternalServerError() { + return matcher(HttpStatus.INTERNAL_SERVER_ERROR); + } + + /** + * Assert the response status code is {@code HttpStatus.NOT_IMPLEMENTED} (501). + */ + public ResultMatcher isNotImplemented() { + return matcher(HttpStatus.NOT_IMPLEMENTED); + } + + /** + * Assert the response status code is {@code HttpStatus.BAD_GATEWAY} (502). + */ + public ResultMatcher isBadGateway() { + return matcher(HttpStatus.BAD_GATEWAY); + } + + /** + * Assert the response status code is {@code HttpStatus.SERVICE_UNAVAILABLE} (503). + */ + public ResultMatcher isServiceUnavailable() { + return matcher(HttpStatus.SERVICE_UNAVAILABLE); + } + + /** + * Assert the response status code is {@code HttpStatus.GATEWAY_TIMEOUT} (504). + */ + public ResultMatcher isGatewayTimeout() { + return matcher(HttpStatus.GATEWAY_TIMEOUT); + } + + /** + * Assert the response status code is {@code HttpStatus.HTTP_VERSION_NOT_SUPPORTED} (505). + */ + public ResultMatcher isHttpVersionNotSupported() { + return matcher(HttpStatus.HTTP_VERSION_NOT_SUPPORTED); + } + + /** + * Assert the response status code is {@code HttpStatus.VARIANT_ALSO_NEGOTIATES} (506). + */ + public ResultMatcher isVariantAlsoNegotiates() { + return matcher(HttpStatus.VARIANT_ALSO_NEGOTIATES); + } + + /** + * Assert the response status code is {@code HttpStatus.INSUFFICIENT_STORAGE} (507). + */ + public ResultMatcher isInsufficientStorage() { + return matcher(HttpStatus.INSUFFICIENT_STORAGE); + } + + /** + * Assert the response status code is {@code HttpStatus.LOOP_DETECTED} (508). + */ + public ResultMatcher isLoopDetected() { + return matcher(HttpStatus.LOOP_DETECTED); + } + + /** + * Assert the response status code is {@code HttpStatus.BANDWIDTH_LIMIT_EXCEEDED} (509). + */ + public ResultMatcher isBandwidthLimitExceeded() { + return matcher(HttpStatus.valueOf(509)); + } + + /** + * Assert the response status code is {@code HttpStatus.NOT_EXTENDED} (510). + */ + public ResultMatcher isNotExtended() { + return matcher(HttpStatus.NOT_EXTENDED); + } + + /** + * Assert the response status code is {@code HttpStatus.NETWORK_AUTHENTICATION_REQUIRED} (511). + */ + public ResultMatcher isNetworkAuthenticationRequired() { + return matcher(HttpStatus.valueOf(511)); + } + + /** * Match the expected response status to that of the HttpServletResponse */ - private ResultMatcher matcher(final HttpStatus status) { + private ResultMatcher matcher(final HttpStatus status) { return new ResultMatcher() { public void match(MvcResult result) { assertEquals("Status", status.value(), result.getResponse().getStatus()); diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java index fbec16420d2..b582b3b68cc 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java @@ -62,7 +62,7 @@ final class PatternMappingFilterProxy implements Filter { Assert.notNull(delegate, "A delegate Filter is required"); this.delegate = delegate; for(String urlPattern : urlPatterns) { - addUrlPattern(urlPattern); + addUrlPattern(urlPattern); } } @@ -127,4 +127,4 @@ final class PatternMappingFilterProxy implements Filter { this.delegate.destroy(); } -} \ No newline at end of file +} diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java index da60dfc5b12..926942869af 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java @@ -228,9 +228,9 @@ public class MockHttpServletRequestBuilderTests { assertEquals("bar=baz", request.getParameter("foo")); } - @Test - public void acceptHeader() throws Exception { - this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML); + @Test + public void acceptHeader() throws Exception { + this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML); MockHttpServletRequest request = this.builder.buildRequest(this.servletContext); List accept = Collections.list(request.getHeaders("Accept")); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java index 96686225840..902dc2c7e06 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java @@ -40,7 +40,7 @@ public class ExceptionHandlerTests { standaloneSetup(new PersonController()).build() .perform(get("/person/Clyde")) .andExpect(status().isOk()) - .andExpect(forwardedUrl("errorView")); + .andExpect(forwardedUrl("errorView")); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java index f3ee74e8ced..73659fc416d 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java @@ -52,32 +52,32 @@ public class RedirectTests { public void save() throws Exception { this.mockMvc.perform(post("/persons").param("name", "Andy")) .andExpect(status().isMovedTemporarily()) - .andExpect(redirectedUrl("/persons/Joe")) - .andExpect(model().size(1)) - .andExpect(model().attributeExists("name")) - .andExpect(flash().attributeCount(1)) - .andExpect(flash().attribute("message", "success!")); + .andExpect(redirectedUrl("/persons/Joe")) + .andExpect(model().size(1)) + .andExpect(model().attributeExists("name")) + .andExpect(flash().attributeCount(1)) + .andExpect(flash().attribute("message", "success!")); } @Test public void saveWithErrors() throws Exception { this.mockMvc.perform(post("/persons")) .andExpect(status().isOk()) - .andExpect(forwardedUrl("persons/add")) - .andExpect(model().size(1)) - .andExpect(model().attributeExists("person")) - .andExpect(flash().attributeCount(0)); + .andExpect(forwardedUrl("persons/add")) + .andExpect(model().size(1)) + .andExpect(model().attributeExists("person")) + .andExpect(flash().attributeCount(0)); } @Test public void getPerson() throws Exception { this.mockMvc.perform(get("/persons/Joe").flashAttr("message", "success!")) .andExpect(status().isOk()) - .andExpect(forwardedUrl("persons/index")) - .andExpect(model().size(2)) - .andExpect(model().attribute("person", new Person("Joe"))) - .andExpect(model().attribute("message", "success!")) - .andExpect(flash().attributeCount(0)); + .andExpect(forwardedUrl("persons/index")) + .andExpect(model().size(2)) + .andExpect(model().attribute("person", new Person("Joe"))) + .andExpect(model().attribute("message", "success!")) + .andExpect(flash().attributeCount(0)); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java index ae60ff4ca7e..e82e79a5f42 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java @@ -56,26 +56,26 @@ public class FlashAttributeAssertionTests { @Test public void testExists() throws Exception { this.mockMvc.perform(post("/persons")) - .andExpect(flash().attributeExists("one", "two", "three")); + .andExpect(flash().attributeExists("one", "two", "three")); } @Test public void testEqualTo() throws Exception { this.mockMvc.perform(post("/persons")) - .andExpect(flash().attribute("one", "1")) - .andExpect(flash().attribute("two", 2.222)) - .andExpect(flash().attribute("three", new URL("http://example.com"))) - .andExpect(flash().attribute("one", equalTo("1"))) // Hamcrest... - .andExpect(flash().attribute("two", equalTo(2.222))) - .andExpect(flash().attribute("three", equalTo(new URL("http://example.com")))); + .andExpect(flash().attribute("one", "1")) + .andExpect(flash().attribute("two", 2.222)) + .andExpect(flash().attribute("three", new URL("http://example.com"))) + .andExpect(flash().attribute("one", equalTo("1"))) // Hamcrest... + .andExpect(flash().attribute("two", equalTo(2.222))) + .andExpect(flash().attribute("three", equalTo(new URL("http://example.com")))); } @Test public void testMatchers() throws Exception { this.mockMvc.perform(post("/persons")) - .andExpect(flash().attribute("one", containsString("1"))) - .andExpect(flash().attribute("two", closeTo(2, 0.5))) - .andExpect(flash().attribute("three", notNullValue())); + .andExpect(flash().attribute("one", containsString("1"))) + .andExpect(flash().attribute("two", closeTo(2, 0.5))) + .andExpect(flash().attribute("three", notNullValue())); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java index 4779f52608e..1db0c2b110b 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java @@ -48,10 +48,10 @@ public class RequestAttributeAssertionTests { @Test public void testRequestAttributeEqualTo() throws Exception { this.mockMvc.perform(get("/main/1").servletPath("/main")) - .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/{id}")) - .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/1")) - .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, equalTo("/{id}"))) - .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, equalTo("/1"))); + .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/{id}")) + .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/1")) + .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, equalTo("/{id}"))) + .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, equalTo("/1"))); } @Test @@ -60,8 +60,8 @@ public class RequestAttributeAssertionTests { String producibleMediaTypes = HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE; this.mockMvc.perform(get("/1")) - .andExpect(request().attribute(producibleMediaTypes, hasItem(MediaType.APPLICATION_JSON))) - .andExpect(request().attribute(producibleMediaTypes, not(hasItem(MediaType.APPLICATION_XML)))); + .andExpect(request().attribute(producibleMediaTypes, hasItem(MediaType.APPLICATION_JSON))) + .andExpect(request().attribute(producibleMediaTypes, not(hasItem(MediaType.APPLICATION_XML)))); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java index 654feef07c6..feeb8d23e51 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java @@ -54,14 +54,14 @@ public class SessionAttributeAssertionTests { @Test public void testSessionAttributeEqualTo() throws Exception { this.mockMvc.perform(get("/")) - .andExpect(request().sessionAttribute("locale", Locale.UK)) - .andExpect(request().sessionAttribute("locale", equalTo(Locale.UK))); + .andExpect(request().sessionAttribute("locale", Locale.UK)) + .andExpect(request().sessionAttribute("locale", equalTo(Locale.UK))); } @Test public void testSessionAttributeMatcher() throws Exception { this.mockMvc.perform(get("/")) - .andExpect(request().sessionAttribute("locale", notNullValue())); + .andExpect(request().sessionAttribute("locale", notNullValue())); } diff --git a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java index bd8ff089694..4f2dbab7f8c 100644 --- a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java +++ b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java @@ -27,17 +27,17 @@ import org.springframework.util.ObjectUtils; public abstract class AssertionErrors { - private AssertionErrors() { - } + private AssertionErrors() { + } /** * Fails a test with the given message. * * @param message describes the reason for the failure */ - public static void fail(String message) { - throw new AssertionError(message); - } + public static void fail(String message) { + throw new AssertionError(message); + } /** * Fails a test with the given message passing along expected and actual @@ -56,9 +56,9 @@ public abstract class AssertionErrors { * @param expected expected value * @param actual actual value */ - public static void fail(String message, Object expected, Object actual) { - throw new AssertionError(message + " expected:<" + expected + "> but was:<" + actual + ">"); - } + public static void fail(String message, Object expected, Object actual) { + throw new AssertionError(message + " expected:<" + expected + "> but was:<" + actual + ">"); + } /** * Assert the given condition is {@code true} and raise an @@ -67,11 +67,11 @@ public abstract class AssertionErrors { * @param message the message * @param condition the condition to test for */ - public static void assertTrue(String message, boolean condition) { - if (!condition) { - fail(message); - } - } + public static void assertTrue(String message, boolean condition) { + if (!condition) { + fail(message); + } + } /** * Assert two objects are equal raise an {@link AssertionError} if not. @@ -84,10 +84,10 @@ public abstract class AssertionErrors { * @param expected the expected value * @param actual the actual value */ - public static void assertEquals(String message, Object expected, Object actual) { + public static void assertEquals(String message, Object expected, Object actual) { if (!ObjectUtils.nullSafeEquals(expected, actual)) { fail(message, expected, actual); } - } + } } diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java index f8e46ea6a52..f5e54bb50fe 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java @@ -123,7 +123,7 @@ public class CciLocalTransactionManager extends AbstractPlatformTransactionManag protected Object doGetTransaction() { CciLocalTransactionObject txObject = new CciLocalTransactionObject(); ConnectionHolder conHolder = - (ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory()); + (ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory()); txObject.setConnectionHolder(conHolder); return txObject; } diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java index 6929ef5aeeb..a771826932d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java @@ -717,7 +717,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager if (transactionSynchronizationRegistryClass == null) { // JTA 1.1 API not present - skip. if (logger.isDebugEnabled()) { - logger.debug("JTA 1.1 [" + TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME + "] API not available"); + logger.debug("JTA 1.1 [" + TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME + "] API not available"); } return null; } @@ -823,12 +823,12 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager catch (NotSupportedException ex) { // assume nested transaction not supported throw new NestedTransactionNotSupportedException( - "JTA implementation does not support nested transactions", ex); + "JTA implementation does not support nested transactions", ex); } catch (UnsupportedOperationException ex) { // assume nested transaction not supported throw new NestedTransactionNotSupportedException( - "JTA implementation does not support nested transactions", ex); + "JTA implementation does not support nested transactions", ex); } catch (SystemException ex) { throw new CannotCreateTransactionException("JTA failure on begin", ex); @@ -883,7 +883,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager if (!this.allowCustomIsolationLevels && isolationLevel != TransactionDefinition.ISOLATION_DEFAULT) { throw new InvalidIsolationLevelException( - "JtaTransactionManager does not support custom isolation levels by default - " + + "JtaTransactionManager does not support custom isolation levels by default - " + "switch 'allowCustomIsolationLevels' to 'true'"); } } @@ -962,7 +962,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager * @see javax.transaction.TransactionManager#resume(javax.transaction.Transaction) */ protected void doJtaResume(JtaTransactionObject txObject, Object suspendedTransaction) - throws InvalidTransactionException, SystemException { + throws InvalidTransactionException, SystemException { if (getTransactionManager() == null) { throw new TransactionSuspensionNotSupportedException( diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java index b9f994d27aa..731978b6933 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java @@ -274,7 +274,7 @@ public class WebLogicJtaTransactionManager extends JtaTransactionManager { if (logger.isDebugEnabled()) { logger.debug("Standard JTA resume threw InvalidTransactionException: " + ex.getMessage() + - " - trying WebLogic JTA forceResume"); + " - trying WebLogic JTA forceResume"); } /* weblogic.transaction.TransactionManager wtm = diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 07e3344f0f4..e79760ad391 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -359,7 +359,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran } else if (definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRED || definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRES_NEW || - definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) { + definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) { SuspendedResourcesHolder suspendedResources = suspend(null); if (debugEnabled) { logger.debug("Creating new transaction with name [" + definition.getName() + "]: " + definition); diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java index a69769852a0..8b730722670 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java @@ -176,7 +176,7 @@ public class DefaultTransactionStatus extends AbstractTransactionStatus { protected SavepointManager getSavepointManager() { if (!isTransactionSavepointManager()) { throw new NestedTransactionNotSupportedException( - "Transaction object [" + getTransaction() + "] does not support savepoints"); + "Transaction object [" + getTransaction() + "] does not support savepoints"); } return (SavepointManager) getTransaction(); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java index 0c7aedfd228..712b1296d05 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java @@ -284,7 +284,7 @@ public abstract class TransactionSynchronizationManager { * @see org.springframework.core.Ordered */ public static void registerSynchronization(TransactionSynchronization synchronization) - throws IllegalStateException { + throws IllegalStateException { Assert.notNull(synchronization, "TransactionSynchronization must not be null"); if (!isSynchronizationActive()) { diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java index 3ed4ebcb35c..6c6da1c15ee 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java @@ -55,27 +55,27 @@ public class TransactionAttributeSourceEditorTests extends TestCase { TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor(); // TODO need FQN? pe.setAsText( - "java.lang.Object.hashCode=PROPAGATION_REQUIRED\n" + - "java.lang.Object.equals=PROPAGATION_MANDATORY\n" + - "java.lang.Object.*it=PROPAGATION_SUPPORTS\n" + - "java.lang.Object.notify=PROPAGATION_SUPPORTS\n" + - "java.lang.Object.not*=PROPAGATION_REQUIRED"); + "java.lang.Object.hashCode=PROPAGATION_REQUIRED\n" + + "java.lang.Object.equals=PROPAGATION_MANDATORY\n" + + "java.lang.Object.*it=PROPAGATION_SUPPORTS\n" + + "java.lang.Object.notify=PROPAGATION_SUPPORTS\n" + + "java.lang.Object.not*=PROPAGATION_REQUIRED"); TransactionAttributeSource tas = (TransactionAttributeSource) pe.getValue(); checkTransactionProperties(tas, Object.class.getMethod("hashCode", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("equals", new Class[] { Object.class }), - TransactionDefinition.PROPAGATION_MANDATORY); + TransactionDefinition.PROPAGATION_MANDATORY); checkTransactionProperties(tas, Object.class.getMethod("wait", (Class[]) null), - TransactionDefinition.PROPAGATION_SUPPORTS); + TransactionDefinition.PROPAGATION_SUPPORTS); checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class }), - TransactionDefinition.PROPAGATION_SUPPORTS); + TransactionDefinition.PROPAGATION_SUPPORTS); checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class, int.class }), - TransactionDefinition.PROPAGATION_SUPPORTS); + TransactionDefinition.PROPAGATION_SUPPORTS); checkTransactionProperties(tas, Object.class.getMethod("notify", (Class[]) null), - TransactionDefinition.PROPAGATION_SUPPORTS); + TransactionDefinition.PROPAGATION_SUPPORTS); checkTransactionProperties(tas, Object.class.getMethod("notifyAll", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("toString", (Class[]) null), -1); } @@ -85,21 +85,21 @@ public class TransactionAttributeSourceEditorTests extends TestCase { TransactionAttributeSource tas = (TransactionAttributeSource) pe.getValue(); checkTransactionProperties(tas, Object.class.getMethod("hashCode", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("equals", new Class[] { Object.class }), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("wait", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class }), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class, int.class }), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("notify", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("notifyAll", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); checkTransactionProperties(tas, Object.class.getMethod("toString", (Class[]) null), - TransactionDefinition.PROPAGATION_REQUIRED); + TransactionDefinition.PROPAGATION_REQUIRED); } private void checkTransactionProperties(TransactionAttributeSource tas, Method method, int propagationBehavior) { diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index 3da6afe333a..5d480d5e4b8 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2012 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. @@ -96,8 +96,8 @@ public class HttpHeaders implements MultiValueMap, Serializable private static final String[] DATE_FORMATS = new String[] { "EEE, dd MMM yyyy HH:mm:ss zzz", - "EEE, dd-MMM-yy HH:mm:ss zzz", - "EEE MMM dd HH:mm:ss yyyy" + "EEE, dd-MMM-yy HH:mm:ss zzz", + "EEE MMM dd HH:mm:ss yyyy" }; private static TimeZone GMT = TimeZone.getTimeZone("GMT"); diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java index e8853a9b16c..e50c58f4450 100644 --- a/spring-web/src/main/java/org/springframework/http/MediaType.java +++ b/spring-web/src/main/java/org/springframework/http/MediaType.java @@ -463,7 +463,7 @@ public class MediaType implements Comparable { * @return a read-only map, possibly empty, never null */ public Map getParameters() { - return parameters; + return parameters; } /** diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java index 16a5908e458..ab13bc68c77 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java @@ -50,13 +50,13 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR private final HttpUriRequest httpRequest; - private final HttpContext httpContext; + private final HttpContext httpContext; - public HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) { + public HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) { this.httpClient = httpClient; this.httpRequest = httpRequest; - this.httpContext = httpContext; + this.httpContext = httpContext; } diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java index 8bb41ed7433..0131cfa50fc 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java @@ -128,7 +128,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout); } - public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { + public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri); postProcessHttpRequest(httpRequest); return new HttpComponentsClientHttpRequest(getHttpClient(), httpRequest, createHttpContext(httpMethod, uri)); @@ -172,16 +172,16 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest protected void postProcessHttpRequest(HttpUriRequest request) { } - /** - * Template methods that creates a {@link HttpContext} for the given HTTP method and URI. - *

The default implementation returns {@code null}. - * @param httpMethod the HTTP method - * @param uri the URI - * @return the http context - */ - protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) { - return null; - } + /** + * Template methods that creates a {@link HttpContext} for the given HTTP method and URI. + *

The default implementation returns {@code null}. + * @param httpMethod the HTTP method + * @param uri the URI + * @return the http context + */ + protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) { + return null; + } /** * Shutdown hook that closes the underlying diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java index 9ec659945a3..a5e831102c4 100644 --- a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java @@ -73,38 +73,38 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest { else { this.connection.setChunkedStreamingMode(this.chunkSize); } - writeHeaders(headers); - this.connection.connect(); + writeHeaders(headers); + this.connection.connect(); this.body = this.connection.getOutputStream(); } return new NonClosingOutputStream(this.body); } - private void writeHeaders(HttpHeaders headers) { - for (Map.Entry> entry : headers.entrySet()) { - String headerName = entry.getKey(); - for (String headerValue : entry.getValue()) { - this.connection.addRequestProperty(headerName, headerValue); - } - } - } + private void writeHeaders(HttpHeaders headers) { + for (Map.Entry> entry : headers.entrySet()) { + String headerName = entry.getKey(); + for (String headerValue : entry.getValue()) { + this.connection.addRequestProperty(headerName, headerValue); + } + } + } - @Override + @Override protected ClientHttpResponse executeInternal(HttpHeaders headers) throws IOException { - try { - if (this.body != null) { - this.body.close(); - } - else { - writeHeaders(headers); - this.connection.connect(); - } - } - catch (IOException ex) { - // ignore - } - return new SimpleClientHttpResponse(this.connection); - } + try { + if (this.body != null) { + this.body.close(); + } + else { + writeHeaders(headers); + this.connection.connect(); + } + } + catch (IOException ex) { + // ignore + } + return new SimpleClientHttpResponse(this.connection); + } private static class NonClosingOutputStream extends FilterOutputStream { diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java index 0529f38206c..9b819edc8df 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java @@ -183,7 +183,7 @@ public class BurlapClientInterceptor extends UrlBasedRemoteAccessor implements M } else { return new RemoteAccessException( - "Cannot access Burlap remote service at [" + getServiceUrl() + "]", ex); + "Cannot access Burlap remote service at [" + getServiceUrl() + "]", ex); } } diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java index d07fe12733a..57418a6747f 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java @@ -264,7 +264,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements } else { return new RemoteAccessException( - "Cannot access Hessian remote service at [" + getServiceUrl() + "]", ex); + "Cannot access Hessian remote service at [" + getServiceUrl() + "]", ex); } } diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java index df2fba95ccc..7f6c8eeb640 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java @@ -210,7 +210,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor } else { throw new RemoteAccessException( - "Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex); + "Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex); } } diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java index 8bb3a5e0096..1ffd4ec6111 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java +++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java @@ -185,7 +185,7 @@ public abstract class GenericFilterBean implements } catch (BeansException ex) { String msg = "Failed to set bean properties on filter '" + - filterConfig.getFilterName() + "': " + ex.getMessage(); + filterConfig.getFilterName() + "': " + ex.getMessage(); logger.error(msg, ex); throw new NestedServletException(msg, ex); } @@ -310,9 +310,9 @@ public abstract class GenericFilterBean implements // Fail if we are still missing properties. if (missingProps != null && missingProps.size() > 0) { throw new ServletException( - "Initialization from FilterConfig for filter '" + config.getFilterName() + - "' failed; the following required properties were missing: " + - StringUtils.collectionToDelimitedString(missingProps, ", ")); + "Initialization from FilterConfig for filter '" + config.getFilterName() + + "' failed; the following required properties were missing: " + + StringUtils.collectionToDelimitedString(missingProps, ", ")); } } } diff --git a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java index e28efaeb578..e4b929d6fc2 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java @@ -76,7 +76,7 @@ public abstract class FacesContextUtils { * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE */ public static WebApplicationContext getRequiredWebApplicationContext(FacesContext fc) - throws IllegalStateException { + throws IllegalStateException { WebApplicationContext wac = getWebApplicationContext(fc); if (wac == null) { diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index a52615d1efc..141cd7b86e2 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -107,7 +107,7 @@ public class UriComponentsBuilder { protected UriComponentsBuilder() { } - // Factory methods + // Factory methods /** * Returns a new, empty builder. @@ -253,7 +253,7 @@ public class UriComponentsBuilder { - // build methods + // build methods /** * Builds a {@code UriComponents} instance from the various components contained in this builder. @@ -306,7 +306,7 @@ public class UriComponentsBuilder { return build(false).expand(uriVariableValues); } - // URI components methods + // URI components methods /** * Initializes all components of this URI builder with the components of the given URI. diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java index 2437b9ba0d9..92070f08ac6 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java @@ -67,7 +67,7 @@ public class UriTemplate implements Serializable { this.uriTemplate = uriTemplate; this.variableNames = parser.getVariableNames(); this.matchPattern = parser.getMatchPattern(); - this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build(); + this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build(); } /** @@ -78,7 +78,7 @@ public class UriTemplate implements Serializable { return this.variableNames; } - // expanding + // expanding /** * Given the Map of variables, expands this template into a URI. The Map keys represent variable names, @@ -98,12 +98,12 @@ public class UriTemplate implements Serializable { * or if it does not contain values for all the variable names */ public URI expand(Map uriVariables) { - UriComponents expandedComponents = uriComponents.expand(uriVariables); + UriComponents expandedComponents = uriComponents.expand(uriVariables); UriComponents encodedComponents = expandedComponents.encode(); - return encodedComponents.toUri(); + return encodedComponents.toUri(); } - /** + /** * Given an array of variables, expand this template into a full URI. The array represent variable values. * The order of variables is significant. *

Example: @@ -118,12 +118,12 @@ public class UriTemplate implements Serializable { * or if it does not contain sufficient variables */ public URI expand(Object... uriVariableValues) { - UriComponents expandedComponents = uriComponents.expand(uriVariableValues); + UriComponents expandedComponents = uriComponents.expand(uriVariableValues); UriComponents encodedComponents = expandedComponents.encode(); - return encodedComponents.toUri(); + return encodedComponents.toUri(); } - // matching + // matching /** * Indicate whether the given URI matches this template. diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java index 4c2b036a6cd..d8d3ce24467 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java @@ -142,16 +142,16 @@ public abstract class WebUtils { String root = servletContext.getRealPath("/"); if (root == null) { throw new IllegalStateException( - "Cannot set web app root system property when WAR file is not expanded"); + "Cannot set web app root system property when WAR file is not expanded"); } String param = servletContext.getInitParameter(WEB_APP_ROOT_KEY_PARAM); String key = (param != null ? param : DEFAULT_WEB_APP_ROOT_KEY); String oldValue = System.getProperty(key); if (oldValue != null && !StringUtils.pathEquals(oldValue, root)) { throw new IllegalStateException( - "Web app root system property already set to different value: '" + - key + "' = [" + oldValue + "] instead of [" + root + "] - " + - "Choose unique values for the 'webAppRootKey' context-param in your web.xml files!"); + "Web app root system property already set to different value: '" + + key + "' = [" + oldValue + "] instead of [" + root + "] - " + + "Choose unique values for the 'webAppRootKey' context-param in your web.xml files!"); } System.setProperty(key, root); servletContext.log("Set web app root system property: '" + key + "' = [" + root + "]"); @@ -279,7 +279,7 @@ public abstract class WebUtils { * @throws IllegalStateException if the session attribute could not be found */ public static Object getRequiredSessionAttribute(HttpServletRequest request, String name) - throws IllegalStateException { + throws IllegalStateException { Object attr = getSessionAttribute(request, name); if (attr == null) { @@ -330,13 +330,13 @@ public abstract class WebUtils { } catch (InstantiationException ex) { throw new IllegalArgumentException( - "Could not instantiate class [" + clazz.getName() + - "] for session attribute '" + name + "': " + ex.getMessage()); + "Could not instantiate class [" + clazz.getName() + + "] for session attribute '" + name + "': " + ex.getMessage()); } catch (IllegalAccessException ex) { throw new IllegalArgumentException( - "Could not access default constructor of class [" + clazz.getName() + - "] for session attribute '" + name + "': " + ex.getMessage()); + "Could not access default constructor of class [" + clazz.getName() + + "] for session attribute '" + name + "': " + ex.getMessage()); } session.setAttribute(name, sessionObject); } diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java index 0ce0dc19e4e..2af35321ff6 100644 --- a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java +++ b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java @@ -245,8 +245,8 @@ public abstract class AbstractHttpRequestFactoryTestCase { @SuppressWarnings("serial") private static class EchoServlet extends HttpServlet { - @Override - protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + @Override + protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { echo(req, resp); } diff --git a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java index 3591eaca447..113f3d4910a 100644 --- a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java +++ b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java @@ -31,69 +31,69 @@ import org.springframework.util.Assert; */ public abstract class FreePortScanner { - private static final int MIN_SAFE_PORT = 1024; + private static final int MIN_SAFE_PORT = 1024; - private static final int MAX_PORT = 65535; + private static final int MAX_PORT = 65535; - private static final Random random = new Random(); + private static final Random random = new Random(); - /** - * Returns the number of a free port in the default range. - */ - public static int getFreePort() { - return getFreePort(MIN_SAFE_PORT, MAX_PORT); - } + /** + * Returns the number of a free port in the default range. + */ + public static int getFreePort() { + return getFreePort(MIN_SAFE_PORT, MAX_PORT); + } - /** - * Returns the number of a free port in the given range. - */ - public static int getFreePort(int minPort, int maxPort) { - Assert.isTrue(minPort > 0, "'minPort' must be larger than 0"); - Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort"); - int portRange = maxPort - minPort; - int candidatePort; - int searchCounter = 0; - do { - if (++searchCounter > portRange) { - throw new IllegalStateException( - String.format("There were no ports available in the range %d to %d", minPort, maxPort)); - } - candidatePort = getRandomPort(minPort, portRange); - } - while (!isPortAvailable(candidatePort)); + /** + * Returns the number of a free port in the given range. + */ + public static int getFreePort(int minPort, int maxPort) { + Assert.isTrue(minPort > 0, "'minPort' must be larger than 0"); + Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort"); + int portRange = maxPort - minPort; + int candidatePort; + int searchCounter = 0; + do { + if (++searchCounter > portRange) { + throw new IllegalStateException( + String.format("There were no ports available in the range %d to %d", minPort, maxPort)); + } + candidatePort = getRandomPort(minPort, portRange); + } + while (!isPortAvailable(candidatePort)); - return candidatePort; - } + return candidatePort; + } - private static int getRandomPort(int minPort, int portRange) { - return minPort + random.nextInt(portRange); - } + private static int getRandomPort(int minPort, int portRange) { + return minPort + random.nextInt(portRange); + } - private static boolean isPortAvailable(int port) { - ServerSocket serverSocket; - try { - serverSocket = new ServerSocket(); - } - catch (IOException ex) { - throw new IllegalStateException("Unable to create ServerSocket.", ex); - } + private static boolean isPortAvailable(int port) { + ServerSocket serverSocket; + try { + serverSocket = new ServerSocket(); + } + catch (IOException ex) { + throw new IllegalStateException("Unable to create ServerSocket.", ex); + } - try { - InetSocketAddress sa = new InetSocketAddress(port); - serverSocket.bind(sa); - return true; - } - catch (IOException ex) { - return false; - } - finally { - try { - serverSocket.close(); - } - catch (IOException ex) { - // ignore - } - } - } + try { + InetSocketAddress sa = new InetSocketAddress(port); + serverSocket.bind(sa); + return true; + } + catch (IOException ex) { + return false; + } + finally { + try { + serverSocket.close(); + } + catch (IOException ex) { + // ignore + } + } + } } diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java index 1f870a8f7ac..6352a497583 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java @@ -373,13 +373,13 @@ public class CommonsMultipartResolverTests { } List fileItems = new ArrayList(); MockFileItem fileItem1 = new MockFileItem( - "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1"); + "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1"); MockFileItem fileItem1x = new MockFileItem( - "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1"); + "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1"); MockFileItem fileItem2 = new MockFileItem( - "field2", "type2", empty ? "" : "C:/field2.txt", empty ? "" : "text2"); + "field2", "type2", empty ? "" : "C:/field2.txt", empty ? "" : "text2"); MockFileItem fileItem2x = new MockFileItem( - "field2x", "type2", empty ? "" : "C:\\field2x.txt", empty ? "" : "text2"); + "field2x", "type2", empty ? "" : "C:\\field2x.txt", empty ? "" : "text2"); MockFileItem fileItem3 = new MockFileItem("field3", null, null, "value3"); MockFileItem fileItem4 = new MockFileItem("field4", "text/html; charset=iso-8859-1", null, "value4"); MockFileItem fileItem5 = new MockFileItem("field4", null, null, "value5"); diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index 057733e943c..8205ca6cdf8 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -38,11 +38,11 @@ public class UriComponentsBuilderTests { public void plain() throws URISyntaxException { UriComponentsBuilder builder = UriComponentsBuilder.newInstance(); UriComponents result = builder.scheme("http").host("example.com").path("foo").queryParam("bar").fragment("baz").build(); - assertEquals("http", result.getScheme()); - assertEquals("example.com", result.getHost()); - assertEquals("foo", result.getPath()); - assertEquals("bar", result.getQuery()); - assertEquals("baz", result.getFragment()); + assertEquals("http", result.getScheme()); + assertEquals("example.com", result.getHost()); + assertEquals("foo", result.getPath()); + assertEquals("bar", result.getQuery()); + assertEquals("baz", result.getFragment()); URI expected = new URI("http://example.com/foo?bar#baz"); assertEquals("Invalid result URI", expected, result.toUri()); @@ -51,29 +51,29 @@ public class UriComponentsBuilderTests { @Test public void fromPath() throws URISyntaxException { UriComponents result = UriComponentsBuilder.fromPath("foo").queryParam("bar").fragment("baz").build(); - assertEquals("foo", result.getPath()); - assertEquals("bar", result.getQuery()); - assertEquals("baz", result.getFragment()); + assertEquals("foo", result.getPath()); + assertEquals("bar", result.getQuery()); + assertEquals("baz", result.getFragment()); URI expected = new URI("/foo?bar#baz"); assertEquals("Invalid result URI", expected, result.toUri()); result = UriComponentsBuilder.fromPath("/foo").build(); - assertEquals("/foo", result.getPath()); + assertEquals("/foo", result.getPath()); - expected = new URI("/foo"); + expected = new URI("/foo"); assertEquals("Invalid result URI", expected, result.toUri()); } @Test public void fromHierarchicalUri() throws URISyntaxException { URI uri = new URI("http://example.com/foo?bar#baz"); - UriComponents result = UriComponentsBuilder.fromUri(uri).build(); - assertEquals("http", result.getScheme()); - assertEquals("example.com", result.getHost()); - assertEquals("/foo", result.getPath()); - assertEquals("bar", result.getQuery()); - assertEquals("baz", result.getFragment()); + UriComponents result = UriComponentsBuilder.fromUri(uri).build(); + assertEquals("http", result.getScheme()); + assertEquals("example.com", result.getHost()); + assertEquals("/foo", result.getPath()); + assertEquals("bar", result.getQuery()); + assertEquals("baz", result.getFragment()); assertEquals("Invalid result URI", uri, result.toUri()); } @@ -81,24 +81,24 @@ public class UriComponentsBuilderTests { @Test public void fromOpaqueUri() throws URISyntaxException { URI uri = new URI("mailto:foo@bar.com#baz"); - UriComponents result = UriComponentsBuilder.fromUri(uri).build(); - assertEquals("mailto", result.getScheme()); - assertEquals("foo@bar.com", result.getSchemeSpecificPart()); - assertEquals("baz", result.getFragment()); + UriComponents result = UriComponentsBuilder.fromUri(uri).build(); + assertEquals("mailto", result.getScheme()); + assertEquals("foo@bar.com", result.getSchemeSpecificPart()); + assertEquals("baz", result.getFragment()); assertEquals("Invalid result URI", uri, result.toUri()); } // SPR-9317 - @Test - public void fromUriEncodedQuery() throws URISyntaxException { - URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D"); - String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0); - String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0); + @Test + public void fromUriEncodedQuery() throws URISyntaxException { + URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D"); + String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0); + String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0); - assertEquals(fromUri, fromUriString); - } + assertEquals(fromUri, fromUriString); + } @Test public void fromUriString() { @@ -115,42 +115,42 @@ public class UriComponentsBuilderTests { result = UriComponentsBuilder.fromUriString( "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)") .build(); - assertEquals("http", result.getScheme()); - assertEquals("arjen:foobar", result.getUserInfo()); - assertEquals("java.sun.com", result.getHost()); - assertEquals(80, result.getPort()); - assertEquals("/javase/6/docs/api/java/util/BitSet.html", result.getPath()); - assertEquals("foo=bar", result.getQuery()); + assertEquals("http", result.getScheme()); + assertEquals("arjen:foobar", result.getUserInfo()); + assertEquals("java.sun.com", result.getHost()); + assertEquals(80, result.getPort()); + assertEquals("/javase/6/docs/api/java/util/BitSet.html", result.getPath()); + assertEquals("foo=bar", result.getQuery()); MultiValueMap expectedQueryParams = new LinkedMultiValueMap(1); expectedQueryParams.add("foo", "bar"); assertEquals(expectedQueryParams, result.getQueryParams()); - assertEquals("and(java.util.BitSet)", result.getFragment()); + assertEquals("and(java.util.BitSet)", result.getFragment()); - result = UriComponentsBuilder.fromUriString("mailto:java-net@java.sun.com#baz").build(); - assertEquals("mailto", result.getScheme()); - assertNull(result.getUserInfo()); - assertNull(result.getHost()); - assertEquals(-1, result.getPort()); - assertEquals("java-net@java.sun.com", result.getSchemeSpecificPart()); - assertNull(result.getPath()); - assertNull(result.getQuery()); - assertEquals("baz", result.getFragment()); + result = UriComponentsBuilder.fromUriString("mailto:java-net@java.sun.com#baz").build(); + assertEquals("mailto", result.getScheme()); + assertNull(result.getUserInfo()); + assertNull(result.getHost()); + assertEquals(-1, result.getPort()); + assertEquals("java-net@java.sun.com", result.getSchemeSpecificPart()); + assertNull(result.getPath()); + assertNull(result.getQuery()); + assertEquals("baz", result.getFragment()); - result = UriComponentsBuilder.fromUriString("docs/guide/collections/designfaq.html#28").build(); - assertNull(result.getScheme()); - assertNull(result.getUserInfo()); - assertNull(result.getHost()); - assertEquals(-1, result.getPort()); - assertEquals("docs/guide/collections/designfaq.html", result.getPath()); - assertNull(result.getQuery()); - assertEquals("28", result.getFragment()); + result = UriComponentsBuilder.fromUriString("docs/guide/collections/designfaq.html#28").build(); + assertNull(result.getScheme()); + assertNull(result.getUserInfo()); + assertNull(result.getHost()); + assertEquals(-1, result.getPort()); + assertEquals("docs/guide/collections/designfaq.html", result.getPath()); + assertNull(result.getQuery()); + assertEquals("28", result.getFragment()); } // SPR-9832 @Test public void fromUriStringQueryParamWithReservedCharInValue() throws URISyntaxException { - String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR"; + String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR"; UriComponents result = UriComponentsBuilder.fromUriString(uri).build(); assertEquals("q=1USD=?EUR", result.getQuery()); diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java index 50b1fc07ee5..c9f8d609177 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java @@ -26,25 +26,25 @@ import static org.junit.Assert.*; /** @author Arjen Poutsma */ public class UriComponentsTests { - @Test - public void encode() { - UriComponents uriComponents = UriComponentsBuilder.fromPath("/hotel list").build(); - UriComponents encoded = uriComponents.encode(); - assertEquals("/hotel%20list", encoded.getPath()); - } + @Test + public void encode() { + UriComponents uriComponents = UriComponentsBuilder.fromPath("/hotel list").build(); + UriComponents encoded = uriComponents.encode(); + assertEquals("/hotel%20list", encoded.getPath()); + } - @Test - public void toUriEncoded() throws URISyntaxException { - UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build(); - UriComponents encoded = uriComponents.encode(); - assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri()); - } + @Test + public void toUriEncoded() throws URISyntaxException { + UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build(); + UriComponents encoded = uriComponents.encode(); + assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri()); + } - @Test - public void toUriNotEncoded() throws URISyntaxException { - UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build(); - assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri()); - } + @Test + public void toUriNotEncoded() throws URISyntaxException { + UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build(); + assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri()); + } @Test public void expand() { diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java index 557ba7ca9ff..ebd3cea2174 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java @@ -53,15 +53,15 @@ public class UriTemplateTests { template.expand("1"); } - @Test - public void expandMap() throws Exception { - Map uriVariables = new HashMap(2); - uriVariables.put("booking", "42"); - uriVariables.put("hotel", "1"); - UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}"); - URI result = template.expand(uriVariables); - assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result); - } + @Test + public void expandMap() throws Exception { + Map uriVariables = new HashMap(2); + uriVariables.put("booking", "42"); + uriVariables.put("hotel", "1"); + UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}"); + URI result = template.expand(uriVariables); + assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result); + } @Test public void expandMapDuplicateVariables() throws Exception { @@ -81,13 +81,13 @@ public class UriTemplateTests { assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result); } - @Test - public void expandMapEncoded() throws Exception { - Map uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich"); - UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}"); - URI result = template.expand(uriVariables); - assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result); - } + @Test + public void expandMapEncoded() throws Exception { + Map uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich"); + UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}"); + URI result = template.expand(uriVariables); + assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result); + } @Test(expected = IllegalArgumentException.class) public void expandMapUnboundVariables() throws Exception { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java index e9bd670d8f7..53825239896 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java @@ -98,7 +98,7 @@ public abstract class PortletApplicationContextUtils { * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE */ public static ApplicationContext getRequiredWebApplicationContext(PortletContext pc) - throws IllegalStateException { + throws IllegalStateException { ApplicationContext wac = getWebApplicationContext(pc); if (wac == null) { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 8d5c00dce53..d1dc0c26639 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -381,7 +381,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp if (other instanceof SpecialRequestTypePredicate) { return this.getClass().getName().compareTo(other.getClass().getName()); } - return -1; + return -1; } } @@ -413,7 +413,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp if (other instanceof SpecialRequestTypePredicate) { return this.getClass().getName().compareTo(other.getClass().getName()); } - return -1; + return -1; } } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java index cef74bee416..f2fc531e763 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java @@ -158,9 +158,9 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo pvs = new MutablePropertyValues(); pvs.add("order", "1"); pvs.add("exceptionMappings", - "java.lang.IllegalAccessException=failed-illegalaccess\n" + - "PortletRequestBindingException=failed-binding\n" + - "NoHandlerFoundException=failed-unavailable"); + "java.lang.IllegalAccessException=failed-illegalaccess\n" + + "PortletRequestBindingException=failed-binding\n" + + "NoHandlerFoundException=failed-unavailable"); pvs.add("defaultErrorView", "failed-default-1"); registerSingleton("exceptionResolver", SimpleMappingExceptionResolver.class, pvs); @@ -376,7 +376,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor1 extends HandlerInterceptorAdapter { public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) - throws PortletException { + throws PortletException { if (request.getAttribute("test2-remove-never") != null) { throw new PortletException("Wrong interceptor order"); } @@ -412,7 +412,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor2 extends HandlerInterceptorAdapter { public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) - throws PortletException { + throws PortletException { if (request.getAttribute("test1-remove-post") == null) { throw new PortletException("Wrong interceptor order"); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java index becdc05c015..71fd56e812a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java @@ -1197,7 +1197,7 @@ public class Portlet20AnnotationControllerTests { @ActionMapping(params = "action=details") public void renderDetails(ActionRequest request, ActionResponse response, Model model) { response.setRenderParameter("test", "details"); - } + } @ResourceMapping public void myDefaultResource(Writer writer) throws IOException { diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java index 25d396b87e4..d03b2867244 100644 --- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java +++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java @@ -39,64 +39,64 @@ import org.springframework.web.context.support.ServletContextResourcePatternReso */ public class SpringWildcardServletTilesApplicationContext extends ServletApplicationContext { - /** - * The pattern resolver. - */ - protected ResourcePatternResolver resolver; + /** + * The pattern resolver. + */ + protected ResourcePatternResolver resolver; - /** - * Constructor. - * - * @param servletContext The servlet context. - */ - public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) { - super(servletContext); - resolver = new ServletContextResourcePatternResolver(servletContext); - } + /** + * Constructor. + * + * @param servletContext The servlet context. + */ + public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) { + super(servletContext); + resolver = new ServletContextResourcePatternResolver(servletContext); + } - @Override - public ApplicationResource getResource(String localePath) { - ApplicationResource retValue = null; - Collection urlSet = getResources(localePath); - if (urlSet != null && !urlSet.isEmpty()) { - retValue = urlSet.iterator().next(); - } - return retValue; - } + @Override + public ApplicationResource getResource(String localePath) { + ApplicationResource retValue = null; + Collection urlSet = getResources(localePath); + if (urlSet != null && !urlSet.isEmpty()) { + retValue = urlSet.iterator().next(); + } + return retValue; + } - @Override - public ApplicationResource getResource(ApplicationResource base, Locale locale) { - ApplicationResource retValue = null; - Collection urlSet = getResources(base.getLocalePath(locale)); - if (urlSet != null && !urlSet.isEmpty()) { - retValue = urlSet.iterator().next(); - } - return retValue; - } + @Override + public ApplicationResource getResource(ApplicationResource base, Locale locale) { + ApplicationResource retValue = null; + Collection urlSet = getResources(base.getLocalePath(locale)); + if (urlSet != null && !urlSet.isEmpty()) { + retValue = urlSet.iterator().next(); + } + return retValue; + } - @Override - public Collection getResources(String path) { - Resource[] resources; - try { - resources = resolver.getResources(path); - } catch (IOException e) { - return Collections. emptyList(); - } - Collection resourceList = new ArrayList(); - if (resources != null && resources.length > 0) { - for (int i = 0; i < resources.length; i++) { - URL url; - try { - url = resources[i].getURL(); - resourceList.add(new URLApplicationResource(url.toExternalForm(), url)); - } catch (IOException e) { - // shouldn't happen with the kind of resources we're using - throw new IllegalArgumentException("no URL for " + resources[i].toString(), e); - } - } - } - return resourceList; - } + @Override + public Collection getResources(String path) { + Resource[] resources; + try { + resources = resolver.getResources(path); + } catch (IOException e) { + return Collections. emptyList(); + } + Collection resourceList = new ArrayList(); + if (resources != null && resources.length > 0) { + for (int i = 0; i < resources.length; i++) { + URL url; + try { + url = resources[i].getURL(); + resourceList.add(new URLApplicationResource(url.toExternalForm(), url)); + } catch (IOException e) { + // shouldn't happen with the kind of resources we're using + throw new IllegalArgumentException("no URL for " + resources[i].toString(), e); + } + } + } + return resourceList; + } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java index aeee264e486..5d86f05988f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java @@ -229,7 +229,7 @@ public abstract class HttpServletBean extends HttpServlet * @throws ServletException if any required properties are missing */ public ServletConfigPropertyValues(ServletConfig config, Set requiredProperties) - throws ServletException { + throws ServletException { Set missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ? new HashSet(requiredProperties) : null; @@ -247,9 +247,9 @@ public abstract class HttpServletBean extends HttpServlet // Fail if we are still missing properties. if (missingProps != null && missingProps.size() > 0) { throw new ServletException( - "Initialization from ServletConfig for servlet '" + config.getServletName() + - "' failed; the following required properties were missing: " + - StringUtils.collectionToDelimitedString(missingProps, ", ")); + "Initialization from ServletConfig for servlet '" + config.getServletName() + + "' failed; the following required properties were missing: " + + StringUtils.collectionToDelimitedString(missingProps, ", ")); } } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java index dea8fddc991..4251077f27f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java @@ -191,7 +191,7 @@ public class ResourceServlet extends HttpServletBean { */ @Override protected final void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { // determine URL of resource to include String resourceUrl = determineResourceUrl(request); @@ -247,7 +247,7 @@ public class ResourceServlet extends HttpServletBean { * @throws IOException if thrown by the RequestDispatcher */ private boolean includeDefaultUrl(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { if (this.defaultUrl == null) { return false; @@ -265,13 +265,13 @@ public class ResourceServlet extends HttpServletBean { * @throws IOException if thrown by the RequestDispatcher */ private void doInclude(HttpServletRequest request, HttpServletResponse response, String resourceUrl) - throws ServletException, IOException { + throws ServletException, IOException { if (this.contentType != null) { response.setContentType(this.contentType); } String[] resourceUrls = - StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS); + StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS); for (int i = 0; i < resourceUrls.length; i++) { // check whether URL matches allowed resources if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, resourceUrls[i])) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java index fa44b4628a9..8a05cf73829 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java @@ -57,7 +57,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser { String resourceRequestPath = element.getAttribute("mapping"); if (!StringUtils.hasText(resourceRequestPath)) { parserContext.getReaderContext().error("The 'mapping' attribute is required.", parserContext.extractSource(element)); - return null; + return null; } urlMap.put(resourceRequestPath, resourceHandlerName); @@ -85,7 +85,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser { String locationAttr = element.getAttribute("location"); if (!StringUtils.hasText(locationAttr)) { parserContext.getReaderContext().error("The 'location' attribute is required.", parserContext.extractSource(element)); - return null; + return null; } ManagedList locations = new ManagedList(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java index 455977159cf..7e1754192c3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java @@ -35,7 +35,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept * This implementation always returns true. */ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) - throws Exception { + throws Exception { return true; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java index c9aafcab00b..8773e47a367 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java @@ -226,7 +226,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle */ @Override protected final void onBindAndValidate(HttpServletRequest request, Object command, BindException errors) - throws Exception { + throws Exception { onBindAndValidate(request, command, errors, getCurrentPage(request)); } @@ -248,7 +248,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle * @see org.springframework.validation.Errors */ protected void onBindAndValidate(HttpServletRequest request, Object command, BindException errors, int page) - throws Exception { + throws Exception { } /** @@ -266,7 +266,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle */ @Override protected final Map referenceData(HttpServletRequest request, Object command, Errors errors) - throws Exception { + throws Exception { return referenceData(request, command, errors, getCurrentPage(request)); } @@ -286,7 +286,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle * @see ModelAndView */ protected Map referenceData(HttpServletRequest request, Object command, Errors errors, int page) - throws Exception { + throws Exception { return referenceData(request, page); } @@ -315,7 +315,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle @Override protected ModelAndView showForm( HttpServletRequest request, HttpServletResponse response, BindException errors) - throws Exception { + throws Exception { return showPage(request, errors, getInitialPage(request, errors.getTarget())); } @@ -331,7 +331,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle * @throws Exception in case of invalid state or arguments */ protected final ModelAndView showPage(HttpServletRequest request, BindException errors, int page) - throws Exception { + throws Exception { if (page >= 0 && page < getPageCount(request, errors.getTarget())) { if (logger.isDebugEnabled()) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java index 47f3df7c866..74587e1ecd7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java @@ -434,7 +434,7 @@ public abstract class BaseCommandController extends AbstractController { * @see #initBinder */ protected ServletRequestDataBinder createBinder(HttpServletRequest request, Object command) - throws Exception { + throws Exception { ServletRequestDataBinder binder = new ServletRequestDataBinder(command, getCommandName()); prepareBinder(binder); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index f78fa50f7bd..f7aef89a17d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -138,7 +138,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) - throws ServletException { + throws ServletException { String lookupPath = this.urlPathHelper.getLookupPathForRequest(request); if (logger.isDebugEnabled()) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index 29859d39b95..5ed48aee952 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -500,7 +500,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator * @return the HttpInputMessage instance to use * @throws Exception in case of errors */ - protected HttpInputMessage createHttpInputMessage(HttpServletRequest servletRequest) throws Exception { + protected HttpInputMessage createHttpInputMessage(HttpServletRequest servletRequest) throws Exception { return new ServletServerHttpRequest(servletRequest); } @@ -512,7 +512,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator * @return the HttpInputMessage instance to use * @throws Exception in case of errors */ - protected HttpOutputMessage createHttpOutputMessage(HttpServletResponse servletResponse) throws Exception { + protected HttpOutputMessage createHttpOutputMessage(HttpServletResponse servletResponse) throws Exception { return new ServletServerHttpResponse(servletResponse); } @@ -803,7 +803,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator return AnnotationMethodHandlerAdapter.this.createHttpInputMessage(servletRequest); } - @Override + @Override protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception { HttpServletResponse servletResponse = (HttpServletResponse) webRequest.getNativeResponse(); return AnnotationMethodHandlerAdapter.this.createHttpOutputMessage(servletResponse); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java index 7e37632960b..ccdf7d3703e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java @@ -82,8 +82,8 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe * {@link #writeWithMessageConverters(Object, MethodParameter, ServletServerHttpRequest, ServletServerHttpResponse)} */ protected void writeWithMessageConverters(T returnValue, - MethodParameter returnType, - NativeWebRequest webRequest) + MethodParameter returnType, + NativeWebRequest webRequest) throws IOException, HttpMediaTypeNotAcceptableException { ServletServerHttpRequest inputMessage = createInputMessage(webRequest); ServletServerHttpResponse outputMessage = createOutputMessage(webRequest); @@ -103,9 +103,9 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe */ @SuppressWarnings("unchecked") protected void writeWithMessageConverters(T returnValue, - MethodParameter returnType, - ServletServerHttpRequest inputMessage, - ServletServerHttpResponse outputMessage) + MethodParameter returnType, + ServletServerHttpRequest inputMessage, + ServletServerHttpResponse outputMessage) throws IOException, HttpMediaTypeNotAcceptableException { Class returnValueClass = returnValue.getClass(); @@ -173,11 +173,11 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe } else if (!allSupportedMediaTypes.isEmpty()) { List result = new ArrayList(); - for (HttpMessageConverter converter : messageConverters) { - if (converter.canWrite(returnValueClass, null)) { - result.addAll(converter.getSupportedMediaTypes()); - } - } + for (HttpMessageConverter converter : messageConverters) { + if (converter.canWrite(returnValueClass, null)) { + result.addAll(converter.getSupportedMediaTypes()); + } + } return result; } else { @@ -199,4 +199,4 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe return MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceType) <= 0 ? acceptType : produceType; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java index 87be6bcedbc..1ddd0064cc4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java @@ -55,7 +55,7 @@ public abstract class RequestContextUtils { * @throws IllegalStateException if no servlet-specific context has been found */ public static WebApplicationContext getWebApplicationContext(ServletRequest request) - throws IllegalStateException { + throws IllegalStateException { return getWebApplicationContext(request, null); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java index 22a3971cb9f..a99d7e38a31 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java @@ -117,14 +117,14 @@ public class ButtonTag extends AbstractHtmlElementTag { tagWriter.writeAttribute("value", processFieldValue(getName(), valueToUse, getType())); } - /** - * Return the default value. - * - * @return The default value if none supplied. - */ - protected String getDefaultValue() { - return "Submit"; - } + /** + * Return the default value. + * + * @return The default value if none supplied. + */ + protected String getDefaultValue() { + return "Submit"; + } /** * Get the value of the 'type' attribute. Subclasses diff --git a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java index 3591eaca447..113f3d4910a 100644 --- a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java +++ b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java @@ -31,69 +31,69 @@ import org.springframework.util.Assert; */ public abstract class FreePortScanner { - private static final int MIN_SAFE_PORT = 1024; + private static final int MIN_SAFE_PORT = 1024; - private static final int MAX_PORT = 65535; + private static final int MAX_PORT = 65535; - private static final Random random = new Random(); + private static final Random random = new Random(); - /** - * Returns the number of a free port in the default range. - */ - public static int getFreePort() { - return getFreePort(MIN_SAFE_PORT, MAX_PORT); - } + /** + * Returns the number of a free port in the default range. + */ + public static int getFreePort() { + return getFreePort(MIN_SAFE_PORT, MAX_PORT); + } - /** - * Returns the number of a free port in the given range. - */ - public static int getFreePort(int minPort, int maxPort) { - Assert.isTrue(minPort > 0, "'minPort' must be larger than 0"); - Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort"); - int portRange = maxPort - minPort; - int candidatePort; - int searchCounter = 0; - do { - if (++searchCounter > portRange) { - throw new IllegalStateException( - String.format("There were no ports available in the range %d to %d", minPort, maxPort)); - } - candidatePort = getRandomPort(minPort, portRange); - } - while (!isPortAvailable(candidatePort)); + /** + * Returns the number of a free port in the given range. + */ + public static int getFreePort(int minPort, int maxPort) { + Assert.isTrue(minPort > 0, "'minPort' must be larger than 0"); + Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort"); + int portRange = maxPort - minPort; + int candidatePort; + int searchCounter = 0; + do { + if (++searchCounter > portRange) { + throw new IllegalStateException( + String.format("There were no ports available in the range %d to %d", minPort, maxPort)); + } + candidatePort = getRandomPort(minPort, portRange); + } + while (!isPortAvailable(candidatePort)); - return candidatePort; - } + return candidatePort; + } - private static int getRandomPort(int minPort, int portRange) { - return minPort + random.nextInt(portRange); - } + private static int getRandomPort(int minPort, int portRange) { + return minPort + random.nextInt(portRange); + } - private static boolean isPortAvailable(int port) { - ServerSocket serverSocket; - try { - serverSocket = new ServerSocket(); - } - catch (IOException ex) { - throw new IllegalStateException("Unable to create ServerSocket.", ex); - } + private static boolean isPortAvailable(int port) { + ServerSocket serverSocket; + try { + serverSocket = new ServerSocket(); + } + catch (IOException ex) { + throw new IllegalStateException("Unable to create ServerSocket.", ex); + } - try { - InetSocketAddress sa = new InetSocketAddress(port); - serverSocket.bind(sa); - return true; - } - catch (IOException ex) { - return false; - } - finally { - try { - serverSocket.close(); - } - catch (IOException ex) { - // ignore - } - } - } + try { + InetSocketAddress sa = new InetSocketAddress(port); + serverSocket.bind(sa); + return true; + } + catch (IOException ex) { + return false; + } + finally { + try { + serverSocket.close(); + } + catch (IOException ex) { + // ignore + } + } + } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java index 6901b889106..cae15040058 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java @@ -152,8 +152,8 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { pvs = new MutablePropertyValues(); pvs.add("order", "1"); pvs.add("exceptionMappings", - "java.lang.IllegalAccessException=failed2\n" + - "ServletRequestBindingException=failed3"); + "java.lang.IllegalAccessException=failed2\n" + + "ServletRequestBindingException=failed3"); pvs.add("defaultErrorView", "failed0"); registerSingleton("exceptionResolver1", SimpleMappingExceptionResolver.class, pvs); @@ -250,7 +250,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) - throws ServletException, IllegalAccessException { + throws ServletException, IllegalAccessException { ((MyHandler) delegate).doSomething(request); return null; } @@ -268,7 +268,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) - throws IOException, ServletException { + throws IOException, ServletException { throw new ServletException("dummy"); } @@ -281,7 +281,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor1 implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) - throws ServletException { + throws ServletException { if (request.getAttribute("test2") != null) { throw new ServletException("Wrong interceptor order"); } @@ -317,7 +317,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor2 implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) - throws ServletException { + throws ServletException { if (request.getAttribute("test1x") == null) { throw new ServletException("Wrong interceptor order"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java index 0df717c1b06..1d48f052d56 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java @@ -405,21 +405,21 @@ public class WizardFormControllerTests extends TestCase { errors.rejectValue("age", "AGE_REQUIRED", null, "Age is required"); } break; - default: + default: throw new IllegalArgumentException("Invalid page number"); } } protected ModelAndView processFinish( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) - throws ServletException, IOException { + throws ServletException, IOException { assertTrue(getCurrentPage(request) == 0 || getCurrentPage(request) == 1); return new ModelAndView("success", getCommandName(), command); } protected ModelAndView processCancel( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) - throws ServletException, IOException { + throws ServletException, IOException { assertTrue(getCurrentPage(request) == 0 || getCurrentPage(request) == 1); return new ModelAndView("cancel", getCommandName(), command); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java index e7aa5e97bc5..f9c1b200c24 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java @@ -183,7 +183,7 @@ public class Spr7839Tests { public static class JavaBean { - private NestedBean nested; + private NestedBean nested; public NestedBean getNested() { return nested; @@ -198,25 +198,25 @@ public class Spr7839Tests { public static class NestedBean { - private String foo; + private String foo; - private List list; + private List list; - private List> listOfLists; + private List> listOfLists; - private List[] arrayOfLists; + private List[] arrayOfLists; - private Map map; + private Map map; - private Map> mapOfLists; + private Map> mapOfLists; - public NestedBean() { + public NestedBean() { - } + } - public NestedBean(String foo) { - this.foo = foo; - } + public NestedBean(String foo) { + this.foo = foo; + } public String getFoo() { return foo; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index 2513f86e21e..315bfec3fc5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -107,8 +107,8 @@ public class RequestPartIntegrationTests { converter.setPartConverters(Arrays.>asList( new ResourceHttpMessageConverter(), new MappingJacksonHttpMessageConverter())); - restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory()); - restTemplate.setMessageConverters(Arrays.>asList(converter)); + restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory()); + restTemplate.setMessageConverters(Arrays.>asList(converter)); } @AfterClass @@ -174,10 +174,10 @@ public class RequestPartIntegrationTests { @RequestMapping(value = "/test", method = RequestMethod.POST, consumes = { "multipart/mixed", "multipart/form-data" }) public ResponseEntity create(@RequestPart("json-data") TestData testData, @RequestPart("file-data") MultipartFile file) { - String url = "http://localhost:8080/test/" + testData.getName() + "/" + file.getOriginalFilename(); - HttpHeaders headers = new HttpHeaders(); + String url = "http://localhost:8080/test/" + testData.getName() + "/" + file.getOriginalFilename(); + HttpHeaders headers = new HttpHeaders(); headers.setLocation(URI.create(url)); - return new ResponseEntity(headers, HttpStatus.CREATED); + return new ResponseEntity(headers, HttpStatus.CREATED); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java index d29bdf01ab9..96cca6d8699 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java @@ -87,7 +87,7 @@ public class DispatcherServletInitializerTests { @Override public ServletRegistration.Dynamic addServlet(String servletName, - Servlet servlet) { + Servlet servlet) { servlets.put(servletName, servlet); MockServletRegistration registration = new MockServletRegistration(); registrations.put(servletName, registration); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java index 9840933209a..d1cd12d8b48 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java @@ -368,7 +368,7 @@ public class MappingJackson2JsonViewTests { } @Override - public JsonSerializer createSerializer(SerializerProvider prov, JavaType type, BeanProperty property) throws JsonMappingException { + public JsonSerializer createSerializer(SerializerProvider prov, JavaType type, BeanProperty property) throws JsonMappingException { if (type.getRawClass() == TestBeanSimple.class) { return new TestBeanSimpleSerializer(); }