Browse Source

Remove trailing whitespace from source code

pull/458/head
Sam Brannen 12 years ago
parent
commit
c335e99e3f
  1. 2
      spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java
  2. 2
      spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java
  3. 6
      spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java
  4. 8
      spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
  5. 2
      spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java
  6. 2
      spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java
  7. 2
      spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java
  8. 2
      spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
  9. 2
      spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
  10. 2
      spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
  11. 2
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java
  12. 2
      spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java
  13. 2
      spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java
  14. 8
      spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java
  15. 2
      spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
  16. 2
      spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
  17. 2
      spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java
  18. 2
      spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
  19. 4
      spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java
  20. 2
      spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java

2
spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java

@ -26,7 +26,7 @@ import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMo @@ -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

2
spring-context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java vendored

@ -24,7 +24,7 @@ import org.springframework.util.Assert; @@ -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

6
spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java

@ -52,19 +52,19 @@ public class Spr11202Tests { @@ -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

8
spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java

@ -183,11 +183,11 @@ public class ImportResourceTests { @@ -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.<String, Object> singletonMap("test", "springframework"));
ctx.getEnvironment().getPropertySources().addFirst(propertySource);
ctx.register(ImportXmlConfig.class);
@ -199,6 +199,6 @@ public class ImportResourceTests { @@ -199,6 +199,6 @@ public class ImportResourceTests {
@ImportResource("classpath:org/${test}/context/annotation/configuration/ImportXmlConfig-context.xml")
static class ImportWithPlaceHolder {
}
}

2
spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java

@ -18,7 +18,7 @@ package org.springframework.core.annotation.subpackage; @@ -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
*/

2
spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java

@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; @@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;
/**
* Non-public (i.e., package private) custom annotation.
*
*
* @author Sam Brannen
* @since 4.0
*/

2
spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java

@ -34,7 +34,7 @@ import static org.junit.Assert.*; @@ -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
*/

2
spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java

@ -24,7 +24,7 @@ import org.springframework.core.convert.TypeDescriptor; @@ -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
*/

2
spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java

@ -28,7 +28,7 @@ import org.springframework.expression.ParserContext; @@ -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

2
spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java

@ -21,7 +21,7 @@ import org.springframework.expression.ParseException; @@ -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
*/

2
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java

@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.*; @@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.*;
/**
* Tests for {@link DelegatingDataSource}.
*
*
* @author Phillip Webb
*/
public class DelegatingDataSourceTests {

2
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java

@ -26,7 +26,7 @@ import java.lang.annotation.Target; @@ -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
*/

2
spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java

@ -26,7 +26,7 @@ import static org.mockito.Mockito.*; @@ -26,7 +26,7 @@ import static org.mockito.Mockito.*;
/**
* Unit tests for {@link SharedEntityManagerCreator}.
*
*
* @author Oliver Gierke
*/
public class SharedEntityManagerCreatorTests {

8
spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java

@ -68,7 +68,7 @@ import java.lang.annotation.Target; @@ -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.
*
* <pre class="code">
* &#064;RunWith(SpringJUnit4ClassRunner.class)
@ -104,7 +104,7 @@ import java.lang.annotation.Target; @@ -104,7 +104,7 @@ import java.lang.annotation.Target;
* &#064;ContextConfiguration(name = "child", locations = "/user-config.xml")
* })
* public class BaseTests {}
*
*
* &#064;ContextHierarchy(
* &#064;ContextConfiguration(name = "child", locations = "/order-config.xml")
* )
@ -116,7 +116,7 @@ import java.lang.annotation.Target; @@ -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"}.
*
* <pre class="code">
* &#064;RunWith(SpringJUnit4ClassRunner.class)
@ -125,7 +125,7 @@ import java.lang.annotation.Target; @@ -125,7 +125,7 @@ import java.lang.annotation.Target;
* &#064;ContextConfiguration(name = "child", locations = "/user-config.xml")
* })
* public class BaseTests {}
*
*
* &#064;ContextHierarchy(
* &#064;ContextConfiguration(name = "child", locations = "/test-user-config.xml", inheritLocations=false)
* )

2
spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java

@ -122,7 +122,7 @@ abstract class MetaAnnotationUtils { @@ -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.
*
*
* <p>This method traverses the annotations and superclasses of the specified
* {@code clazz} if no annotation can be found on the given class itself.
*

2
spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java

@ -39,7 +39,7 @@ import static org.junit.Assert.*; @@ -39,7 +39,7 @@ import static org.junit.Assert.*;
*
* <p>Note that correct method execution order is essential, thus the use of
* {@link FixMethodOrder}.
*
*
* @author Sam Brannen
* @since 3.2.2
*/

2
spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java

@ -33,7 +33,7 @@ import static org.junit.Assert.*; @@ -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
*/

2
spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java

@ -22,7 +22,7 @@ import org.springframework.web.context.ServletContextAware; @@ -22,7 +22,7 @@ import org.springframework.web.context.ServletContextAware;
/**
* Introduced to investigate claims in SPR-11145.
*
*
* @author Sam Brannen
* @since 4.0.2
*/

4
spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java

@ -24,10 +24,10 @@ import static org.junit.Assert.*; @@ -24,10 +24,10 @@ import static org.junit.Assert.*;
/**
* Introduced to investigate claims in SPR-11145.
*
*
* <p>
* Yes, this test class does in fact use JUnit to run JUnit. ;)
*
*
* @author Sam Brannen
* @since 4.0.2
*/

2
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java

@ -235,7 +235,7 @@ public class MockHttpSession implements HttpSession { @@ -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() {

Loading…
Cancel
Save