diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java b/spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java index e456224efb8..aa52feefa88 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -25,4 +25,4 @@ public class ClassWithConstructor { public void method() { } -} \ No newline at end of file +} diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java index 6847a2d63a8..06f54994b53 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -216,7 +216,7 @@ public class ProxyFactoryTests { TimeStamped ts = (TimeStamped) factory.getProxy(); assertTrue(ts.getTimeStamp() == t); // Shouldn't fail; - ((IOther) ts).absquatulate(); + ((IOther) ts).absquatulate(); } @Test diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java b/spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java index 854240e17df..58efd997c5e 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -28,20 +28,20 @@ import org.springframework.cache.interceptor.KeyGenerator; */ public class SomeCustomKeyGenerator implements KeyGenerator { - @Override - public Object generate(Object target, Method method, Object... params) { - return generateKey(method.getName(), params); - } + @Override + public Object generate(Object target, Method method, Object... params) { + return generateKey(method.getName(), params); + } - /** - * @see #generate(Object, java.lang.reflect.Method, Object...) - */ - static Object generateKey(String methodName, Object... params) { - final StringBuilder sb = new StringBuilder(methodName); - for (Object param : params) { - sb.append(param); - } - return sb.toString(); - } + /** + * @see #generate(Object, java.lang.reflect.Method, Object...) + */ + static Object generateKey(String methodName, Object... params) { + final StringBuilder sb = new StringBuilder(methodName); + for (Object param : params) { + sb.append(param); + } + return sb.toString(); + } } diff --git a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java index 1d7d1af4a0b..e119458cd66 100644 --- a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java +++ b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -295,7 +295,7 @@ public class AnnotationAsyncExecutionAspectTests { @Async public void failWithVoid() { - throw new UnsupportedOperationException("failWithVoid"); + throw new UnsupportedOperationException("failWithVoid"); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java index 22cf6675666..4a657400c25 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -52,4 +52,4 @@ public abstract class AbstractPropertyValuesTests { assertTrue("Map size is 0", m.size() == 0); } -} \ No newline at end of file +} 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 ce421c5a746..21c49293af7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -444,9 +444,9 @@ public class BeanUtilsTests { value = aValue; } } - + private static class BeanWithSingleNonDefaultConstructor { - + private final String name; public BeanWithSingleNonDefaultConstructor(String name) { diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 3260b0bf84a..ae56737a86d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -644,25 +644,25 @@ public class BeanWrapperGenericsTests { public interface ObjectWithId> { - T getId(); + T getId(); - void setId(T aId); + void setId(T aId); } public class Promotion implements ObjectWithId { - private Long id; + private Long id; - @Override - public Long getId() { - return id; - } + @Override + public Long getId() { + return id; + } - @Override - public void setId(Long aId) { - this.id = aId; - } + @Override + public void setId(Long aId) { + this.id = aId; + } } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java index 8a0a02028f8..f5becb6cc2a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -65,4 +65,4 @@ public class CountingFactory implements FactoryBean { return true; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java index a0d4f722e15..83a54e4bf82 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,4 +64,4 @@ public class DummyReferencer { return testBean2; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java index 231ca93a3db..1ff3456cf4e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -165,4 +165,4 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial } } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java b/spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java index c9733f61d3f..9e0e5af062f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2018 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. @@ -22,4 +22,4 @@ package org.springframework.beans.support; */ public class DerivedFromProtectedBaseBean extends ProtectedBaseBean { -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java b/spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java index 7601cfd833d..7748b29d957 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2018 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. @@ -32,4 +32,4 @@ class ProtectedBaseBean { return someProperty; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java index 92484b7d1aa..0b15573b040 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -43,4 +43,4 @@ public class BooleanTestBean { this.bool2 = bool2; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java index 2ded8f9bae1..01dc3b8540a 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2018 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. @@ -28,4 +28,4 @@ public enum CustomEnum { return "CustomEnum: " + name(); } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java index 28300e7438d..42743d59995 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -182,4 +182,4 @@ public class DummyFactory } } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java index b7465b1bfa1..305a936f123 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 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. @@ -22,4 +22,4 @@ package org.springframework.tests.sample.beans; */ public class GenericIntegerBean extends GenericBean { -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java index 3c332a5046b..13fb8971556 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,4 +23,4 @@ import java.util.Set; */ public class GenericSetOfIntegerBean extends GenericBean> { -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java index 58c4b9d502d..63551fe970e 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -20,4 +20,4 @@ public interface INestedTestBean { public String getCompany(); -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java index 694f32d2759..aea22b6b9d7 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -21,4 +21,4 @@ public interface IOther { void absquatulate(); -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java index cc234cc1638..2bcd01de8d8 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -142,4 +142,4 @@ public class IndexedTestBean { this.sortedMap = sortedMap; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java index 1a81d10340a..99863ee31a2 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -167,4 +167,4 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java index 9b4a07c87a6..92ca0347a1b 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -61,4 +61,4 @@ public class NestedTestBean implements INestedTestBean { return "NestedTestBean: " + this.company; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java index 489c9335091..5e14f69f0b5 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -140,4 +140,4 @@ public class NumberTestBean { this.bigDecimal = bigDecimal; } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java index fa2cb3dc1ed..f7bcd0ae57a 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -183,4 +183,4 @@ public class DummyFactory } } -} \ No newline at end of file +} diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java index 0cbf1db3876..6d2cd95012e 100644 --- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java +++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -19,4 +19,4 @@ * * @author Stephane Nicoll */ -package org.springframework.context.index.sample.jpa; \ No newline at end of file +package org.springframework.context.index.sample.jpa; diff --git a/spring-context/src/test/java/example/profilescan/DevComponent.java b/spring-context/src/test/java/example/profilescan/DevComponent.java index ab92554e157..c12f145e8f8 100644 --- a/spring-context/src/test/java/example/profilescan/DevComponent.java +++ b/spring-context/src/test/java/example/profilescan/DevComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -34,4 +34,4 @@ public @interface DevComponent { String value() default ""; -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/example/scannable_scoped/MyScope.java b/spring-context/src/test/java/example/scannable_scoped/MyScope.java index 512740b90b4..653557a920e 100644 --- a/spring-context/src/test/java/example/scannable_scoped/MyScope.java +++ b/spring-context/src/test/java/example/scannable_scoped/MyScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2018 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. @@ -22,4 +22,4 @@ import org.springframework.context.annotation.ScopedProxyMode; public @interface MyScope { String value() default BeanDefinition.SCOPE_SINGLETON; ScopedProxyMode proxyMode() default ScopedProxyMode.DEFAULT; -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index c1c68d53357..7e844c9bc71 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -77,24 +77,24 @@ public class AspectAndAdvicePrecedenceTests { private static final String[] EXPECTED = { // this order confirmed by running the same aspects (minus the Spring AOP advisors) // through AspectJ... - "beforeAdviceOne(highPrecedenceAspect)", // 1 - "beforeAdviceTwo(highPrecedenceAspect)", // 2 - "aroundAdviceOne(highPrecedenceAspect)", // 3, before proceed - "aroundAdviceTwo(highPrecedenceAspect)", // 4, before proceed - "beforeAdviceOne(highPrecedenceSpringAdvice)", // 5 - "beforeAdviceOne(lowPrecedenceSpringAdvice)", // 6 - "beforeAdviceOne(lowPrecedenceAspect)", // 7 - "beforeAdviceTwo(lowPrecedenceAspect)", // 8 - "aroundAdviceOne(lowPrecedenceAspect)", // 9, before proceed - "aroundAdviceTwo(lowPrecedenceAspect)", // 10, before proceed - "aroundAdviceTwo(lowPrecedenceAspect)", // 11, after proceed - "aroundAdviceOne(lowPrecedenceAspect)", // 12, after proceed - "afterAdviceOne(lowPrecedenceAspect)", // 13 - "afterAdviceTwo(lowPrecedenceAspect)", // 14 - "aroundAdviceTwo(highPrecedenceAspect)", // 15, after proceed - "aroundAdviceOne(highPrecedenceAspect)", // 16, after proceed - "afterAdviceOne(highPrecedenceAspect)", // 17 - "afterAdviceTwo(highPrecedenceAspect)" // 18 + "beforeAdviceOne(highPrecedenceAspect)", // 1 + "beforeAdviceTwo(highPrecedenceAspect)", // 2 + "aroundAdviceOne(highPrecedenceAspect)", // 3, before proceed + "aroundAdviceTwo(highPrecedenceAspect)", // 4, before proceed + "beforeAdviceOne(highPrecedenceSpringAdvice)", // 5 + "beforeAdviceOne(lowPrecedenceSpringAdvice)", // 6 + "beforeAdviceOne(lowPrecedenceAspect)", // 7 + "beforeAdviceTwo(lowPrecedenceAspect)", // 8 + "aroundAdviceOne(lowPrecedenceAspect)", // 9, before proceed + "aroundAdviceTwo(lowPrecedenceAspect)", // 10, before proceed + "aroundAdviceTwo(lowPrecedenceAspect)", // 11, after proceed + "aroundAdviceOne(lowPrecedenceAspect)", // 12, after proceed + "afterAdviceOne(lowPrecedenceAspect)", // 13 + "afterAdviceTwo(lowPrecedenceAspect)", // 14 + "aroundAdviceTwo(highPrecedenceAspect)", // 15, after proceed + "aroundAdviceOne(highPrecedenceAspect)", // 16, after proceed + "afterAdviceOne(highPrecedenceAspect)", // 17 + "afterAdviceTwo(highPrecedenceAspect)" // 18 }; private int adviceInvocationNumber = 0; diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java index 457110bb28b..57b1794044c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -74,4 +74,4 @@ class CallCountingInterceptor implements MethodInterceptor { public void reset() { this.count = 0; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java index 43373cd42e0..b214670c5f3 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -91,4 +91,4 @@ class NonAnnotatedMakeLockable { } } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java index b16f844df93..79e131e6263 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -148,4 +148,4 @@ class JoinPointMonitorAtAspectJAspect { this.counter = counter; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java index b1107b19e8d..aba88f9b2ba 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -95,4 +95,4 @@ class SubtypeMatchingTestClassC implements Bar { @Override public void bar(Object o) {} -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index d19d3c66dd5..7e48352cfe5 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -119,4 +119,4 @@ class TestImpl implements TestInterface { @Override public void doIt() { } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index 08ff456fb26..002bc42b664 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -99,4 +99,4 @@ class ResourceArrayFactoryBean implements FactoryBean { return true; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java index 4d4137fd1be..9e8752c8a61 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java +++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,4 +31,4 @@ public class AnnotationDrivenCacheConfigTests extends AbstractCacheAnnotationTes "/org/springframework/cache/config/annotationDrivenCacheConfig.xml"); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java b/spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java index 30c1c534664..24d372c8670 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java +++ b/spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -28,19 +28,19 @@ import org.springframework.cache.interceptor.KeyGenerator; */ public class SomeCustomKeyGenerator implements KeyGenerator { - @Override - public Object generate(Object target, Method method, Object... params) { - return generateKey(method.getName(), params); - } + @Override + public Object generate(Object target, Method method, Object... params) { + return generateKey(method.getName(), params); + } - /** - * @see #generate(Object, java.lang.reflect.Method, Object...) - */ - static Object generateKey(String methodName, Object... params) { - final StringBuilder sb = new StringBuilder(methodName); - for (Object param : params) { - sb.append(param); - } - return sb.toString(); - } + /** + * @see #generate(Object, java.lang.reflect.Method, Object...) + */ + static Object generateKey(String methodName, Object... params) { + final StringBuilder sb = new StringBuilder(methodName); + for (Object param : params) { + sb.append(param); + } + return sb.toString(); + } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java index 143ce5ffa45..9ed85bc8e38 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 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. @@ -27,4 +27,4 @@ public class DoubleScanTests extends SimpleScanTests { return new String[] {"doubleScanTests.xml"}; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java index 37a9fa05166..45abc4afbac 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java @@ -394,7 +394,7 @@ public class ImportSelectorTests { public Iterable selectImports() { LinkedList content = new LinkedList<>(); TestImportGroup.imports.forEach((metadata, values) -> - values.forEach(value -> content.add(new Entry(metadata, value)))); + values.forEach(value -> content.add(new Entry(metadata, value)))); Collections.reverse(content); return content; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java index 9c0684b4a11..0edd5f1b1e4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ public class Spr16217Tests { @Ignore("TODO") public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInRegisterBeanPhase() { try (AnnotationConfigApplicationContext context = - new AnnotationConfigApplicationContext(RegisterBeanPhaseImportingConfiguration.class)) { + new AnnotationConfigApplicationContext(RegisterBeanPhaseImportingConfiguration.class)) { context.getBean("someBean"); } } @@ -39,7 +39,7 @@ public class Spr16217Tests { @Test public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInParseConfigurationPhase() { try (AnnotationConfigApplicationContext context = - new AnnotationConfigApplicationContext(ParseConfigurationPhaseImportingConfiguration.class)) { + new AnnotationConfigApplicationContext(ParseConfigurationPhaseImportingConfiguration.class)) { context.getBean("someBean"); } } @@ -58,7 +58,7 @@ public class Spr16217Tests { } } - + public static class RegisterBeanPhaseCondition implements ConfigurationCondition { @Override @@ -72,7 +72,7 @@ public class Spr16217Tests { } } - + public static class ParseConfigurationPhaseCondition implements ConfigurationCondition { @Override @@ -91,7 +91,7 @@ public class Spr16217Tests { public static class RegisterBeanPhaseImportingConfiguration { } - + @Import({ParseConfigurationPhaseConditionConfiguration.class, BarConfiguration.class}) public static class ParseConfigurationPhaseImportingConfiguration { } @@ -101,7 +101,7 @@ public class Spr16217Tests { public static class UnconditionalImportingConfiguration { } - + public static class BaseConfiguration { @Bean diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java index 807843ef91b..24ef5bc4b30 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -28,4 +28,4 @@ public class Level1Config { public TestBean level1Bean() { return new TestBean("level1Bean"); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java index e83c165715e..b2057c8583f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2018 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. @@ -40,4 +40,4 @@ public abstract class BaseConfig { public Bar workaroundBar() { return protectedBar(); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java index 4d209d01ed0..10e3dbe849a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -25,4 +25,4 @@ import org.springframework.stereotype.Component; @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Description("A Component with a role") public class ComponentWithRole { -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java index 860a3b35faf..cb115ed1a3c 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2018 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. @@ -20,4 +20,4 @@ import org.springframework.stereotype.Component; @Component("componentWithoutRole") public class ComponentWithoutRole { -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java b/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java index 9a61353ce7f..74896dd644b 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -127,4 +127,4 @@ public class FactoryBeanAccessTests { } } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java b/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java index 2b28b5167ab..945c9e69b0a 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -95,4 +95,4 @@ public class MapAccessorTests { return map2; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java index 8f8466841ec..a9bba5006cc 100644 --- a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -117,4 +117,4 @@ public class LiveBeansViewTests { return ManagementFactory.getPlatformMBeanServer().queryNames(new ObjectName(objectName), null); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java index d125446d734..06ff7286674 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -125,7 +125,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { ObjectNameManager.getInstance(OBJECT_NAME)); } finally { - exporter.destroy(); + exporter.destroy(); } } @@ -148,7 +148,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { assertFalse("Assembler should not have been invoked", asm.invoked); } finally { - exporter.destroy(); + exporter.destroy(); } } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java index 5c123d11834..54226d085f2 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java @@ -1,5 +1,6 @@ package org.springframework.scripting.groovy; public interface TestService { - public String sayHello(); + + public String sayHello(); } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java index ed90507212d..9e771dde0de 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java @@ -2,8 +2,9 @@ package org.springframework.scripting.groovy; @Log public class TestServiceImpl implements TestService{ - @Override - public String sayHello() { - throw new TestException("TestServiceImpl"); - } + + @Override + public String sayHello() { + throw new TestException("TestServiceImpl"); + } } diff --git a/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java b/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java index 118feabbc33..14dcd503054 100644 --- a/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java +++ b/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2018 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. @@ -49,4 +49,4 @@ public class TestMethodInvokingTask { } } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java index 4448962d49c..cd5d60a5816 100644 --- a/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java +++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2018 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. @@ -32,4 +32,4 @@ public class BeanWithObjectProperty { this.object = object; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java index 700b0af7002..c2a6972be29 100644 --- a/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java +++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -40,4 +40,4 @@ public class FieldAccessBean { return spouse; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java index b6ff21f547a..82e27599fb5 100644 --- a/spring-context/src/test/java/test/aspect/PerTargetAspect.java +++ b/spring-context/src/test/java/test/aspect/PerTargetAspect.java @@ -47,4 +47,4 @@ public class PerTargetAspect implements Ordered { public void setOrder(int order) { this.order = order; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java index 2e84161be94..2cb159fc123 100644 --- a/spring-context/src/test/java/test/mixin/DefaultLockable.java +++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ - package test.mixin; +package test.mixin; /** diff --git a/spring-context/src/test/java/test/mixin/Lockable.java b/spring-context/src/test/java/test/mixin/Lockable.java index a5f6d111464..4836fd101ab 100644 --- a/spring-context/src/test/java/test/mixin/Lockable.java +++ b/spring-context/src/test/java/test/mixin/Lockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -30,4 +30,4 @@ public interface Lockable { void unlock(); boolean locked(); -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index fc051943120..ddb84f1de86 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -431,7 +431,7 @@ public class ResolvableTypeTests { interfaces.add(interfaceType.toString()); } assertThat(interfaces.toString(), equalTo( - "[" + "[" + "java.io.Serializable, " + "java.lang.Cloneable, " + "java.util.List, " diff --git a/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java b/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java index 4b58e828020..77902ae5f84 100644 --- a/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java +++ b/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,21 +31,21 @@ import static org.hamcrest.MatcherAssert.*; * @author Rob Winch */ public class StandardReflectionParameterNameDiscoverTests { - private ParameterNameDiscoverer parameterNameDiscoverer; - - @Before - public void setup() { - parameterNameDiscoverer = new StandardReflectionParameterNameDiscoverer(); - } - - @Test - public void getParameterNamesOnInterface() { - Method method = ReflectionUtils.findMethod(MessageService.class,"sendMessage", String.class); - String[] actualParams = parameterNameDiscoverer.getParameterNames(method); - assertThat(actualParams, is(new String[]{"message"})); - } - - public interface MessageService { - void sendMessage(String message); - } + private ParameterNameDiscoverer parameterNameDiscoverer; + + @Before + public void setup() { + parameterNameDiscoverer = new StandardReflectionParameterNameDiscoverer(); + } + + @Test + public void getParameterNamesOnInterface() { + Method method = ReflectionUtils.findMethod(MessageService.class,"sendMessage", String.class); + String[] actualParams = parameterNameDiscoverer.getParameterNames(method); + assertThat(actualParams, is(new String[]{"message"})); + } + + public interface MessageService { + void sendMessage(String message); + } } diff --git a/spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java index 2635ea2dbca..3ad1c094acd 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -82,4 +82,4 @@ public class ByteArrayDecoderTests extends AbstractDataBufferAllocatingTestCase .verify(); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java index 10de7d40117..80c602e26a7 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java @@ -73,4 +73,4 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase { .verify(); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java index 7e601828070..565064f3f8b 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -74,4 +74,4 @@ public class ResourceEncoderTests extends AbstractDataBufferAllocatingTestCase { .verify(); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java index 9572a062369..a3fd34eb622 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java @@ -200,4 +200,4 @@ public class StreamConverterTests { public List rawList; } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java index 851e2aa59a5..c76e0937ec7 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java @@ -537,4 +537,4 @@ public class DataBufferTests extends AbstractDataBufferAllocatingTestCase { release(buffer); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java index 21e52d88580..028e7740f29 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java @@ -283,7 +283,7 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { assertReleased(bar); assertReleased(baz); } - + private static void assertReleased(DataBuffer dataBuffer) { if (dataBuffer instanceof NettyDataBuffer) { ByteBuf byteBuf = ((NettyDataBuffer) dataBuffer).getNativeBuffer(); diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java index 1acc24fa0e1..630d93551a6 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -70,4 +70,4 @@ public class PooledDataBufferTests { } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java index 1763f4bbce7..5f950f9544e 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -57,4 +57,4 @@ public class DataBufferTestUtilsTests extends AbstractDataBufferAllocatingTestCa release(buffer); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java index fee565e6b24..a70b0a202d0 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2018 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. @@ -79,4 +79,4 @@ public class StaxResultTests { assertThat("Invalid result", stringWriter.toString(), isSimilarTo(XML)); } -} \ No newline at end of file +} 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 ae62f21c919..e6281ed548b 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 @@ -143,7 +143,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests { @Test public void testXMLBasedConfig() { - evaluate("(T(java.lang.Math).random() * 100.0 )>0",true,Boolean.class); + evaluate("(T(java.lang.Math).random() * 100.0 )>0",true,Boolean.class); } // Section 7.5 @@ -394,7 +394,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests { StandardEvaluationContext societyContext = new StandardEvaluationContext(); societyContext.setRootObject(new IEEE()); Inventor einstein = - parser.parseExpression("new org.springframework.expression.spel.testresources.Inventor('Albert Einstein',new java.util.Date(), 'German')").getValue(Inventor.class); + parser.parseExpression("new org.springframework.expression.spel.testresources.Inventor('Albert Einstein',new java.util.Date(), 'German')").getValue(Inventor.class); assertEquals("Albert Einstein", einstein.getName()); //create new inventor instance within add method of List parser.parseExpression("Members2.add(new org.springframework.expression.spel.testresources.Inventor('Albert Einstein', 'German'))").getValue(societyContext); @@ -483,7 +483,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests { @Test public void testTemplating() throws Exception { String randomPhrase = - parser.parseExpression("random number is ${T(java.lang.Math).random()}", new TemplatedParserContext()).getValue(String.class); + parser.parseExpression("random number is ${T(java.lang.Math).random()}", new TemplatedParserContext()).getValue(String.class); assertTrue(randomPhrase.startsWith("random number")); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java b/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java index 13e13fec272..cd0e383ab93 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2018 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. @@ -35,4 +35,4 @@ public class PersonInOtherPackage { public void setAge(int age) { this.age = age; } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java index 8c90e667224..12ed58f99ce 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -41,4 +41,4 @@ public class ArrayContainer { booleans[0] = true; floats[0] = 42.0f; } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java index c497c2fad7c..d22526ee671 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java @@ -14,4 +14,4 @@ public class Company { public String getAddress() { return address; } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java index 68f6c6b15c9..8ea3816ee87 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java @@ -38,4 +38,4 @@ public class Fruit { public String toString() { return "A" + (colorName != null && colorName.startsWith("o") ? "n " : " ") + colorName + " " + name; } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java index 9126de04886..9487f87ce64 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java @@ -25,4 +25,4 @@ public class Person { public Company getCompany() { return company; } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java index c099c2d4e8c..78abc874b19 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java @@ -44,4 +44,4 @@ public class PlaceOfBirth { return city.hashCode(); } -} \ No newline at end of file +} diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java index f01e15f0984..78cb049e253 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java @@ -16,4 +16,4 @@ public class TestPerson { public void setAddress(TestAddress address) { this.address = address; } - } \ No newline at end of file + } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java index 11f9fdf3d1d..bce1b321793 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java @@ -257,7 +257,7 @@ public class NamedParameterUtilsTests { public void parseSqlStatementWithSingleLetterInBrackets() { String expectedSql = "select foo from bar where baz = b?z"; String sql = "select foo from bar where baz = b:{p}z"; - + ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); assertEquals(1, parsedSql.getParameterNames().size()); assertEquals("p", parsedSql.getParameterNames().get(0)); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java index 8526644e12f..9f79289d99c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,4 +54,4 @@ public abstract class AbstractPerson { this.birth_date = birth_date; } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java index 98642343975..ed7239deae8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 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. @@ -34,4 +34,4 @@ public class ConcretePerson extends AbstractPerson { this.balance = balance; } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java index b8fd5c918ad..d6cf14f15db 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 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. @@ -32,4 +32,4 @@ public class ExtendedPerson extends ConcretePerson { this.someField = someField; } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java index 6b2ea627932..d494347e59c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,4 +64,4 @@ public class Person { this.balance = balanace; } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index 39eae5fb4af..c48302203ca 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -209,8 +209,8 @@ public class DataSourceTransactionManagerTests { } final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds); - tm = new DataSourceTransactionManager(dsToUse); - TransactionTemplate tt = new TransactionTemplate(tm); + tm = new DataSourceTransactionManager(dsToUse); + TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java index 71e7751df98..cb7ed3a9e5e 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -104,4 +104,4 @@ public class MarshallingMessageConverterTests { } } -} \ No newline at end of file +} diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java index a351e62656b..3af92e3b2e9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -100,4 +100,4 @@ public class DestinationVariableMethodArgumentResolverTests { String param3) { } -} \ No newline at end of file +} diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java index bb32f0ad41d..5afeae52140 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -136,4 +136,4 @@ public class SimpAttributesContextHolderTests { SimpAttributesContextHolder.currentAttributes(); } -} \ No newline at end of file +} diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java index 1d946c96dd4..041383a0e22 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -135,4 +135,4 @@ public class SimpAttributesTests { verify(callback1, times(1)).run(); } -} \ No newline at end of file +} diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java index 928180203f3..be1d41fc409 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -202,4 +202,4 @@ public class SimpMessagingTemplateTests { assertEquals("/queue/foo-user123", ((StompHeaderAccessor) sentAccessor).getDestination()); } -} \ No newline at end of file +} diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java index fa655104e27..4b0853cc50d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,7 +146,7 @@ public class BrokerMessageHandlerTests { @Override public void publishEvent(ApplicationEvent event) { - publishEvent((Object) event); + publishEvent((Object) event); } @Override diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java index 6c9d259e4c8..c93003403c0 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -229,4 +229,4 @@ public class NativeMessageHeaderAccessorTests { headerAccessor.setImmutable(); } -} \ No newline at end of file +} diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java index 747408fa9fb..9bc91492d5b 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -168,8 +168,8 @@ public abstract class AbstractMarshallerTests { assertThat("Marshaller writes invalid StreamResult", writer.toString(), isSimilarTo(EXPECTED_STRING)); } - private static CompareMatcher isSimilarTo(final Object content) { - return CompareMatcher.isSimilarTo(content) - .ignoreWhitespace(); - } + private static CompareMatcher isSimilarTo(final Object content) { + return CompareMatcher.isSimilarTo(content) + .ignoreWhitespace(); + } } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java index be52bd791c6..59a391442d5 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2018 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. @@ -42,4 +42,4 @@ public class CastorObject { public void setValue(Integer value) { this.value = value; } -} \ No newline at end of file +} diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java index 56f3970e398..f3bdc72fabf 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -29,4 +29,4 @@ public class XmlRegObjectFactory { public JAXBElement createAirplane(Airplane airplane) { return new JAXBElement<>(new QName("brand-airplane"), Airplane.class, null, airplane); } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java index 7eb452fcec5..656aac6e1b8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -36,4 +36,4 @@ interface ContextConfigurationTestInterface { } } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java index a707a4c2c0a..46d9c57550a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -29,4 +29,4 @@ import org.springframework.test.context.jdbc.SqlConfig; @DirtiesContext @SqlConfig(commentPrefix = "`", blockCommentStartDelimiter = "#$", blockCommentEndDelimiter = "$#", separator = "@@") interface SqlConfigTestInterface { -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java index dcfabd14cb8..dbdfc5d85f0 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -34,4 +34,4 @@ interface WebAppConfigurationTestInterface { /* no user beans required for these tests */ } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java index 58639280279..315e339bb04 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -36,4 +36,4 @@ class PersonController { return new Person("Wally"); } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java index b93f93036fb..a806e0b34df 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,4 +33,4 @@ class WebConfig { return new PersonController(); } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java index c60745d394a..057db58af72 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -229,4 +229,4 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa assertEquals("The bar method should have been wired via @Resource.", "Bar", this.bar); } -} \ No newline at end of file +} diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java index f5424607d56..a813d87ac2e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -29,4 +29,4 @@ public class DevProfileInitializer implements ApplicationContextInitializer(this.encoder); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java index 0b7f2987f3d..64b94b28d4f 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -59,7 +59,7 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll public void readServerSentEvents() { MockServerHttpRequest request = MockServerHttpRequest.post("/").body( "id:c42\nevent:foo\nretry:123\n:bla\n:bla bla\n:bla bla bla\ndata:bar\n\n" + - "id:c43\nevent:bar\nretry:456\ndata:baz\n\n"); + "id:c43\nevent:bar\nretry:456\ndata:baz\n\n"); Flux events = this.messageReader .read(ResolvableType.forClassWithGenerics(ServerSentEvent.class, String.class), diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java index 1117cc5fddf..6b0116ba6cb 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileDecoderTests.java @@ -66,7 +66,7 @@ public class Jackson2SmileDecoderTests extends AbstractDataBufferAllocatingTestC ObjectMapper mapper = Jackson2ObjectMapperBuilder.smile().build(); Pojo pojo = new Pojo("foo", "bar"); byte[] serializedPojo = mapper.writer().writeValueAsBytes(pojo); - + Flux source = Flux.just(this.bufferFactory.wrap(serializedPojo)); ResolvableType elementType = forClass(Pojo.class); Flux flux = decoder.decode(source, elementType, null, emptyMap()); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java index 8cffb6d05f0..58b32260cba 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java @@ -42,14 +42,14 @@ import static org.springframework.http.MediaType.APPLICATION_XML; /** * Unit tests for {@link Jackson2SmileEncoder}. - * + * * @author Sebastien Deleuze */ public class Jackson2SmileEncoderTests extends AbstractDataBufferAllocatingTestCase { private final static MimeType SMILE_MIME_TYPE = new MimeType("application", "x-jackson-smile"); private final static MimeType STREAM_SMILE_MIME_TYPE = new MimeType("application", "stream+x-jackson-smile"); - + private final Jackson2SmileEncoder encoder = new Jackson2SmileEncoder(); @@ -106,7 +106,7 @@ public class Jackson2SmileEncoderTests extends AbstractDataBufferAllocatingTestC .consumeNextWith(dataBuffer -> readPojo(mapper, Pojo.class, dataBuffer)) .verifyComplete(); } - + public T readPojo(ObjectMapper mapper, Class valueType, DataBuffer dataBuffer) { try { T value = mapper.reader().forType(valueType).readValue(DataBufferTestUtils.dumpBytes(dataBuffer)); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java index 4cced42690c..08dca79d2a6 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java @@ -228,4 +228,4 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase } } } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java index 3439bbb11d9..3498b0ea013 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -98,4 +98,4 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase { assertEquals(expectedData, event.asCharacters().getData()); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java index 274d3ba5efb..2aa6a891e3a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java @@ -165,4 +165,4 @@ public class ResourceRegionHttpMessageConverterTests { assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8), is("Spring")); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java index 7896e97dd5c..345cedc85c9 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -59,7 +59,7 @@ public class ProtobufHttpMessageConverterTests { @Test public void extensionRegistryInitialized() { - verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any()); + verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any()); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java index 2d2d38703ab..350e484ff3a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -57,7 +57,7 @@ public class ProtobufJsonFormatHttpMessageConverterTests { @Test public void extensionRegistryInitialized() { - verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any()); + verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any()); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index 7f2c6442ae3..11a731a63a6 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -271,4 +271,4 @@ public class Jaxb2CollectionHttpMessageConverterTests { } } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java index 83274aaab2d..5bc89fe63ba 100644 --- a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java @@ -95,14 +95,14 @@ public class ServletServerHttpRequestTests { @Test // SPR-13876 public void getUriWithEncoding() throws URISyntaxException { - URI uri = new URI("https://example.com/%E4%B8%AD%E6%96%87" + + URI uri = new URI("https://example.com/%E4%B8%AD%E6%96%87" + "?redirect=https%3A%2F%2Fgithub.com%2Fspring-projects%2Fspring-framework"); - mockRequest.setScheme(uri.getScheme()); - mockRequest.setServerName(uri.getHost()); - mockRequest.setServerPort(uri.getPort()); - mockRequest.setRequestURI(uri.getRawPath()); - mockRequest.setQueryString(uri.getRawQuery()); - assertEquals(uri, request.getURI()); + mockRequest.setScheme(uri.getScheme()); + mockRequest.setServerName(uri.getHost()); + mockRequest.setServerPort(uri.getPort()); + mockRequest.setRequestURI(uri.getRawPath()); + mockRequest.setQueryString(uri.getRawQuery()); + assertEquals(uri, request.getURI()); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java index 81260eb63f5..70dc487a696 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; /** * Unit tests for {@link AbstractListenerReadPublisher} - * + * * @author Violeta Georgieva * @since 5.0 */ diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java index 35bdf8e8e4c..050388decc4 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java @@ -85,4 +85,4 @@ public class ZeroCopyIntegrationTests extends AbstractHttpHandlerIntegrationTest } } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpRequest.java b/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpRequest.java index ed4e9b83119..9aa62d1010d 100644 --- a/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -567,4 +567,4 @@ public class MockServerHttpRequest extends AbstractServerHttpRequest { } } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java index c9cdfb39d8b..33f97100a79 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java @@ -94,7 +94,7 @@ public class MockAsyncContext implements AsyncContext { @Override public void dispatch() { dispatch(this.request.getRequestURI()); - } + } @Override public void dispatch(String path) { diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java index e885dec8961..ad4c61d9898 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -86,7 +86,7 @@ public class RestTemplateIntegrationTests extends AbstractMockWebServerTestCase @Before public void setupClient() { - this.template = new RestTemplate(this.clientHttpRequestFactory); + this.template = new RestTemplate(this.clientHttpRequestFactory); } diff --git a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java index 6efedf0c30d..727024af217 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -170,5 +170,5 @@ public class CharacterEncodingFilterTests { private String filteredName(String prefix) { return prefix + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX; } - + } diff --git a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java index 77589baf679..dcaa5446b7f 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java @@ -325,9 +325,9 @@ public class ForwardedHeaderFilterTests { HttpServletRequest actual = filterAndGetWrappedRequest(); assertEquals("http://localhost/prefix/mvc-showcase", actual.getRequestURL().toString()); } - + @Test - public void requestURLNewStringBuffer() throws Exception { + public void requestURLNewStringBuffer() throws Exception { this.request.addHeader(X_FORWARDED_PREFIX, "/prefix/"); this.request.setRequestURI("/mvc-showcase"); diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java index d97f291b326..92611976604 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.*; /** * Tests for {@link HiddenHttpMethodFilter}. - * + * * @author Arjen Poutsma * @author Brian Clozel */ @@ -79,4 +79,4 @@ public class HiddenHttpMethodFilterTests { this.filter.doFilter(request, response, filterChain); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java index bb9ceb089a3..5f5024d692c 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java @@ -135,4 +135,4 @@ public class ForwardedHeaderFilterTests { } } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java index d75a02c3130..b8852fa8f66 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -140,4 +140,4 @@ public class MockFacesContext extends FacesContext { public void responseComplete() { } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java index a9e9b97e482..393d9f7014f 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -48,4 +48,4 @@ public class MockLifecycle extends Lifecycle { public void render(FacesContext facesContext) throws FacesException { } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java index e1f9929a737..32796983ac4 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -103,8 +103,8 @@ public class CookieValueMethodArgumentResolverTests { public void params(@CookieValue("name") Cookie param1, - @CookieValue(name = "name", defaultValue = "bar") String param2, - String param3) { + @CookieValue(name = "name", defaultValue = "bar") String param2, + String param3) { } } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java index 5606eececf2..f2c3f92238d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -98,8 +98,7 @@ public class ExpressionValueMethodArgumentResolverTests { } public void params(@Value("#{systemProperties.systemProperty}") int param1, - @Value("#{request.contextPath}") String param2, - String notSupported) { + @Value("#{request.contextPath}") String param2, String notSupported) { } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java index 88d7521c6bb..faa50e9ff01 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -91,4 +91,4 @@ public class MapMethodProcessorTests { return null; } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java index ff58638f538..daae96520c3 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -92,4 +92,4 @@ public class ModelMethodProcessorTests { return null; } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 717dc58d2d2..8b8bddd3a29 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -135,9 +135,8 @@ public class RequestHeaderMapMethodArgumentResolverTests { public void params(@RequestHeader Map param1, - @RequestHeader MultiValueMap param2, - @RequestHeader HttpHeaders param3, - Map unsupported) { + @RequestHeader MultiValueMap param2, @RequestHeader HttpHeaders param3, + Map unsupported) { } } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java index 9390cc01e0d..e64b8534c2d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -116,4 +116,4 @@ public class SessionAttributesHandlerTests { private static class SessionAttributeHandler { } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java index 52f853887ad..b2d0a8b6bf8 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,4 +87,4 @@ public class HandlerMethodArgumentResolverCompositeTests { private void handle(Integer arg1, String arg2) { } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java index 295469c798e..ea1c315e25d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -128,4 +128,4 @@ public class HandlerMethodReturnValueHandlerCompositeTests { private static class Promise {} -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java index 66720bf8d11..e423c6d7a72 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -57,4 +57,4 @@ public class StubArgumentResolver implements HandlerMethodArgumentResolver { this.resolvedParameters.add(parameter); return this.stubValue; } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeTests.java index 40beb8ac6a2..4df671c7611 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeTests.java @@ -68,4 +68,4 @@ public class DefaultServerWebExchangeTests { new AcceptHeaderLocaleContextResolver()); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java b/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java index 8bdc6c1fcf7..d66c140c391 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java @@ -63,7 +63,7 @@ public class DefaultWebSessionManagerTests { @Mock private WebSession updateSession; - + @Before public void setUp() throws Exception { diff --git a/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java b/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java index f454209ce20..aac388493ce 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java @@ -131,4 +131,4 @@ public class InMemoryWebSessionStoreTests { assertNotNull(this.store.retrieveSession(session5.getId()).block()); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/util/ServletContextPropertyUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ServletContextPropertyUtilsTests.java index 6a17f33f64d..711f504f588 100644 --- a/spring-web/src/test/java/org/springframework/web/util/ServletContextPropertyUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/ServletContextPropertyUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -26,25 +26,24 @@ import static org.junit.Assert.*; */ public class ServletContextPropertyUtilsTests { - @Test - public void resolveAsServletContextInitParameter() { - MockServletContext servletContext = new MockServletContext(); - servletContext.setInitParameter("test.prop", "bar"); - String resolved = ServletContextPropertyUtils.resolvePlaceholders("${test.prop:foo}", servletContext); - assertEquals("bar", resolved); - } + @Test + public void resolveAsServletContextInitParameter() { + MockServletContext servletContext = new MockServletContext(); + servletContext.setInitParameter("test.prop", "bar"); + String resolved = ServletContextPropertyUtils.resolvePlaceholders("${test.prop:foo}", servletContext); + assertEquals("bar", resolved); + } - @Test - public void fallbackToSystemProperties() { - MockServletContext servletContext = new MockServletContext(); - System.setProperty("test.prop", "bar"); - try { - String resolved = ServletContextPropertyUtils.resolvePlaceholders("${test.prop:foo}", servletContext); - assertEquals("bar", resolved); - } + @Test + public void fallbackToSystemProperties() { + MockServletContext servletContext = new MockServletContext(); + System.setProperty("test.prop", "bar"); + try { + String resolved = ServletContextPropertyUtils.resolvePlaceholders("${test.prop:foo}", servletContext); + assertEquals("bar", resolved); + } finally { - System.clearProperty("test.prop"); - } - } - + System.clearProperty("test.prop"); + } + } } diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java index 9c75abf656e..77494286122 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -443,4 +443,4 @@ public class UrlPathHelperTests { assertNull(this.helper.getOriginatingQueryString(request)); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java index 9f611963b1e..203c52cf1f5 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -475,7 +475,7 @@ public class PathPatternParserTests { } private PathPattern.PathMatchInfo matchAndExtract(PathPattern pp, String path) { - return pp.matchAndExtract(PathPatternTests.toPathContainer(path)); + return pp.matchAndExtract(PathPatternTests.toPathContainer(path)); } private PathContainer toPSC(String path) { diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java index a2c3b86f807..012d28fc31a 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -95,7 +95,7 @@ public class PathPatternTests { private void assertNoMatch(PathPattern pp, String path) { assertFalse(pp.matches(toPathContainer(path))); } - + @Test public void optionalTrailingSeparators() { PathPattern pp; @@ -134,7 +134,7 @@ public class PathPatternTests { assertMatches(pp,"/resource/"); assertEquals("resource",pp.matchAndExtract(toPathContainer("/resource/")).getUriVariables().get("var")); assertNoMatch(pp,"/resource//"); - + // CaptureTheRestPathElement pp = parse("/{*var}"); assertMatches(pp,"/resource"); @@ -145,14 +145,14 @@ public class PathPatternTests { assertEquals("/resource//",pp.matchAndExtract(toPathContainer("/resource//")).getUriVariables().get("var")); assertMatches(pp,"//resource//"); assertEquals("//resource//",pp.matchAndExtract(toPathContainer("//resource//")).getUriVariables().get("var")); - + // WildcardTheRestPathElement pp = parse("/**"); assertMatches(pp,"/resource"); assertMatches(pp,"/resource/"); assertMatches(pp,"/resource//"); assertMatches(pp,"//resource//"); - + // WildcardPathElement pp = parse("/*"); assertMatches(pp,"/resource"); @@ -218,7 +218,7 @@ public class PathPatternTests { assertMatches(pp,"/resource/"); assertEquals("resource",pp.matchAndExtract(toPathContainer("/resource/")).getUriVariables().get("var")); assertNoMatch(pp,"/resource//"); - + // CaptureTheRestPathElement pp = parser.parse("/{*var}"); assertMatches(pp,"/resource"); @@ -229,14 +229,14 @@ public class PathPatternTests { assertEquals("/resource//",pp.matchAndExtract(toPathContainer("/resource//")).getUriVariables().get("var")); assertMatches(pp,"//resource//"); assertEquals("//resource//",pp.matchAndExtract(toPathContainer("//resource//")).getUriVariables().get("var")); - + // WildcardTheRestPathElement pp = parser.parse("/**"); assertMatches(pp,"/resource"); assertMatches(pp,"/resource/"); assertMatches(pp,"/resource//"); assertMatches(pp,"//resource//"); - + // WildcardPathElement pp = parser.parse("/*"); assertMatches(pp,"/resource"); @@ -296,9 +296,9 @@ public class PathPatternTests { checkCapture("{var:foo}","foo","var","foo"); checkCapture("{var:f o}","f%20o","var","f o"); // constraint is expressed in non encoded form checkCapture("{var:f.o}","f%20o","var","f o"); - checkCapture("{var:f\\|o}","f%7co","var","f|o"); + checkCapture("{var:f\\|o}","f%7co","var","f|o"); } - + @Test public void encodingAndBoundVariablesCaptureTheRestPathElement() { checkCapture("/{*var}","/f%20o","var","/f o"); @@ -317,7 +317,7 @@ public class PathPatternTests { checkCapture("/{var1}_ _{var2:f\\|o}","/f%20o_%20_f%7co","var1","f o","var2","f|o"); checkCapture("/{var1:f o}_ _{var2:f\\|o}","/f%20o_%20_f%7co","var1","f o","var2","f|o"); } - + @Test public void pathRemainingCornerCases_spr15336() { // No match when the literal path element is a longer form of the segment in the pattern @@ -347,7 +347,7 @@ public class PathPatternTests { assertNotNull(pri); assertEquals("i",pri.getPathRemaining().value()); assertEquals("b",pri.getUriVariables().get("bbb")); - + pri = parse("/{aaa}_{bbb}/e*f/{x}/g").matchStartOfPath(toPathContainer("/aa_bb/ef/x/g/i")); assertNotNull(pri); assertEquals("/i",pri.getPathRemaining().value()); @@ -435,7 +435,7 @@ public class PathPatternTests { checkMatches("/one/////two/three", "/one/////two/three"); checkCapture("///{foo}///bar", "///one///bar", "foo", "one"); } - + @Test public void wildcards() { checkMatches("/*/bar", "/foo/bar"); @@ -558,7 +558,7 @@ public class PathPatternTests { assertEquals("foo",pri.getUriVariables().get("this")); assertEquals("bar",pri.getUriVariables().get("one")); assertEquals("goo",pri.getUriVariables().get("here")); - + pp = parse("/aaa/{foo}"); pri = getPathRemaining(pp, "/aaa/bbb"); assertEquals("",pri.getPathRemaining().value()); @@ -568,7 +568,7 @@ public class PathPatternTests { pri = getPathRemaining(pp, "/aaa/bbb"); assertEquals("",pri.getPathRemaining().value()); assertEquals(0,pri.getUriVariables().size()); - + pp = parse("/*/{foo}/b*"); pri = getPathRemaining(pp, "/foo"); assertNull(pri); @@ -580,7 +580,7 @@ public class PathPatternTests { assertEquals("/jkl",pri.getPathRemaining().value()); assertEquals("def",pri.getUriVariables().get("foo")); } - + @Test public void caseSensitivity() { PathPatternParser pp = new PathPatternParser(); @@ -663,13 +663,13 @@ public class PathPatternTests { } @Test - public void extractPathWithinPattern_spr15259() { + public void extractPathWithinPattern_spr15259() { checkExtractPathWithinPattern("/**","//",""); checkExtractPathWithinPattern("/**","/",""); checkExtractPathWithinPattern("/**","",""); checkExtractPathWithinPattern("/**","/foobar","foobar"); } - + @Test public void extractPathWithinPattern() throws Exception { checkExtractPathWithinPattern("/welcome*/", "/welcome/", "welcome"); @@ -715,14 +715,14 @@ public class PathPatternTests { assertNoMatch(pp,"/"); assertNoMatch(pp,"//"); checkCapture("/{foo}", "/abc", "foo", "abc"); - + pp = new PathPatternParser().parse("/{foo}/{bar}"); assertMatches(pp,"/abc/def"); assertNoMatch(pp,"/def"); assertNoMatch(pp,"/"); assertNoMatch(pp,"//def"); assertNoMatch(pp,"//"); - + pp = parse("/{foo}/boo"); assertMatches(pp,"/abc/boo"); assertMatches(pp,"/a/boo"); @@ -738,14 +738,14 @@ public class PathPatternTests { assertNoMatch(pp,"/1"); assertMatches(pp,"/a"); assertNoMatch(pp,"/"); - + // Two captures mean we use a RegexPathElement pp = new PathPatternParser().parse("/{foo}{bar}"); assertMatches(pp,"/abcdef"); assertNoMatch(pp,"/"); assertNoMatch(pp,"//"); checkCapture("/{foo:[a-z][a-z]}{bar:[a-z]}", "/abc", "foo", "ab", "bar", "c"); - + // Only patterns not capturing variables cannot match against just / PathPatternParser ppp = new PathPatternParser(); ppp.setMatchOptionalTrailingSeparator(true); @@ -766,7 +766,7 @@ public class PathPatternTests { assertEquals("a",vars.get("foo")); assertEquals("",vars.get("bar")); } - + @Test public void extractUriTemplateVariables() throws Exception { assertMatches(parse("{hotel}"),"1"); @@ -959,7 +959,7 @@ public class PathPatternTests { assertEquals(-1, comparator.compare(parse("*"), parse("*/**"))); assertEquals(1, comparator.compare(parse("*/**"), parse("*"))); } - + @Test public void compare_spr15597() { PathPatternParser parser = new PathPatternParser(); @@ -967,7 +967,7 @@ public class PathPatternTests { PathPattern p2 = parser.parse("/{foo}.*"); PathPattern.PathMatchInfo r1 = matchAndExtract(p1, "/file.txt"); PathPattern.PathMatchInfo r2 = matchAndExtract(p2, "/file.txt"); - + // works fine assertEquals("file.txt", r1.getUriVariables().get("foo")); assertEquals("file", r2.getUriVariables().get("foo")); @@ -1126,7 +1126,7 @@ public class PathPatternTests { result = matchAndExtract("/abc/{var}","/abc/one"); assertEquals("one",result.getUriVariables().get("var")); assertNull(result.getMatrixVariables().get("var")); - + result = matchAndExtract("",""); assertNotNull(result); result = matchAndExtract("","/"); @@ -1134,22 +1134,22 @@ public class PathPatternTests { } private PathPattern.PathMatchInfo matchAndExtract(String pattern, String path) { - return parse(pattern).matchAndExtract(PathPatternTests.toPathContainer(path)); + return parse(pattern).matchAndExtract(PathPatternTests.toPathContainer(path)); } - + private PathPattern parse(String path) { PathPatternParser pp = new PathPatternParser(); pp.setMatchOptionalTrailingSeparator(true); return pp.parse(path); } - + public static PathContainer toPathContainer(String path) { if (path == null) { return null; } return PathContainer.parsePath(path); } - + private void checkMatches(String uriTemplate, String path) { PathPatternParser parser = new PathPatternParser(); parser.setMatchOptionalTrailingSeparator(true); @@ -1197,11 +1197,11 @@ public class PathPatternTests { private PathRemainingMatchInfo getPathRemaining(String pattern, String path) { return parse(pattern).matchStartOfPath(toPathContainer(path)); } - + private PathRemainingMatchInfo getPathRemaining(PathPattern pattern, String path) { return pattern.matchStartOfPath(toPathContainer(path)); } - + private PathPattern.PathMatchInfo matchAndExtract(PathPattern p, String path) { return p.matchAndExtract(toPathContainer(path)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index 6751cdad483..64e97eadc6b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -143,7 +143,7 @@ public class DispatcherHandlerErrorTests { public void requestBodyError() throws Exception { ServerWebExchange exchange = MockServerWebExchange.from( MockServerHttpRequest.post("/request-body").body(Mono.error(EXCEPTION))); - + Mono publisher = this.dispatcherHandler.handle(exchange); StepVerifier.create(publisher) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java index c7cca025b68..9c03d3d3eb2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java @@ -184,4 +184,4 @@ public class DefaultClientRequestBuilderTests { .verifyComplete(); } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java index c2ecfd46aba..eb8c7e76905 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java @@ -101,4 +101,4 @@ public class DefaultClientResponseBuilderTests { } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java index 6937bb761e5..4b0b3c34531 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java @@ -160,4 +160,4 @@ public class ClientResponseWrapperTests { -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilderTests.java index b5e1ef38701..d6dae61b992 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilderTests.java @@ -78,4 +78,4 @@ public class DefaultServerRequestBuilderTests { .verifyComplete(); } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java index af2ea5986ca..582b3633d54 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java @@ -384,4 +384,4 @@ public class DefaultServerResponseBuilderTests { } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/NestedRouteIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/NestedRouteIntegrationTests.java index 04c1087c469..f4d2721e6d7 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/NestedRouteIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/NestedRouteIntegrationTests.java @@ -43,7 +43,7 @@ public class NestedRouteIntegrationTests extends AbstractRouterFunctionIntegrati return nest(path("/foo/"), route(GET("/bar"), nestedHandler::bar) .andRoute(GET("/baz"), nestedHandler::baz)) - .andNest(GET("/{foo}"), + .andNest(GET("/{foo}"), route(GET("/bar"), nestedHandler::variables).and( nest(GET("/{bar}"), route(GET("/{baz}"), nestedHandler::variables)))) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java index ee5342bcc27..edab181f1b3 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java @@ -129,4 +129,4 @@ public class PathResourceLookupFunctionTests { } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java index 6f12fa721f2..949e5e01c9a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java @@ -67,4 +67,4 @@ public class RouterFunctionMappingTests { .verify(); } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java index 876fc885447..859e9e93b05 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java @@ -186,4 +186,4 @@ public class ServerRequestWrapperTests { assertSame(result, wrapper.bodyToFlux(reference)); } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java index 43dafb0e07d..ea9e2916e7c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java @@ -43,7 +43,7 @@ public class CachingResourceResolverTests { private static final Duration TIMEOUT = Duration.ofSeconds(5); - + private Cache cache; private ResourceResolverChain chain; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java index 3328c185aa4..b579a6c150e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class EncodedResourceResolverTests { private static final Duration TIMEOUT = Duration.ofSeconds(5); - + private ResourceResolverChain resolver; private List locations; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java index 3dc7e8b6fb4..d7bf74ba8af 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java @@ -32,7 +32,7 @@ public class FixedVersionStrategyTests { private static final String PATH = "js/foo.js"; - + private FixedVersionStrategy strategy; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java index 511ac0b9abd..bb44676b371 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java @@ -40,7 +40,7 @@ public class PathResourceResolverTests { private static final Duration TIMEOUT = Duration.ofSeconds(5); - + private final PathResourceResolver resolver = new PathResourceResolver(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java index 36b5f1b188e..78a6cd1a613 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java @@ -43,7 +43,7 @@ public class ResourceTransformerSupportTests { private static final Duration TIMEOUT = Duration.ofSeconds(5); - + private ResourceTransformerChain chain; private TestResourceTransformerSupport transformer; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java index 3d4bcfe863d..25c44e06dea 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java @@ -51,7 +51,7 @@ public class ResourceUrlProviderTests { private static final Duration TIMEOUT = Duration.ofSeconds(5); - + private final List locations = new ArrayList<>(); private final ResourceWebHandler handler = new ResourceWebHandler(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java index 70de4828db2..7c414db35bc 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -48,7 +48,7 @@ public class WebJarsResourceResolverTests { private static final Duration TIMEOUT = Duration.ofSeconds(1); - + private List locations; private WebJarsResourceResolver resolver; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java index c2839633010..af865c2edea 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java @@ -46,7 +46,7 @@ public class HeadersRequestConditionTests { public void headerPresent() { MockServerWebExchange exchange = MockServerWebExchange.from(get("/").header("Accept", "")); HeadersRequestCondition condition = new HeadersRequestCondition("accept"); - + assertNotNull(condition.getMatchingCondition(exchange)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java index 1bfd5e83344..6b1818ef9e3 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -182,4 +182,4 @@ public class HandlerMethodMappingTests { public void handlerMethod2() { } } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java index 7b27abcc076..ced0504bffe 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -109,4 +109,4 @@ public class RequestParamMapMethodArgumentResolverTests { @RequestParam Mono> paramMono) { } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java index 25c1808cf4d..f8d20ffdf0d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java @@ -109,4 +109,4 @@ public class SessionAttributesHandlerTests { private static class TestController { } -} \ No newline at end of file +} diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java index 4882727f949..5df490f68d6 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -60,7 +60,7 @@ public class NashornScriptTemplateTests { private MockServerHttpResponse render(String viewUrl, Map model, Class configuration) throws Exception { - + ScriptTemplateView view = createViewWithUrl(viewUrl, configuration); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")); view.renderInternal(model, MediaType.TEXT_HTML, exchange).block(); diff --git a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java index 53b5fdc6aa6..056ce147b98 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java +++ b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java @@ -23,4 +23,4 @@ public class TestListener implements ApplicationListener { ++eventCount; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java index 7276af86ae9..1f810847cc2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,4 +33,4 @@ public class ServletConfigAwareBean implements ServletConfigAware { public ServletConfig getServletConfig() { return servletConfig; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java index 9363468268d..7edf12976db 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,4 +33,4 @@ public class ServletContextAwareBean implements ServletContextAware { public ServletContext getServletContext() { return servletContext; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index 54a7484f1e6..007c62c2ba1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -259,4 +259,4 @@ class TestMessageCodesResolver implements MessageCodesResolver { class TestPathMatcher extends AntPathMatcher { } -class TestPathHelper extends UrlPathHelper { } \ No newline at end of file +class TestPathHelper extends UrlPathHelper { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java index fed5a26a024..2de06bacabc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -309,4 +309,4 @@ public class HandlerMethodMappingTests { public void handlerMethod2() { } } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java index adf085567cb..060a9e1d08b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java @@ -719,4 +719,4 @@ public class HttpEntityMethodProcessorMockTests { public static class CustomHttpEntity extends HttpEntity { } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java index 89b4b75afb7..54924700ef6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -152,4 +152,4 @@ public class MatrixVariablesMethodArgumentResolverTests { @MatrixVariable(name = "year", pathVar = "cars", required = false, defaultValue = "2013") int preferredYear) { } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java index f5bd47339cb..a800126e803 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java @@ -277,7 +277,7 @@ public class MvcUriComponentsBuilderTests { assertThat(uriComponents.toUriString(), endsWith("/something/else")); } - @Test + @Test public void fromMethodCallOnSubclass() { UriComponents uriComponents = fromMethodCall(on(ExtendedController.class).myMethod(null)).build(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java index 09054d50f40..6654d121273 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -86,4 +86,4 @@ public class UriComponentsBuilderMethodArgumentResolverTests { void handle(UriComponentsBuilder builder, ServletUriComponentsBuilder servletBuilder, int value) { } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java index 9642d2202ff..d12468699d5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -90,4 +90,4 @@ public class ViewMethodReturnValueHandlerTests { return null; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java index dcd8bca0618..7fc4515140b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -47,4 +47,4 @@ public class RequestDataValueProcessorWrapper implements RequestDataValueProcess return (this.processor != null) ? this.processor.getExtraHiddenFields(request) : null; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java index 8be784fc1fa..41500679e8f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java @@ -38,4 +38,4 @@ enum TestEnum { return "TestEnum: " + name(); } -} \ No newline at end of file +} diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java index 726a41204e0..b1eff000607 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -207,4 +207,4 @@ public class DefaultSimpUserRegistryTests { } -} \ No newline at end of file +} diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientIntegrationTests.java index 3bd2265e9c9..52cad890425 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -219,4 +219,4 @@ public class WebSocketStompClientIntegrationTests { } } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index 5f5938ed364..75ed0a63b0c 100644 --- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -335,12 +335,12 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } - public static interface IScopedTestBean { + public static interface IScopedTestBean { - String getName(); + String getName(); - void setName(String name); - } + void setName(String name); + } public static abstract class ScopedTestBean implements IScopedTestBean { diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index 02cd6cf2b9d..469e2402cf1 100644 --- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -295,12 +295,12 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { } - static interface IScopedTestBean { + static interface IScopedTestBean { - String getName(); + String getName(); - void setName(String name); - } + void setName(String name); + } static abstract class ScopedTestBean implements IScopedTestBean { diff --git a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java index 3d4ec22e61f..39719739ea6 100644 --- a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java +++ b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -62,4 +62,4 @@ public class Spr7538Tests { } public static class Foo{} -} \ No newline at end of file +}