From c335e99e3f720337dd2a01b4c8ea9d34718b9854 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 8 Feb 2014 17:30:39 +0100 Subject: [PATCH] Remove trailing whitespace from source code --- .../AnnotationDrivenStaticEntityMockingControlTests.java | 2 +- .../cache/interceptor/CacheExpressionRootObject.java | 2 +- .../springframework/context/annotation/Spr11202Tests.java | 6 +++--- .../annotation/configuration/ImportResourceTests.java | 8 ++++---- .../annotation/subpackage/NonPublicAnnotatedClass.java | 2 +- .../core/annotation/subpackage/NonPublicAnnotation.java | 2 +- .../core/type/CachingMetadataReaderLeakTests.java | 2 +- .../springframework/expression/ConstructorResolver.java | 2 +- .../expression/common/TemplateAwareExpressionParser.java | 2 +- .../expression/spel/SpelParseException.java | 2 +- .../jdbc/datasource/DelegatingDataSourceTests.java | 2 +- .../handler/annotation/MessageExceptionHandler.java | 2 +- .../orm/jpa/SharedEntityManagerCreatorTests.java | 2 +- .../springframework/test/context/ContextHierarchy.java | 8 ++++---- .../springframework/test/context/MetaAnnotationUtils.java | 2 +- .../standard/DirtiesContextWithContextHierarchyTests.java | 2 +- .../InitializerWithoutConfigFilesOrClassesTests.java | 2 +- .../test/context/web/ServletContextAwareBean.java | 2 +- .../test/context/web/ServletContextAwareBeanWacTests.java | 4 ++-- .../springframework/mock/web/test/MockHttpSession.java | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java index a8fb3d16dc1..1dcf2e442b5 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java @@ -26,7 +26,7 @@ import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMo /** * Tests for Spring's static entity mocking framework (i.e., @{@link MockStaticEntityMethods} * and {@link AnnotationDrivenStaticEntityMockingControl}). - * + * * @author Rod Johnson * @author Ramnivas Laddad * @author Sam Brannen diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java index 84b5d0a1db7..b829752182c 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java @@ -24,7 +24,7 @@ import org.springframework.util.Assert; /** * Class describing the root object used during the expression evaluation. - * + * * @author Costin Leau * @author Sam Brannen * @since 3.1 diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java index b8a1204fdcc..7cc1d2ca41c 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java @@ -52,19 +52,19 @@ public class Spr11202Tests { context = new AnnotationConfigApplicationContext(Wrapper.class); assertEquals("foo", context.getBean("value")); } - + @Test // Passes public void testWithoutImporter() { context = new AnnotationConfigApplicationContext(Config.class); assertEquals("foo", context.getBean("value")); } - + @Configuration @Import(Selector.class) protected static class Wrapper { } - + protected static class Selector implements ImportSelector { @Override diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java index 304c37ab164..ae055bc0cf8 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java @@ -183,11 +183,11 @@ public class ImportResourceTests { reader=XmlBeanDefinitionReader.class) static class SubResourceConfig extends ImportNonXmlResourceConfig { } - + @Test public void importWithPlaceHolder() throws Exception { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - PropertySource propertySource = new MapPropertySource("test", + PropertySource propertySource = new MapPropertySource("test", Collections. singletonMap("test", "springframework")); ctx.getEnvironment().getPropertySources().addFirst(propertySource); ctx.register(ImportXmlConfig.class); @@ -199,6 +199,6 @@ public class ImportResourceTests { @ImportResource("classpath:org/${test}/context/annotation/configuration/ImportXmlConfig-context.xml") static class ImportWithPlaceHolder { } - - + + } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java b/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java index 7e79084ac88..8e97688aa78 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java @@ -18,7 +18,7 @@ package org.springframework.core.annotation.subpackage; /** * Class annotated with a non-public (i.e., package private) custom annotation. - * + * * @author Sam Brannen * @since 4.0 */ diff --git a/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java b/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java index 9f5e0d8892d..e59d14ba458 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java @@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; /** * Non-public (i.e., package private) custom annotation. - * + * * @author Sam Brannen * @since 4.0 */ diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java index f4ac6c3f96e..7eb323e9ac4 100644 --- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.*; * Unit tests for checking the behaviour of {@link CachingMetadataReaderFactory} under * load. If the cache is not controlled, this test should fail with an out of memory * exception around entry 5k. - * + * * @author Costin Leau * @author Sam Brannen */ diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java index d942978af9e..0019e8c3b15 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java @@ -24,7 +24,7 @@ import org.springframework.core.convert.TypeDescriptor; * A constructor resolver attempts locate a constructor and returns a ConstructorExecutor * that can be used to invoke that constructor. The ConstructorExecutor will be cached but * if it 'goes stale' the resolvers will be called again. - * + * * @author Andy Clement * @since 3.0 */ diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java index c74371e9981..1bfd482dd4c 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java @@ -28,7 +28,7 @@ import org.springframework.expression.ParserContext; /** * An expression parser that understands templates. It can be subclassed by expression * parsers that do not offer first class support for templating. - * + * * @author Keith Donald * @author Juergen Hoeller * @author Andy Clement diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java index 381e6c45003..b498c5f16d9 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java @@ -21,7 +21,7 @@ import org.springframework.expression.ParseException; * Root exception for Spring EL related exceptions. Rather than holding a hard coded * string indicating the problem, it records a message key and the inserts for the * message. See {@link SpelMessage} for the list of all possible messages that can occur. - * + * * @author Andy Clement * @since 3.0 */ diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java index 44b78d4c687..5782fc2e9ea 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java @@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.*; /** * Tests for {@link DelegatingDataSource}. - * + * * @author Phillip Webb */ public class DelegatingDataSourceTests { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java index 82615051611..843aba798e1 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; /** * Annotation for handling exceptions thrown from message-handling methods within a * specific handler class. - * + * * @author Rossen Stoyanchev * @since 4.0 */ diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java index e3ea70a0ccd..77aa6f2fc86 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.*; /** * Unit tests for {@link SharedEntityManagerCreator}. - * + * * @author Oliver Gierke */ public class SharedEntityManagerCreatorTests { diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java b/spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java index dd099d773cf..813fd306724 100644 --- a/spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java +++ b/spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java @@ -68,7 +68,7 @@ import java.lang.annotation.Target; * The result is that three application contexts will be loaded (one for each * declaration of {@code @ContextConfiguration}, and the application context * loaded based on the configuration in {@code AbstractWebTests} will be set as - * the parent context for each of the contexts loaded for the concrete subclasses. + * the parent context for each of the contexts loaded for the concrete subclasses. * * 
  * @RunWith(SpringJUnit4ClassRunner.class)
@@ -104,7 +104,7 @@ import java.lang.annotation.Target;
  *     @ContextConfiguration(name = "child",  locations = "/user-config.xml")
  * })
  * public class BaseTests {}
- * 
+ *
  * @ContextHierarchy(
  *     @ContextConfiguration(name = "child",  locations = "/order-config.xml")
  * )
@@ -116,7 +116,7 @@ import java.lang.annotation.Target;
  * by setting the {@link ContextConfiguration#inheritLocations} flag to {@code false}.
  * Consequently, the application context for {@code ExtendedTests} will be loaded
  * only from {@code "/test-user-config.xml"} and will have its parent set to the
- * context loaded from {@code "/app-config.xml"}. 
+ * context loaded from {@code "/app-config.xml"}.
  *
  * 
  * @RunWith(SpringJUnit4ClassRunner.class)
@@ -125,7 +125,7 @@ import java.lang.annotation.Target;
  *     @ContextConfiguration(name = "child",  locations = "/user-config.xml")
  * })
  * public class BaseTests {}
- * 
+ *
  * @ContextHierarchy(
  *     @ContextConfiguration(name = "child",  locations = "/test-user-config.xml", inheritLocations=false)
  * )
diff --git a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
index 4410dd137cf..0c215dc92a2 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
@@ -122,7 +122,7 @@ abstract class MetaAnnotationUtils {
 	 * the specified {@code clazz} itself) which declares at least one of the
 	 * specified {@code annotationTypes}, or {@code null} if none of the
 	 * specified annotation types could be found.
-	 * 
+	 *
 	 * 
This method traverses the annotations and superclasses of the specified
 	 * {@code clazz} if no annotation can be found on the given class itself.
 	 *
diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
index 95757b2cd79..2ef22eecaab 100644
--- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  *
  * 
Note that correct method execution order is essential, thus the use of
  * {@link FixMethodOrder}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java
index fac9b6491d1..b8f69b4a4d4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * Integration test that verifies support for {@link ApplicationContextInitializer
  * ApplicationContextInitializers} in the TestContext framework when the test class
  * declares neither XML configuration files nor annotated configuration classes.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
index 9b0be486b3c..89662fe8518 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
@@ -22,7 +22,7 @@ import org.springframework.web.context.ServletContextAware;
 
 /**
  * Introduced to investigate claims in SPR-11145.
- * 
+ *
  * @author Sam Brannen
  * @since 4.0.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java
index 1c9275d9fab..476535a2b92 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java
@@ -24,10 +24,10 @@ import static org.junit.Assert.*;
 
 /**
  * Introduced to investigate claims in SPR-11145.
- * 
+ *
  * 

  * Yes, this test class does in fact use JUnit to run JUnit. ;)
- * 
+ *
  * @author Sam Brannen
  * @since 4.0.2
  */
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
index 43357bd3141..d378ff051a4 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
@@ -235,7 +235,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Convenience method for asserting that this session has not been
 	 * {@linkplain #invalidate() invalidated}.
-	 * 
+	 *
 	 * @throws IllegalStateException if this session has been invalidated
 	 */
 	private void assertIsValid() {