Browse Source

Use tabs rather than spaces in tests

Update tests to ensure that tabs are used instead of spaces. Also
consistently apply a new line at the end of each file.

Issue: SPR-16968
pull/1868/head
Phillip Webb 8 years ago committed by Juergen Hoeller
parent
commit
a89e716cc7
  1. 4
      spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java
  2. 4
      spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
  3. 30
      spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java
  4. 4
      spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
  5. 4
      spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
  6. 4
      spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
  7. 24
      spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
  8. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
  9. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
  10. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
  11. 4
      spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java
  12. 4
      spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java
  13. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java
  14. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java
  15. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java
  16. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java
  17. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java
  18. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java
  19. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java
  20. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java
  21. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java
  22. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java
  23. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java
  24. 4
      spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java
  25. 4
      spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java
  26. 4
      spring-context/src/test/java/example/profilescan/DevComponent.java
  27. 4
      spring-context/src/test/java/example/scannable_scoped/MyScope.java
  28. 38
      spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
  29. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
  30. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
  31. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
  32. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
  33. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
  34. 4
      spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
  35. 4
      spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java
  36. 30
      spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java
  37. 4
      spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
  38. 2
      spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java
  39. 14
      spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java
  40. 4
      spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java
  41. 4
      spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java
  42. 4
      spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java
  43. 4
      spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java
  44. 4
      spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java
  45. 4
      spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java
  46. 4
      spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
  47. 6
      spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
  48. 3
      spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java
  49. 9
      spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
  50. 4
      spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java
  51. 4
      spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java
  52. 4
      spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java
  53. 2
      spring-context/src/test/java/test/aspect/PerTargetAspect.java
  54. 4
      spring-context/src/test/java/test/mixin/DefaultLockable.java
  55. 4
      spring-context/src/test/java/test/mixin/Lockable.java
  56. 2
      spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
  57. 36
      spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java
  58. 4
      spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java
  59. 2
      spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java
  60. 4
      spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java
  61. 2
      spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
  62. 2
      spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java
  63. 2
      spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
  64. 4
      spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java
  65. 4
      spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java
  66. 4
      spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java
  67. 6
      spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
  68. 4
      spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java
  69. 4
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
  70. 2
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
  71. 2
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
  72. 2
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
  73. 2
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
  74. 2
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
  75. 2
      spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
  76. 4
      spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java
  77. 4
      spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java
  78. 4
      spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java
  79. 4
      spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java
  80. 4
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
  81. 4
      spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java
  82. 4
      spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java
  83. 4
      spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java
  84. 4
      spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java
  85. 4
      spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
  86. 4
      spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java
  87. 4
      spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java
  88. 10
      spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
  89. 4
      spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
  90. 4
      spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
  91. 4
      spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java
  92. 4
      spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java
  93. 4
      spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java
  94. 4
      spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java
  95. 4
      spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java
  96. 4
      spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
  97. 4
      spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java
  98. 4
      spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java
  99. 4
      spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/BarConfig.java
  100. 4
      spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/DevProfileConfig.java
  101. Some files were not shown because too many files have changed in this diff Show More

4
spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java

@ -1,5 +1,5 @@ @@ -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 { @@ -25,4 +25,4 @@ public class ClassWithConstructor {
public void method() {
}
}
}

4
spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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

30
spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java vendored

@ -1,5 +1,5 @@ @@ -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; @@ -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();
}
}

4
spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -295,7 +295,7 @@ public class AnnotationAsyncExecutionAspectTests {
@Async
public void failWithVoid() {
throw new UnsupportedOperationException("failWithVoid");
throw new UnsupportedOperationException("failWithVoid");
}
}

4
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -52,4 +52,4 @@ public abstract class AbstractPropertyValuesTests {
assertTrue("Map size is 0", m.size() == 0);
}
}
}

4
spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java

@ -444,9 +444,9 @@ public class BeanUtilsTests { @@ -444,9 +444,9 @@ public class BeanUtilsTests {
value = aValue;
}
}
private static class BeanWithSingleNonDefaultConstructor {
private final String name;
public BeanWithSingleNonDefaultConstructor(String name) {

24
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -644,25 +644,25 @@ public class BeanWrapperGenericsTests {
public interface ObjectWithId<T extends Comparable<T>> {
T getId();
T getId();
void setId(T aId);
void setId(T aId);
}
public class Promotion implements ObjectWithId<Long> {
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;
}
}
}

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java

@ -1,5 +1,5 @@ @@ -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 { @@ -65,4 +65,4 @@ public class CountingFactory implements FactoryBean {
return true;
}
}
}

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java

@ -1,5 +1,5 @@ @@ -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 { @@ -64,4 +64,4 @@ public class DummyReferencer {
return testBean2;
}
}
}

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java

@ -1,5 +1,5 @@ @@ -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 @@ -165,4 +165,4 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
}
}
}
}

4
spring-beans/src/test/java/org/springframework/beans/support/DerivedFromProtectedBaseBean.java

@ -1,5 +1,5 @@ @@ -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; @@ -22,4 +22,4 @@ package org.springframework.beans.support;
*/
public class DerivedFromProtectedBaseBean extends ProtectedBaseBean {
}
}

4
spring-beans/src/test/java/org/springframework/beans/support/ProtectedBaseBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -32,4 +32,4 @@ class ProtectedBaseBean {
return someProperty;
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -43,4 +43,4 @@ public class BooleanTestBean {
this.bool2 = bool2;
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java

@ -1,5 +1,5 @@ @@ -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 { @@ -28,4 +28,4 @@ public enum CustomEnum {
return "CustomEnum: " + name();
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java

@ -1,5 +1,5 @@ @@ -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 @@ -182,4 +182,4 @@ public class DummyFactory
}
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java

@ -1,5 +1,5 @@ @@ -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; @@ -22,4 +22,4 @@ package org.springframework.tests.sample.beans;
*/
public class GenericIntegerBean extends GenericBean<Integer> {
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java

@ -1,5 +1,5 @@ @@ -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; @@ -23,4 +23,4 @@ import java.util.Set;
*/
public class GenericSetOfIntegerBean extends GenericBean<Set<Integer>> {
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -20,4 +20,4 @@ public interface INestedTestBean {
public String getCompany();
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java

@ -1,6 +1,6 @@ @@ -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 { @@ -21,4 +21,4 @@ public interface IOther {
void absquatulate();
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -142,4 +142,4 @@ public class IndexedTestBean {
this.sortedMap = sortedMap;
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java

@ -1,5 +1,5 @@ @@ -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 @@ -167,4 +167,4 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
}
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -61,4 +61,4 @@ public class NestedTestBean implements INestedTestBean {
return "NestedTestBean: " + this.company;
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -140,4 +140,4 @@ public class NumberTestBean {
this.bigDecimal = bigDecimal;
}
}
}

4
spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java

@ -1,5 +1,5 @@ @@ -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 @@ -183,4 +183,4 @@ public class DummyFactory
}
}
}
}

4
spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/package-info.java

@ -1,5 +1,5 @@ @@ -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 @@ @@ -19,4 +19,4 @@
*
* @author Stephane Nicoll
*/
package org.springframework.context.index.sample.jpa;
package org.springframework.context.index.sample.jpa;

4
spring-context/src/test/java/example/profilescan/DevComponent.java

@ -1,5 +1,5 @@ @@ -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 { @@ -34,4 +34,4 @@ public @interface DevComponent {
String value() default "";
}
}

4
spring-context/src/test/java/example/scannable_scoped/MyScope.java

@ -1,5 +1,5 @@ @@ -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; @@ -22,4 +22,4 @@ import org.springframework.context.annotation.ScopedProxyMode;
public @interface MyScope {
String value() default BeanDefinition.SCOPE_SINGLETON;
ScopedProxyMode proxyMode() default ScopedProxyMode.DEFAULT;
}
}

38
spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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;

4
spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -74,4 +74,4 @@ class CallCountingInterceptor implements MethodInterceptor {
public void reset() {
this.count = 0;
}
}
}

4
spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -91,4 +91,4 @@ class NonAnnotatedMakeLockable {
}
}
}
}

4
spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -148,4 +148,4 @@ class JoinPointMonitorAtAspectJAspect {
this.counter = counter;
}
}
}

4
spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -95,4 +95,4 @@ class SubtypeMatchingTestClassC implements Bar {
@Override
public void bar(Object o) {}
}
}

4
spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -119,4 +119,4 @@ class TestImpl implements TestInterface {
@Override
public void doIt() {
}
}
}

4
spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java

@ -1,5 +1,5 @@ @@ -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<Object> { @@ -99,4 +99,4 @@ class ResourceArrayFactoryBean implements FactoryBean<Object> {
return true;
}
}
}

4
spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java vendored

@ -1,5 +1,5 @@ @@ -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 @@ -31,4 +31,4 @@ public class AnnotationDrivenCacheConfigTests extends AbstractCacheAnnotationTes
"/org/springframework/cache/config/annotationDrivenCacheConfig.xml");
}
}
}

30
spring-context/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java vendored

@ -1,5 +1,5 @@ @@ -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; @@ -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();
}
}

4
spring-context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -27,4 +27,4 @@ public class DoubleScanTests extends SimpleScanTests {
return new String[] {"doubleScanTests.xml"};
}
}
}

2
spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java

@ -394,7 +394,7 @@ public class ImportSelectorTests { @@ -394,7 +394,7 @@ public class ImportSelectorTests {
public Iterable<Entry> selectImports() {
LinkedList<Entry> 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;
}

14
spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -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 { @@ -58,7 +58,7 @@ public class Spr16217Tests {
}
}
public static class RegisterBeanPhaseCondition implements ConfigurationCondition {
@Override
@ -72,7 +72,7 @@ public class Spr16217Tests { @@ -72,7 +72,7 @@ public class Spr16217Tests {
}
}
public static class ParseConfigurationPhaseCondition implements ConfigurationCondition {
@Override
@ -91,7 +91,7 @@ public class Spr16217Tests { @@ -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 { @@ -101,7 +101,7 @@ public class Spr16217Tests {
public static class UnconditionalImportingConfiguration {
}
public static class BaseConfiguration {
@Bean

4
spring-context/src/test/java/org/springframework/context/annotation/componentscan/level1/Level1Config.java

@ -1,5 +1,5 @@ @@ -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 { @@ -28,4 +28,4 @@ public class Level1Config {
public TestBean level1Bean() {
return new TestBean("level1Bean");
}
}
}

4
spring-context/src/test/java/org/springframework/context/annotation/configuration/a/BaseConfig.java

@ -1,5 +1,5 @@ @@ -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 { @@ -40,4 +40,4 @@ public abstract class BaseConfig {
public Bar workaroundBar() {
return protectedBar();
}
}
}

4
spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithRole.java

@ -1,5 +1,5 @@ @@ -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; @@ -25,4 +25,4 @@ import org.springframework.stereotype.Component;
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@Description("A Component with a role")
public class ComponentWithRole {
}
}

4
spring-context/src/test/java/org/springframework/context/annotation/role/ComponentWithoutRole.java

@ -1,5 +1,5 @@ @@ -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; @@ -20,4 +20,4 @@ import org.springframework.stereotype.Component;
@Component("componentWithoutRole")
public class ComponentWithoutRole {
}
}

4
spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -127,4 +127,4 @@ public class FactoryBeanAccessTests {
}
}
}
}

4
spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -95,4 +95,4 @@ public class MapAccessorTests {
return map2;
}
}
}

4
spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -117,4 +117,4 @@ public class LiveBeansViewTests {
return ManagementFactory.getPlatformMBeanServer().queryNames(new ObjectName(objectName), null);
}
}
}

6
spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -148,7 +148,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertFalse("Assembler should not have been invoked", asm.invoked);
}
finally {
exporter.destroy();
exporter.destroy();
}
}

3
spring-context/src/test/java/org/springframework/scripting/groovy/TestService.java

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
package org.springframework.scripting.groovy;
public interface TestService {
public String sayHello();
public String sayHello();
}

9
spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java

@ -2,8 +2,9 @@ package org.springframework.scripting.groovy; @@ -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");
}
}

4
spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java

@ -1,5 +1,5 @@ @@ -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 { @@ -49,4 +49,4 @@ public class TestMethodInvokingTask {
}
}
}
}

4
spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java

@ -1,5 +1,5 @@ @@ -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 { @@ -32,4 +32,4 @@ public class BeanWithObjectProperty {
this.object = object;
}
}
}

4
spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java

@ -1,5 +1,5 @@ @@ -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 { @@ -40,4 +40,4 @@ public class FieldAccessBean {
return spouse;
}
}
}

2
spring-context/src/test/java/test/aspect/PerTargetAspect.java

@ -47,4 +47,4 @@ public class PerTargetAspect implements Ordered { @@ -47,4 +47,4 @@ public class PerTargetAspect implements Ordered {
public void setOrder(int order) {
this.order = order;
}
}
}

4
spring-context/src/test/java/test/mixin/DefaultLockable.java

@ -1,5 +1,5 @@ @@ -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 @@ @@ -14,7 +14,7 @@
* limitations under the License.
*/
package test.mixin;
package test.mixin;
/**

4
spring-context/src/test/java/test/mixin/Lockable.java

@ -1,5 +1,5 @@ @@ -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 { @@ -30,4 +30,4 @@ public interface Lockable {
void unlock();
boolean locked();
}
}

2
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

@ -431,7 +431,7 @@ public class ResolvableTypeTests { @@ -431,7 +431,7 @@ public class ResolvableTypeTests {
interfaces.add(interfaceType.toString());
}
assertThat(interfaces.toString(), equalTo(
"["
"["
+ "java.io.Serializable, "
+ "java.lang.Cloneable, "
+ "java.util.List<java.lang.CharSequence>, "

36
spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java

@ -1,5 +1,5 @@ @@ -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.*; @@ -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);
}
}

4
spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java

@ -1,5 +1,5 @@ @@ -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 @@ -82,4 +82,4 @@ public class ByteArrayDecoderTests extends AbstractDataBufferAllocatingTestCase
.verify();
}
}
}

2
spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java

@ -73,4 +73,4 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase { @@ -73,4 +73,4 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase {
.verify();
}
}
}

4
spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -74,4 +74,4 @@ public class ResourceEncoderTests extends AbstractDataBufferAllocatingTestCase {
.verify();
}
}
}

2
spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java

@ -200,4 +200,4 @@ public class StreamConverterTests { @@ -200,4 +200,4 @@ public class StreamConverterTests {
public List rawList;
}
}
}

2
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java

@ -537,4 +537,4 @@ public class DataBufferTests extends AbstractDataBufferAllocatingTestCase { @@ -537,4 +537,4 @@ public class DataBufferTests extends AbstractDataBufferAllocatingTestCase {
release(buffer);
}
}
}

2
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java

@ -283,7 +283,7 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { @@ -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();

4
spring-core/src/test/java/org/springframework/core/io/buffer/PooledDataBufferTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -70,4 +70,4 @@ public class PooledDataBufferTests {
}
}
}

4
spring-core/src/test/java/org/springframework/core/io/buffer/support/DataBufferTestUtilsTests.java

@ -1,5 +1,5 @@ @@ -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 @@ -57,4 +57,4 @@ public class DataBufferTestUtilsTests extends AbstractDataBufferAllocatingTestCa
release(buffer);
}
}
}

4
spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -79,4 +79,4 @@ public class StaxResultTests {
assertThat("Invalid result", stringWriter.toString(), isSimilarTo(XML));
}
}
}

6
spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java

@ -143,7 +143,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests { @@ -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 { @@ -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 { @@ -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"));
}

4
spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java vendored

@ -1,5 +1,5 @@ @@ -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 { @@ -35,4 +35,4 @@ public class PersonInOtherPackage {
public void setAge(int age) {
this.age = age;
}
}
}

4
spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java

@ -1,5 +1,5 @@ @@ -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 { @@ -41,4 +41,4 @@ public class ArrayContainer {
booleans[0] = true;
floats[0] = 42.0f;
}
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java

@ -14,4 +14,4 @@ public class Company { @@ -14,4 +14,4 @@ public class Company {
public String getAddress() {
return address;
}
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java

@ -38,4 +38,4 @@ public class Fruit { @@ -38,4 +38,4 @@ public class Fruit {
public String toString() {
return "A" + (colorName != null && colorName.startsWith("o") ? "n " : " ") + colorName + " " + name;
}
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java

@ -25,4 +25,4 @@ public class Person { @@ -25,4 +25,4 @@ public class Person {
public Company getCompany() {
return company;
}
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java

@ -44,4 +44,4 @@ public class PlaceOfBirth { @@ -44,4 +44,4 @@ public class PlaceOfBirth {
return city.hashCode();
}
}
}

2
spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java

@ -16,4 +16,4 @@ public class TestPerson { @@ -16,4 +16,4 @@ public class TestPerson {
public void setAddress(TestAddress address) {
this.address = address;
}
}
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java

@ -257,7 +257,7 @@ public class NamedParameterUtilsTests { @@ -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));

4
spring-jdbc/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java

@ -1,5 +1,5 @@ @@ -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 { @@ -54,4 +54,4 @@ public abstract class AbstractPerson {
this.birth_date = birth_date;
}
}
}

4
spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java

@ -1,5 +1,5 @@ @@ -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 { @@ -34,4 +34,4 @@ public class ConcretePerson extends AbstractPerson {
this.balance = balance;
}
}
}

4
spring-jdbc/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java

@ -1,5 +1,5 @@ @@ -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 { @@ -32,4 +32,4 @@ public class ExtendedPerson extends ConcretePerson {
this.someField = someField;
}
}
}

4
spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java

@ -1,5 +1,5 @@ @@ -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 { @@ -64,4 +64,4 @@ public class Person {
this.balance = balanace;
}
}
}

4
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java

@ -209,8 +209,8 @@ public class DataSourceTransactionManagerTests { @@ -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());

4
spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -104,4 +104,4 @@ public class MarshallingMessageConverterTests {
}
}
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -100,4 +100,4 @@ public class DestinationVariableMethodArgumentResolverTests {
String param3) {
}
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -136,4 +136,4 @@ public class SimpAttributesContextHolderTests {
SimpAttributesContextHolder.currentAttributes();
}
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -135,4 +135,4 @@ public class SimpAttributesTests {
verify(callback1, times(1)).run();
}
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -202,4 +202,4 @@ public class SimpMessagingTemplateTests {
assertEquals("/queue/foo-user123", ((StompHeaderAccessor) sentAccessor).getDestination());
}
}
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -146,7 +146,7 @@ public class BrokerMessageHandlerTests {
@Override
public void publishEvent(ApplicationEvent event) {
publishEvent((Object) event);
publishEvent((Object) event);
}
@Override

4
spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java

@ -1,5 +1,5 @@ @@ -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 { @@ -229,4 +229,4 @@ public class NativeMessageHeaderAccessorTests {
headerAccessor.setImmutable();
}
}
}

10
spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java

@ -1,5 +1,5 @@ @@ -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<M extends Marshaller> { @@ -168,8 +168,8 @@ public abstract class AbstractMarshallerTests<M extends Marshaller> {
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();
}
}

4
spring-oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java

@ -1,5 +1,5 @@ @@ -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 { @@ -42,4 +42,4 @@ public class CastorObject {
public void setValue(Integer value) {
this.value = value;
}
}
}

4
spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java

@ -1,6 +1,6 @@ @@ -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 { @@ -29,4 +29,4 @@ public class XmlRegObjectFactory {
public JAXBElement<Airplane> createAirplane(Airplane airplane) {
return new JAXBElement<>(new QName("brand-airplane"), Airplane.class, null, airplane);
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java

@ -1,5 +1,5 @@ @@ -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 { @@ -36,4 +36,4 @@ interface ContextConfigurationTestInterface {
}
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java

@ -1,5 +1,5 @@ @@ -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; @@ -29,4 +29,4 @@ import org.springframework.test.context.jdbc.SqlConfig;
@DirtiesContext
@SqlConfig(commentPrefix = "`", blockCommentStartDelimiter = "#$", blockCommentEndDelimiter = "$#", separator = "@@")
interface SqlConfigTestInterface {
}
}

4
spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java

@ -1,5 +1,5 @@ @@ -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 { @@ -34,4 +34,4 @@ interface WebAppConfigurationTestInterface {
/* no user beans required for these tests */
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/PersonController.java

@ -1,5 +1,5 @@ @@ -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 { @@ -36,4 +36,4 @@ class PersonController {
return new Person("Wally");
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/web/WebConfig.java

@ -1,5 +1,5 @@ @@ -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 { @@ -33,4 +33,4 @@ class WebConfig {
return new PersonController();
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java

@ -1,5 +1,5 @@ @@ -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 @@ -229,4 +229,4 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa
assertEquals("The bar method should have been wired via @Resource.", "Bar", this.bar);
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java

@ -1,5 +1,5 @@ @@ -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<Gene @@ -29,4 +29,4 @@ public class DevProfileInitializer implements ApplicationContextInitializer<Gene
public void initialize(GenericApplicationContext applicationContext) {
applicationContext.getEnvironment().setActiveProfiles("dev");
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java

@ -1,5 +1,5 @@ @@ -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 FooBarAliasInitializer implements ApplicationContextInitializer<Gen @@ -29,4 +29,4 @@ public class FooBarAliasInitializer implements ApplicationContextInitializer<Gen
public void initialize(GenericApplicationContext applicationContext) {
applicationContext.registerAlias("foo", "bar");
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/BarConfig.java

@ -1,5 +1,5 @@ @@ -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.
@ -31,4 +31,4 @@ class BarConfig { @@ -31,4 +31,4 @@ class BarConfig {
return "bar";
}
}
}

4
spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/DevProfileConfig.java

@ -1,5 +1,5 @@ @@ -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.
@ -32,4 +32,4 @@ class DevProfileConfig { @@ -32,4 +32,4 @@ class DevProfileConfig {
public String baz() {
return "dev profile config";
}
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save