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
This commit is contained in:
Phillip Webb 2018-06-25 09:24:30 -07:00 committed by Juergen Hoeller
parent 1c25cec44f
commit a89e716cc7
209 changed files with 528 additions and 529 deletions

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,4 +25,4 @@ public class ClassWithConstructor {
public void method() { public void method() {
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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(); TimeStamped ts = (TimeStamped) factory.getProxy();
assertTrue(ts.getTimeStamp() == t); assertTrue(ts.getTimeStamp() == t);
// Shouldn't fail; // Shouldn't fail;
((IOther) ts).absquatulate(); ((IOther) ts).absquatulate();
} }
@Test @Test

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class SomeCustomKeyGenerator implements KeyGenerator {
@Override @Override
public Object generate(Object target, Method method, Object... params) { public Object generate(Object target, Method method, Object... params) {
return generateKey(method.getName(), params); return generateKey(method.getName(), params);
} }
/** /**
* @see #generate(Object, java.lang.reflect.Method, Object...) * @see #generate(Object, java.lang.reflect.Method, Object...)
*/ */
static Object generateKey(String methodName, Object... params) { static Object generateKey(String methodName, Object... params) {
final StringBuilder sb = new StringBuilder(methodName); final StringBuilder sb = new StringBuilder(methodName);
for (Object param : params) { for (Object param : params) {
sb.append(param); sb.append(param);
} }
return sb.toString(); return sb.toString();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -295,7 +295,7 @@ public class AnnotationAsyncExecutionAspectTests {
@Async @Async
public void failWithVoid() { public void failWithVoid() {
throw new UnsupportedOperationException("failWithVoid"); throw new UnsupportedOperationException("failWithVoid");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); assertTrue("Map size is 0", m.size() == 0);
} }
} }

View File

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

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 extends Comparable<T>> { 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> { public class Promotion implements ObjectWithId<Long> {
private Long id; private Long id;
@Override @Override
public Long getId() { public Long getId() {
return id; return id;
} }
@Override @Override
public void setId(Long aId) { public void setId(Long aId) {
this.id = aId; this.id = aId;
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; return true;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -64,4 +64,4 @@ public class DummyReferencer {
return testBean2; return testBean2;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -165,4 +165,4 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class DerivedFromProtectedBaseBean extends ProtectedBaseBean {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,4 +32,4 @@ class ProtectedBaseBean {
return someProperty; return someProperty;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -43,4 +43,4 @@ public class BooleanTestBean {
this.bool2 = bool2; this.bool2 = bool2;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,4 +28,4 @@ public enum CustomEnum {
return "CustomEnum: " + name(); return "CustomEnum: " + name();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -182,4 +182,4 @@ public class DummyFactory
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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<Integer> { public class GenericIntegerBean extends GenericBean<Integer> {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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<Set<Integer>> { public class GenericSetOfIntegerBean extends GenericBean<Set<Integer>> {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -20,4 +20,4 @@ public interface INestedTestBean {
public String getCompany(); public String getCompany();
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,4 +21,4 @@ public interface IOther {
void absquatulate(); void absquatulate();
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -142,4 +142,4 @@ public class IndexedTestBean {
this.sortedMap = sortedMap; this.sortedMap = sortedMap;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; return "NestedTestBean: " + this.company;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -140,4 +140,4 @@ public class NumberTestBean {
this.bigDecimal = bigDecimal; this.bigDecimal = bigDecimal;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -183,4 +183,4 @@ public class DummyFactory
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,4 +19,4 @@
* *
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
package org.springframework.context.index.sample.jpa; package org.springframework.context.index.sample.jpa;

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -34,4 +34,4 @@ public @interface DevComponent {
String value() default ""; String value() default "";
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public @interface MyScope {
String value() default BeanDefinition.SCOPE_SINGLETON; String value() default BeanDefinition.SCOPE_SINGLETON;
ScopedProxyMode proxyMode() default ScopedProxyMode.DEFAULT; ScopedProxyMode proxyMode() default ScopedProxyMode.DEFAULT;
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 = { private static final String[] EXPECTED = {
// this order confirmed by running the same aspects (minus the Spring AOP advisors) // this order confirmed by running the same aspects (minus the Spring AOP advisors)
// through AspectJ... // through AspectJ...
"beforeAdviceOne(highPrecedenceAspect)", // 1 "beforeAdviceOne(highPrecedenceAspect)", // 1
"beforeAdviceTwo(highPrecedenceAspect)", // 2 "beforeAdviceTwo(highPrecedenceAspect)", // 2
"aroundAdviceOne(highPrecedenceAspect)", // 3, before proceed "aroundAdviceOne(highPrecedenceAspect)", // 3, before proceed
"aroundAdviceTwo(highPrecedenceAspect)", // 4, before proceed "aroundAdviceTwo(highPrecedenceAspect)", // 4, before proceed
"beforeAdviceOne(highPrecedenceSpringAdvice)", // 5 "beforeAdviceOne(highPrecedenceSpringAdvice)", // 5
"beforeAdviceOne(lowPrecedenceSpringAdvice)", // 6 "beforeAdviceOne(lowPrecedenceSpringAdvice)", // 6
"beforeAdviceOne(lowPrecedenceAspect)", // 7 "beforeAdviceOne(lowPrecedenceAspect)", // 7
"beforeAdviceTwo(lowPrecedenceAspect)", // 8 "beforeAdviceTwo(lowPrecedenceAspect)", // 8
"aroundAdviceOne(lowPrecedenceAspect)", // 9, before proceed "aroundAdviceOne(lowPrecedenceAspect)", // 9, before proceed
"aroundAdviceTwo(lowPrecedenceAspect)", // 10, before proceed "aroundAdviceTwo(lowPrecedenceAspect)", // 10, before proceed
"aroundAdviceTwo(lowPrecedenceAspect)", // 11, after proceed "aroundAdviceTwo(lowPrecedenceAspect)", // 11, after proceed
"aroundAdviceOne(lowPrecedenceAspect)", // 12, after proceed "aroundAdviceOne(lowPrecedenceAspect)", // 12, after proceed
"afterAdviceOne(lowPrecedenceAspect)", // 13 "afterAdviceOne(lowPrecedenceAspect)", // 13
"afterAdviceTwo(lowPrecedenceAspect)", // 14 "afterAdviceTwo(lowPrecedenceAspect)", // 14
"aroundAdviceTwo(highPrecedenceAspect)", // 15, after proceed "aroundAdviceTwo(highPrecedenceAspect)", // 15, after proceed
"aroundAdviceOne(highPrecedenceAspect)", // 16, after proceed "aroundAdviceOne(highPrecedenceAspect)", // 16, after proceed
"afterAdviceOne(highPrecedenceAspect)", // 17 "afterAdviceOne(highPrecedenceAspect)", // 17
"afterAdviceTwo(highPrecedenceAspect)" // 18 "afterAdviceTwo(highPrecedenceAspect)" // 18
}; };
private int adviceInvocationNumber = 0; private int adviceInvocationNumber = 0;

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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() { public void reset() {
this.count = 0; this.count = 0;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -91,4 +91,4 @@ class NonAnnotatedMakeLockable {
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -148,4 +148,4 @@ class JoinPointMonitorAtAspectJAspect {
this.counter = counter; this.counter = counter;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -95,4 +95,4 @@ class SubtypeMatchingTestClassC implements Bar {
@Override @Override
public void bar(Object o) {} public void bar(Object o) {}
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -119,4 +119,4 @@ class TestImpl implements TestInterface {
@Override @Override
public void doIt() { public void doIt() {
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -99,4 +99,4 @@ class ResourceArrayFactoryBean implements FactoryBean<Object> {
return true; return true;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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"); "/org/springframework/cache/config/annotationDrivenCacheConfig.xml");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class SomeCustomKeyGenerator implements KeyGenerator {
@Override @Override
public Object generate(Object target, Method method, Object... params) { public Object generate(Object target, Method method, Object... params) {
return generateKey(method.getName(), params); return generateKey(method.getName(), params);
} }
/** /**
* @see #generate(Object, java.lang.reflect.Method, Object...) * @see #generate(Object, java.lang.reflect.Method, Object...)
*/ */
static Object generateKey(String methodName, Object... params) { static Object generateKey(String methodName, Object... params) {
final StringBuilder sb = new StringBuilder(methodName); final StringBuilder sb = new StringBuilder(methodName);
for (Object param : params) { for (Object param : params) {
sb.append(param); sb.append(param);
} }
return sb.toString(); return sb.toString();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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"}; return new String[] {"doubleScanTests.xml"};
} }
} }

View File

@ -394,7 +394,7 @@ public class ImportSelectorTests {
public Iterable<Entry> selectImports() { public Iterable<Entry> selectImports() {
LinkedList<Entry> content = new LinkedList<>(); LinkedList<Entry> content = new LinkedList<>();
TestImportGroup.imports.forEach((metadata, values) -> 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); Collections.reverse(content);
return content; return content;
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,7 +31,7 @@ public class Spr16217Tests {
@Ignore("TODO") @Ignore("TODO")
public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInRegisterBeanPhase() { public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInRegisterBeanPhase() {
try (AnnotationConfigApplicationContext context = try (AnnotationConfigApplicationContext context =
new AnnotationConfigApplicationContext(RegisterBeanPhaseImportingConfiguration.class)) { new AnnotationConfigApplicationContext(RegisterBeanPhaseImportingConfiguration.class)) {
context.getBean("someBean"); context.getBean("someBean");
} }
} }
@ -39,7 +39,7 @@ public class Spr16217Tests {
@Test @Test
public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInParseConfigurationPhase() { public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInParseConfigurationPhase() {
try (AnnotationConfigApplicationContext context = try (AnnotationConfigApplicationContext context =
new AnnotationConfigApplicationContext(ParseConfigurationPhaseImportingConfiguration.class)) { new AnnotationConfigApplicationContext(ParseConfigurationPhaseImportingConfiguration.class)) {
context.getBean("someBean"); context.getBean("someBean");
} }
} }
@ -58,7 +58,7 @@ public class Spr16217Tests {
} }
} }
public static class RegisterBeanPhaseCondition implements ConfigurationCondition { public static class RegisterBeanPhaseCondition implements ConfigurationCondition {
@Override @Override
@ -72,7 +72,7 @@ public class Spr16217Tests {
} }
} }
public static class ParseConfigurationPhaseCondition implements ConfigurationCondition { public static class ParseConfigurationPhaseCondition implements ConfigurationCondition {
@Override @Override
@ -91,7 +91,7 @@ public class Spr16217Tests {
public static class RegisterBeanPhaseImportingConfiguration { public static class RegisterBeanPhaseImportingConfiguration {
} }
@Import({ParseConfigurationPhaseConditionConfiguration.class, BarConfiguration.class}) @Import({ParseConfigurationPhaseConditionConfiguration.class, BarConfiguration.class})
public static class ParseConfigurationPhaseImportingConfiguration { public static class ParseConfigurationPhaseImportingConfiguration {
} }
@ -101,7 +101,7 @@ public class Spr16217Tests {
public static class UnconditionalImportingConfiguration { public static class UnconditionalImportingConfiguration {
} }
public static class BaseConfiguration { public static class BaseConfiguration {
@Bean @Bean

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,4 +28,4 @@ public class Level1Config {
public TestBean level1Bean() { public TestBean level1Bean() {
return new TestBean("level1Bean"); return new TestBean("level1Bean");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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() { public Bar workaroundBar() {
return protectedBar(); return protectedBar();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@Description("A Component with a role") @Description("A Component with a role")
public class ComponentWithRole { public class ComponentWithRole {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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") @Component("componentWithoutRole")
public class ComponentWithoutRole { public class ComponentWithoutRole {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -127,4 +127,4 @@ public class FactoryBeanAccessTests {
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -95,4 +95,4 @@ public class MapAccessorTests {
return map2; return map2;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); return ManagementFactory.getPlatformMBeanServer().queryNames(new ObjectName(objectName), null);
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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)); ObjectNameManager.getInstance(OBJECT_NAME));
} }
finally { finally {
exporter.destroy(); exporter.destroy();
} }
} }
@ -148,7 +148,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertFalse("Assembler should not have been invoked", asm.invoked); assertFalse("Assembler should not have been invoked", asm.invoked);
} }
finally { finally {
exporter.destroy(); exporter.destroy();
} }
} }

View File

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

View File

@ -2,8 +2,9 @@ package org.springframework.scripting.groovy;
@Log @Log
public class TestServiceImpl implements TestService{ public class TestServiceImpl implements TestService{
@Override
public String sayHello() { @Override
throw new TestException("TestServiceImpl"); public String sayHello() {
} throw new TestException("TestServiceImpl");
}
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -49,4 +49,4 @@ public class TestMethodInvokingTask {
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,4 +32,4 @@ public class BeanWithObjectProperty {
this.object = object; this.object = object;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -40,4 +40,4 @@ public class FieldAccessBean {
return spouse; return spouse;
} }
} }

View File

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

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package test.mixin; package test.mixin;
/** /**

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,4 +30,4 @@ public interface Lockable {
void unlock(); void unlock();
boolean locked(); boolean locked();
} }

View File

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

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 * @author Rob Winch
*/ */
public class StandardReflectionParameterNameDiscoverTests { public class StandardReflectionParameterNameDiscoverTests {
private ParameterNameDiscoverer parameterNameDiscoverer; private ParameterNameDiscoverer parameterNameDiscoverer;
@Before @Before
public void setup() { public void setup() {
parameterNameDiscoverer = new StandardReflectionParameterNameDiscoverer(); parameterNameDiscoverer = new StandardReflectionParameterNameDiscoverer();
} }
@Test @Test
public void getParameterNamesOnInterface() { public void getParameterNamesOnInterface() {
Method method = ReflectionUtils.findMethod(MessageService.class,"sendMessage", String.class); Method method = ReflectionUtils.findMethod(MessageService.class,"sendMessage", String.class);
String[] actualParams = parameterNameDiscoverer.getParameterNames(method); String[] actualParams = parameterNameDiscoverer.getParameterNames(method);
assertThat(actualParams, is(new String[]{"message"})); assertThat(actualParams, is(new String[]{"message"}));
} }
public interface MessageService { public interface MessageService {
void sendMessage(String message); void sendMessage(String message);
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -82,4 +82,4 @@ public class ByteArrayDecoderTests extends AbstractDataBufferAllocatingTestCase
.verify(); .verify();
} }
} }

View File

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

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -74,4 +74,4 @@ public class ResourceEncoderTests extends AbstractDataBufferAllocatingTestCase {
.verify(); .verify();
} }
} }

View File

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

View File

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

View File

@ -283,7 +283,7 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
assertReleased(bar); assertReleased(bar);
assertReleased(baz); assertReleased(baz);
} }
private static void assertReleased(DataBuffer dataBuffer) { private static void assertReleased(DataBuffer dataBuffer) {
if (dataBuffer instanceof NettyDataBuffer) { if (dataBuffer instanceof NettyDataBuffer) {
ByteBuf byteBuf = ((NettyDataBuffer) dataBuffer).getNativeBuffer(); ByteBuf byteBuf = ((NettyDataBuffer) dataBuffer).getNativeBuffer();

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -70,4 +70,4 @@ public class PooledDataBufferTests {
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); release(buffer);
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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)); assertThat("Invalid result", stringWriter.toString(), isSimilarTo(XML));
} }
} }

View File

@ -143,7 +143,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
@Test @Test
public void testXMLBasedConfig() { 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 // Section 7.5
@ -394,7 +394,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests {
StandardEvaluationContext societyContext = new StandardEvaluationContext(); StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE()); societyContext.setRootObject(new IEEE());
Inventor einstein = 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()); assertEquals("Albert Einstein", einstein.getName());
//create new inventor instance within add method of List //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); 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 @Test
public void testTemplating() throws Exception { public void testTemplating() throws Exception {
String randomPhrase = 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")); assertTrue(randomPhrase.startsWith("random number"));
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) { public void setAge(int age) {
this.age = age; this.age = age;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -41,4 +41,4 @@ public class ArrayContainer {
booleans[0] = true; booleans[0] = true;
floats[0] = 42.0f; floats[0] = 42.0f;
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -257,7 +257,7 @@ public class NamedParameterUtilsTests {
public void parseSqlStatementWithSingleLetterInBrackets() { public void parseSqlStatementWithSingleLetterInBrackets() {
String expectedSql = "select foo from bar where baz = b?z"; String expectedSql = "select foo from bar where baz = b?z";
String sql = "select foo from bar where baz = b:{p}z"; String sql = "select foo from bar where baz = b:{p}z";
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertEquals(1, parsedSql.getParameterNames().size()); assertEquals(1, parsedSql.getParameterNames().size());
assertEquals("p", parsedSql.getParameterNames().get(0)); assertEquals("p", parsedSql.getParameterNames().get(0));

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; this.birth_date = birth_date;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; this.balance = balance;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; this.someField = someField;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -64,4 +64,4 @@ public class Person {
this.balance = balanace; this.balance = balanace;
} }
} }

View File

@ -209,8 +209,8 @@ public class DataSourceTransactionManagerTests {
} }
final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds); final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds);
tm = new DataSourceTransactionManager(dsToUse); tm = new DataSourceTransactionManager(dsToUse);
TransactionTemplate tt = new TransactionTemplate(tm); TransactionTemplate tt = new TransactionTemplate(tm);
assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -104,4 +104,4 @@ public class MarshallingMessageConverterTests {
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -100,4 +100,4 @@ public class DestinationVariableMethodArgumentResolverTests {
String param3) { String param3) {
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -136,4 +136,4 @@ public class SimpAttributesContextHolderTests {
SimpAttributesContextHolder.currentAttributes(); SimpAttributesContextHolder.currentAttributes();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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(); verify(callback1, times(1)).run();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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()); assertEquals("/queue/foo-user123", ((StompHeaderAccessor) sentAccessor).getDestination());
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -146,7 +146,7 @@ public class BrokerMessageHandlerTests {
@Override @Override
public void publishEvent(ApplicationEvent event) { public void publishEvent(ApplicationEvent event) {
publishEvent((Object) event); publishEvent((Object) event);
} }
@Override @Override

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -229,4 +229,4 @@ public class NativeMessageHeaderAccessorTests {
headerAccessor.setImmutable(); headerAccessor.setImmutable();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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> {
assertThat("Marshaller writes invalid StreamResult", writer.toString(), isSimilarTo(EXPECTED_STRING)); assertThat("Marshaller writes invalid StreamResult", writer.toString(), isSimilarTo(EXPECTED_STRING));
} }
private static CompareMatcher isSimilarTo(final Object content) { private static CompareMatcher isSimilarTo(final Object content) {
return CompareMatcher.isSimilarTo(content) return CompareMatcher.isSimilarTo(content)
.ignoreWhitespace(); .ignoreWhitespace();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) { public void setValue(Integer value) {
this.value = value; this.value = value;
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,4 +29,4 @@ public class XmlRegObjectFactory {
public JAXBElement<Airplane> createAirplane(Airplane airplane) { public JAXBElement<Airplane> createAirplane(Airplane airplane) {
return new JAXBElement<>(new QName("brand-airplane"), Airplane.class, null, airplane); return new JAXBElement<>(new QName("brand-airplane"), Airplane.class, null, airplane);
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,4 +36,4 @@ interface ContextConfigurationTestInterface {
} }
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 @DirtiesContext
@SqlConfig(commentPrefix = "`", blockCommentStartDelimiter = "#$", blockCommentEndDelimiter = "$#", separator = "@@") @SqlConfig(commentPrefix = "`", blockCommentStartDelimiter = "#$", blockCommentEndDelimiter = "$#", separator = "@@")
interface SqlConfigTestInterface { interface SqlConfigTestInterface {
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 user beans required for these tests */
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,4 +36,4 @@ class PersonController {
return new Person("Wally"); return new Person("Wally");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,4 +33,4 @@ class WebConfig {
return new PersonController(); return new PersonController();
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); assertEquals("The bar method should have been wired via @Resource.", "Bar", this.bar);
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,4 +29,4 @@ public class DevProfileInitializer implements ApplicationContextInitializer<Gene
public void initialize(GenericApplicationContext applicationContext) { public void initialize(GenericApplicationContext applicationContext) {
applicationContext.getEnvironment().setActiveProfiles("dev"); applicationContext.getEnvironment().setActiveProfiles("dev");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,4 +29,4 @@ public class FooBarAliasInitializer implements ApplicationContextInitializer<Gen
public void initialize(GenericApplicationContext applicationContext) { public void initialize(GenericApplicationContext applicationContext) {
applicationContext.registerAlias("foo", "bar"); applicationContext.registerAlias("foo", "bar");
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,4 +31,4 @@ class BarConfig {
return "bar"; return "bar";
} }
} }

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,4 +32,4 @@ class DevProfileConfig {
public String baz() { public String baz() {
return "dev profile config"; return "dev profile config";
} }
} }

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