From 043a41e3825773affc4af1fde5b08c147697260f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 26 Nov 2013 14:55:51 -0800 Subject: [PATCH] Consistent whitespace after imports Update code to have a consistent number of new-line characters after import statements. --- .../AspectJAdviceParameterNameDiscoverAnnotationTests.java | 1 - .../aop/aspectj/TigerAspectJExpressionPointcutTests.java | 1 - .../aop/aspectj/annotation/AspectJPointcutAdvisorTests.java | 1 - .../aop/aspectj/annotation/AspectMetadataTests.java | 1 - .../aop/framework/adapter/ThrowsAdviceInterceptorTests.java | 1 - .../java/org/springframework/aop/support/AopUtilsTests.java | 1 - .../springframework/aop/support/ControlFlowPointcutTests.java | 1 - .../aop/support/NameMatchMethodPointcutTests.java | 1 - .../support/RegexpMethodPointcutAdvisorIntegrationTests.java | 1 - .../aop/target/HotSwappableTargetSourceTests.java | 2 -- .../springframework/aop/target/PrototypeTargetSourceTests.java | 1 - .../aop/target/ThreadLocalTargetSourceTests.java | 1 - .../org/springframework/tests/aop/advice/MyThrowsHandler.java | 1 - .../tests/aop/advice/TimestampIntroductionAdvisor.java | 1 - .../tests/aop/interceptor/SerializableNopInterceptor.java | 1 - .../springframework/cache/aspectj/AspectJAnnotationTests.java | 1 - .../AnnotationDrivenStaticEntityMockingControlTest.java | 1 - .../src/test/java/org/springframework/beans/BeanUtilsTests.java | 1 - .../test/java/org/springframework/beans/BeanWrapperTests.java | 1 - .../org/springframework/beans/MutablePropertyValuesTests.java | 1 - .../springframework/beans/factory/BeanFactoryUtilsTests.java | 1 - .../springframework/beans/factory/SharedBeanRegistryTests.java | 1 - .../beans/factory/config/FieldRetrievingFactoryBeanTests.java | 1 - .../beans/factory/config/PropertyPathFactoryBeanTests.java | 1 - .../factory/config/PropertyPlaceholderConfigurerTests.java | 2 -- .../beans/factory/config/PropertyResourceConfigurerTests.java | 1 - .../springframework/beans/factory/config/SimpleScopeTests.java | 1 - .../beans/factory/support/BeanDefinitionBuilderTests.java | 1 - .../beans/factory/support/BeanDefinitionTests.java | 1 - .../factory/support/DefinitionMetadataEqualsHashCodeTests.java | 1 - .../factory/support/PropertiesBeanDefinitionReaderTests.java | 1 - .../beans/factory/wiring/BeanConfigurerSupportTests.java | 1 - .../beans/factory/xml/AbstractBeanFactoryTests.java | 1 - .../beans/factory/xml/AbstractListableBeanFactoryTests.java | 1 - .../beans/factory/xml/AutowireWithExclusionTests.java | 1 - .../beans/factory/xml/CollectionMergingTests.java | 1 - .../beans/factory/xml/CollectionsWithDefaultTypesTests.java | 1 - .../beans/factory/xml/ConstructorDependenciesBean.java | 1 - .../org/springframework/beans/factory/xml/CountingFactory.java | 1 - .../springframework/beans/factory/xml/DuplicateBeanIdTests.java | 2 -- .../org/springframework/beans/factory/xml/FactoryMethods.java | 1 - .../factory/xml/NestedBeansElementAttributeRecursionTests.java | 1 - .../beans/factory/xml/SchemaValidationTests.java | 1 - .../factory/xml/SimpleConstructorNamespaceHandlerTests.java | 1 - .../beans/factory/xml/SimplePropertyNamespaceHandlerTests.java | 1 - .../beans/factory/xml/XmlBeanCollectionTests.java | 1 - .../beans/factory/xml/XmlListableBeanFactoryTests.java | 1 - .../beans/propertyeditors/CustomEditorTests.java | 1 - .../tests/beans/CollectingReaderEventListener.java | 1 - .../org/springframework/tests/sample/beans/DummyFactory.java | 1 - .../tests/sample/beans/GenericSetOfIntegerBean.java | 1 - .../tests/sample/beans/factory/DummyFactory.java | 1 - .../springframework/context/annotation/ConfigurationClass.java | 1 - .../org/springframework/context/annotation/ImportResource.java | 1 - .../aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java | 1 - .../org/springframework/aop/aspectj/autoproxy/_TestTypes.java | 1 - .../aop/aspectj/autoproxy/spr3064/SPR3064Tests.java | 1 - .../annotation/AbstractCircularImportDetectionTests.java | 1 - .../java/org/springframework/context/annotation/BeanAge.java | 1 - .../ConfigurationWithFactoryBeanAndParametersTests.java | 1 - .../annotation/InvalidConfigurationClassDefinitionTests.java | 1 - .../configuration/ConfigurationClassAspectIntegrationTests.java | 1 - .../context/annotation/configuration/ImportTests.java | 1 - .../context/annotation/configuration/spr8955/Spr8955Tests.java | 1 - .../context/annotation/spr10546/ImportedConfig.java | 1 - .../context/annotation/spr10546/ParentConfig.java | 1 - .../annotation/spr10546/ParentWithComponentScanConfig.java | 1 - .../context/annotation/spr10546/ParentWithImportConfig.java | 1 - .../annotation/spr10546/ParentWithImportResourceConfig.java | 1 - .../context/annotation/spr10546/ParentWithParentConfig.java | 1 - .../context/annotation/spr10546/Spr10546Tests.java | 1 - .../annotation/spr10546/scanpackage/AEnclosingConfig.java | 1 - .../context/expression/EnvironmentAccessorIntegrationTests.java | 1 - .../support/EnvironmentSecurityManagerIntegrationTests.java | 1 - .../test/java/org/springframework/context/support/Logic.java | 1 - .../java/org/springframework/jndi/SimpleNamingContextTests.java | 1 - spring-context/src/test/java/test/mixin/LockMixin.java | 1 - .../src/main/java/org/springframework/util/MimeType.java | 1 - .../src/main/java/org/springframework/util/StreamUtils.java | 1 - .../org/springframework/core/SerializableTypeWrapperTests.java | 1 - .../core/StandardReflectionParameterNameDiscoverTests.java | 1 - .../org/springframework/core/env/StandardEnvironmentTests.java | 1 - .../org/springframework/tests/sample/objects/GenericObject.java | 1 - .../src/test/java/org/springframework/util/MimeTypeTests.java | 1 - .../org/springframework/expression/spel/SpelParseException.java | 1 - .../java/org/springframework/expression/spel/SetValueTests.java | 1 - .../expression/spel/VariableAndFunctionTests.java | 1 - .../jdbc/datasource/embedded/ConnectionProperties.java | 1 - .../core/AbstractDestinationResolvingMessagingTemplate.java | 1 - .../messaging/core/AbstractMessageSendingTemplate.java | 1 - .../messaging/core/AbstractMessagingTemplate.java | 1 - .../handler/method/AbstractExceptionHandlerMethodResolver.java | 1 - .../method/HandlerMethodReturnValueHandlerComposite.java | 1 - .../springframework/messaging/simp/BrokerAvailabilityEvent.java | 1 - .../messaging/simp/config/StompBrokerRelayRegistration.java | 1 - .../support/AnnotationExceptionHandlerMethodResolverTests.java | 1 - .../annotation/support/HeaderMethodArgumentResolverTests.java | 1 - .../annotation/support/HeadersMethodArgumentResolverTests.java | 1 - .../annotation/support/PayloadArgumentResolverTests.java | 1 - .../java/org/springframework/messaging/simp/TestPrincipal.java | 1 - .../annotation/support/SendToMethodReturnValueHandlerTests.java | 1 - .../support/SubscriptionMethodReturnValueHandlerTests.java | 1 - .../messaging/simp/config/MessageBrokerConfigurationTests.java | 1 - .../simp/handler/DefaultSubscriptionRegistryTests.java | 1 - .../messaging/simp/handler/DefaultUserSessionRegistryTests.java | 1 - .../simp/handler/SimpAnnotationMethodMessageHandlerTests.java | 1 - .../messaging/simp/handler/SimpleBrokerMessageHandlerTests.java | 1 - .../springframework/messaging/simp/stomp/StompCodecTests.java | 1 - .../messaging/simp/stomp/StompHeaderAccessorTests.java | 1 - .../springframework/messaging/support/MessageBuilderTests.java | 1 - .../messaging/support/MessageHeaderAccessorTests.java | 1 - .../messaging/support/NativeMessageHeaderAccessorTests.java | 1 - .../support/converter/AbstractMessageConverterTests.java | 1 - .../support/converter/DefaultContentTypeResolverTests.java | 1 - .../support/converter/MappingJackson2MessageConverterTests.java | 1 - .../support/converter/StringMessageConverterTests.java | 1 - .../orm/hibernate3/support/OpenSessionInViewTests.java | 1 - .../java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java | 1 - .../test/util/JsonPathExpectationsHelperTests.java | 1 - .../client/samples/matchers/XmlContentRequestMatcherTests.java | 1 - .../test/web/servlet/samples/context/JavaConfigTests.java | 1 - .../test/web/servlet/setup/StandaloneMockMvcBuilderTests.java | 1 - .../web/context/request/async/AsyncWebRequest.java | 1 - .../support/ServletContextPropertyPlaceholderConfigurer.java | 1 - .../web/method/annotation/ExceptionHandlerMethodResolver.java | 1 - .../web/bind/support/WebRequestDataBinderIntegrationTests.java | 1 - .../annotation/RequestParamMethodArgumentResolverTests.java | 1 - .../test/java/org/springframework/web/util/TagUtilsTests.java | 1 - .../web/servlet/view/tiles3/SimpleSpringPreparerFactory.java | 1 - .../web/servlet/mvc/condition/NameValueExpression.java | 1 - .../web/servlet/mvc/condition/RequestConditionHolder.java | 1 - .../web/servlet/view/velocity/VelocityToolboxViewTests.java | 1 - .../web/servlet/view/velocity/VelocityViewResolverTests.java | 1 - .../socket/server/config/DelegatingWebSocketConfiguration.java | 1 - .../web/socket/AbstractWebSocketIntegrationTests.java | 1 - .../springframework/web/socket/JettyWebSocketTestServer.java | 1 - .../springframework/web/socket/TomcatWebSocketTestServer.java | 1 - .../web/socket/client/jetty/JettyWebSocketClientTests.java | 1 - .../socket/messaging/SimpAnnotationMethodIntegrationTests.java | 1 - .../web/socket/messaging/StompTextMessageBuilder.java | 1 - .../web/socket/messaging/SubProtocolWebSocketHandlerTests.java | 1 - .../messaging/config/WebMvcStompEndpointRegistrationTests.java | 1 - .../messaging/config/WebMvcStompEndpointRegistryTests.java | 1 - .../config/WebSocketMessageBrokerConfigurationSupportTests.java | 1 - .../web/socket/server/DefaultHandshakeHandlerTests.java | 1 - .../config/AbstractWebSocketHandlerRegistrationTests.java | 1 - .../web/socket/server/config/WebSocketConfigurationTests.java | 1 - .../socket/server/support/HandshakeInterceptorChainTests.java | 1 - .../server/support/HttpSessionHandshakeInterceptorTests.java | 1 - .../org/springframework/web/socket/support/TestPrincipal.java | 1 - 150 files changed, 153 deletions(-) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java index 5efbb2f893a..955feeb7c5d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java @@ -22,7 +22,6 @@ import java.lang.annotation.RetentionPolicy; import org.aspectj.lang.ProceedingJoinPoint; import org.junit.Test; - /** * Additional parameter name discover tests that need Java 5. * Yes this will re-run the tests from the superclass, but that diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java index bc9f1b4f626..dc48ec3b3ee 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java @@ -31,7 +31,6 @@ import test.annotation.EmptySpringAnnotation; import test.annotation.transaction.Tx; import org.springframework.tests.sample.beans.TestBean; - /** * Java5-specific {@link AspectJExpressionPointcutTests}. * diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index 966d289eb13..60d370e3ef3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -27,7 +27,6 @@ import org.springframework.aop.framework.AopConfigException; import test.aop.PerTargetAspect; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java index af55e122a63..9ae67ea71d8 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java @@ -25,7 +25,6 @@ import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryT import test.aop.PerTargetAspect; - /** * @since 2.0 * @author Rod Johnson diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index f2224a4134d..667652f3ef6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -31,7 +31,6 @@ import org.springframework.tests.aop.advice.MethodCounter; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java index 01be11617ea..79501c9ae71 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java @@ -32,7 +32,6 @@ import org.springframework.tests.aop.interceptor.NopInterceptor; import org.springframework.tests.sample.beans.TestBean; import org.springframework.util.SerializationTestUtils; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java index be21c52d2aa..a64e78c26f5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java @@ -26,7 +26,6 @@ import org.springframework.tests.aop.interceptor.NopInterceptor; import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java index 5edde823dbc..6a027d6ecd8 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java @@ -30,7 +30,6 @@ import org.springframework.tests.sample.beans.Person; import org.springframework.tests.sample.beans.SerializablePerson; import org.springframework.util.SerializationTestUtils; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java index 4a3d04cbd8f..b21073601ba 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java @@ -31,7 +31,6 @@ import org.springframework.tests.sample.beans.Person; import org.springframework.tests.sample.beans.TestBean; import org.springframework.util.SerializationTestUtils; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java index a4bb0c2554b..0fef2f1b3eb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java @@ -36,8 +36,6 @@ import org.springframework.tests.sample.beans.SerializablePerson; import org.springframework.tests.sample.beans.SideEffectBean; import org.springframework.util.SerializationTestUtils; - - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java index 67c7b980811..99079185f7a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java @@ -28,7 +28,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.SideEffectBean; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java index b8976f1958a..f9f096052d6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java @@ -29,7 +29,6 @@ import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.SideEffectBean; - /** * @author Rod Johnson * @author Chris Beams diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java index cb2d10d6ab6..4e5f8ecc3fe 100644 --- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java +++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java @@ -9,7 +9,6 @@ import java.rmi.RemoteException; import org.springframework.aop.ThrowsAdvice; - @SuppressWarnings("serial") public class MyThrowsHandler extends MethodCounter implements ThrowsAdvice { // Full method signature diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java index 0fa9d4b4da9..353e9a783dc 100644 --- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java +++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java @@ -20,7 +20,6 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor; import org.springframework.aop.support.DefaultIntroductionAdvisor; import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor; - /** * * @author Rod Johnson diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java index 8c72878c9df..f6f42fe00b4 100644 --- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java +++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java @@ -18,7 +18,6 @@ package org.springframework.tests.aop.interceptor; import java.io.Serializable; - /** * Subclass of NopInterceptor that is serializable and * can be used to test proxy serialization. diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java index 9dece28ea67..e23fa61ee76 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java @@ -28,7 +28,6 @@ import org.springframework.cache.config.CacheableService; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; - /** * @author Costin Leau */ diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java index 5a531301c9a..d0340610bb2 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; - /** * Test for static entity mocking framework. * @author Rod Johnson diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java index b35e6aabf75..e0149909e76 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -33,7 +33,6 @@ import org.springframework.tests.sample.beans.DerivedTestBean; import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.TestBean; - /** * Unit tests for {@link BeanUtils}. * diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index 17dcfd65345..3d1eede171d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -67,7 +67,6 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java index bc53e02ae2f..20e3e3e71c2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java @@ -20,7 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - /** * Tests for {@link MutablePropertyValues}. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index 553f9cef46d..087f3c6e1aa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -39,7 +39,6 @@ import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.factory.DummyFactory; import org.springframework.util.ObjectUtils; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java index e422accf4b7..78015d18e8d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry; import org.springframework.tests.sample.beans.DerivedTestBean; import org.springframework.tests.sample.beans.TestBean; - /** * @author Juergen Hoeller * @author Chris Beams diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java index 66226340aa4..4402696093e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.TestBean; - /** * Unit tests for {@link FieldRetrievingFactoryBean}. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java index ce21ee90954..e8cb71a8f05 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java @@ -29,7 +29,6 @@ import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.TestBean; - /** * Unit tests for {@link PropertyPathFactoryBean}. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java index 63e49fb18bf..9bb77ce81a0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java @@ -38,8 +38,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.TestBean; - - /** * Unit tests for {@link PropertyPlaceholderConfigurer}. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index fab64afdcb5..af139ae6093 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -52,7 +52,6 @@ import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.IndexedTestBean; import org.springframework.tests.sample.beans.TestBean; - /** * Unit tests for various {@link PropertyResourceConfigurer} implementations including: * {@link PropertyPlaceholderConfigurer}, {@link PropertyOverrideConfigurer} and diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 0a561dd3360..b679c99298d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.Resource; import org.springframework.tests.sample.beans.TestBean; - /** * Simple test to illustrate and verify scope usage. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java index 48bd97d15b1..a1cb02b6a33 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java index 11aed3fa64c..a81e3c8d690 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java @@ -22,7 +22,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.tests.sample.beans.TestBean; - /** * @author Juergen Hoeller */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java index f9f1beba04a..30fd06ea72e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java @@ -22,7 +22,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java index d62e43d0601..21c66d1d0e2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java index 7b039cc6608..835269ea82b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java @@ -25,7 +25,6 @@ import org.springframework.tests.sample.beans.TestBean; import static org.mockito.BDDMockito.*; - /** * @author Rick Evans * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java index 3d88251b7e1..e56ea1f355d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java @@ -34,7 +34,6 @@ import org.springframework.tests.sample.beans.MustBeInitialized; import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.factory.DummyFactory; - /** * Subclasses must implement setUp() to initialize bean factory * and any other variables they need. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java index 4c1ac580bb9..30c060cfaad 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java index ae6232f40ff..dd17fe369c2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java index a9294e05fd1..6c002d565d5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java @@ -29,7 +29,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * Unit and integration tests for the collection merging support. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java index 3a88ab9fa8f..09e843a979f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java index 082fc418b0e..a98e99ef102 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java @@ -21,7 +21,6 @@ import java.io.Serializable; import org.springframework.tests.sample.beans.IndexedTestBean; import org.springframework.tests.sample.beans.TestBean; - /** * Simple bean used to check constructor dependency checking. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java index 7b02d0bed29..8a0a02028f8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java @@ -19,7 +19,6 @@ package org.springframework.beans.factory.xml; import org.springframework.beans.factory.FactoryBean; import org.springframework.tests.sample.beans.TestBean; - /** * @author Juergen Hoeller */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java index bd92b0c3916..e4ecd51ffe2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java @@ -25,8 +25,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - - /** * With Spring 3.1, bean id attributes (and all other id attributes across the * core schemas) are no longer typed as xsd:id, but as xsd:string. This allows diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java index ba8c74bfe96..eb7113448b3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java @@ -21,7 +21,6 @@ import java.util.List; import org.springframework.tests.sample.beans.TestBean; - /** * Test class for Spring's ability to create objects using static * factory methods, rather than constructors. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java index 5b9ddc18e66..254cd828749 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * Tests for propagating enclosing beans element defaults to nested beans elements. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java index 17552b1d591..27acaa17ff9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java @@ -24,7 +24,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java index 601afa44fbe..ee3a808bac5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java @@ -25,7 +25,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.DummyBean; import org.springframework.tests.sample.beans.TestBean; - /** * @author Costin Leau */ diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java index 45e89564e72..ea763bf5cdc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java @@ -25,7 +25,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.TestBean; - /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 6960653ea6e..34ad354b14e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -45,7 +45,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.HasMap; import org.springframework.tests.sample.beans.TestBean; - /** * Tests for collections in XML bean definitions. * diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 2fd60f7a0e0..011d727e94e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -33,7 +33,6 @@ import org.springframework.tests.sample.beans.LifecycleBean; import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.factory.DummyFactory; - /** * @author Juergen Hoeller * @since 09.11.2003 diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index af590e3936b..d60dab8743b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -50,7 +50,6 @@ import org.springframework.tests.sample.beans.IndexedTestBean; import org.springframework.tests.sample.beans.NumberTestBean; import org.springframework.tests.sample.beans.TestBean; - /** * Unit tests for the various PropertyEditors in Spring. * diff --git a/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java index b581a05f032..b7fa67912c1 100644 --- a/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java +++ b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java @@ -44,7 +44,6 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); - @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java index dc08778c536..35e52d6d506 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.tests.sample.beans.TestBean; - /** * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory. * Depending on whether its singleton property is set, it will return a singleton diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java index a0fee60195d..3c332a5046b 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java @@ -18,7 +18,6 @@ package org.springframework.tests.sample.beans; import java.util.Set; - /** * @author Juergen Hoeller */ diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java index b562f569fa0..fa2cb3dc1ed 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.tests.sample.beans.TestBean; - /** * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory. * Depending on whether its singleton property is set, it will return a singleton diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java index 63299fa4865..1da728c9f22 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java @@ -64,7 +64,6 @@ final class ConfigurationClass { private final Set importBeanDefinitionRegistrars = new LinkedHashSet(); - /** * Create a new {@link ConfigurationClass} with the given name. * @param metadataReader reader used to parse the underlying {@link Class} diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java b/spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java index 159ba67b647..16506965d9b 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ImportResource.java @@ -25,7 +25,6 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.support.BeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; - /** * Indicates one or more resources containing bean definitions to import. * diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index c5b7c8c5cf4..0fbf3b87d73 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.Resource; - /** * @author Adrian Colyer * @author Juergen Hoeller diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java index 8060defdbf3..45f9b1ba4e7 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java @@ -21,7 +21,6 @@ import java.lang.annotation.RetentionPolicy; import org.aspectj.lang.ProceedingJoinPoint; - /** * Definitions of testing types for use in within this package. * Wherever possible, test types should be defined local to the java diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java index 9d47785b853..791132c596f 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java @@ -26,7 +26,6 @@ import org.aspectj.lang.annotation.Aspect; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; - /** * @author Adrian Colyer * @author Chris Beams diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java index e3ed03301f4..8f7026a9560 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Import; import org.springframework.tests.sample.beans.TestBean; - /** * TCK-style unit tests for handling circular use of the {@link Import} annotation. Explore * subclass hierarchy for specific concrete implementations. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java index 7d53b3a2cd5..7d885c56973 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanAge.java @@ -7,7 +7,6 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Qualifier; - @Target({ElementType.METHOD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Qualifier diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java index 570d2a53aac..246cdf3d857 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java @@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; - /** * Test case cornering the bug initially raised with SPR-8762, in which a * NullPointerException would be raised if a FactoryBean-returning @Bean method also diff --git a/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java index 8e3e909b273..2f999dd93e5 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ConfigurationClassPostProcessor; - /** * Unit tests covering cases where a user defines an invalid Configuration * class, e.g.: forgets to annotate with {@link Configuration} or declares diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java index f846eb2632c..297946c5ea0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java @@ -33,7 +33,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.tests.sample.beans.TestBean; - /** * System tests covering use of AspectJ {@link Aspect}s in conjunction with {@link Configuration} classes. * {@link Bean} methods may return aspects, or Configuration classes may themselves be annotated with Aspect. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java index c39cff7977b..fc89e709d1a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java @@ -31,7 +31,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ConfigurationClassPostProcessor; import org.springframework.context.annotation.Import; - /** * System tests for {@link Import} annotation support. * diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/spr8955/Spr8955Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/spr8955/Spr8955Tests.java index c8b6fa4dea9..396c402366a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/spr8955/Spr8955Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/spr8955/Spr8955Tests.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.configuration.spr8955; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; - /** * @author Chris Beams * @author Willem Dekker diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java index f20e79eb7e5..c5aca0181ef 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.spr10546; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java index 884622e22d9..f2a1d3ff994 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.spr10546; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java index bd6c7b4977a..ce649e709dc 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java @@ -20,7 +20,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.spr10546.scanpackage.AEnclosingConfig; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java index 450d13fbad3..4b7cde7e81b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.spr10546; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java index e05f4134eca..7dd7ed72ead 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.spr10546; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java index dcaaa3b5b2a..8e69103d4b4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java @@ -18,7 +18,6 @@ package org.springframework.context.annotation.spr10546; import org.springframework.context.annotation.Configuration; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java index 59dac470a21..a041f8871db 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java @@ -27,7 +27,6 @@ import org.springframework.context.annotation.spr10546.scanpackage.AEnclosingCon import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; - /** * * @author Rob Winch diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java index 3c8c091222f..0b0bb64ed79 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java @@ -19,7 +19,6 @@ package org.springframework.context.annotation.spr10546.scanpackage; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.spr10546.ParentConfig; - /** * Note the name of {@link AEnclosingConfig} is chosen to help ensure scanning picks up * the enclosing configuration prior to {@link ChildConfig} to demonstrate this can happen diff --git a/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java index 152cf5d758d..87267fab3af 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java @@ -28,7 +28,6 @@ import org.springframework.mock.env.MockPropertySource; import org.springframework.tests.sample.beans.TestBean; - /** * Integration tests for {@link EnvironmentAccessor}, which is registered with * SpEL for all {@link AbstractApplicationContext} implementations via diff --git a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java index 42647392832..474b5943392 100644 --- a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java @@ -35,7 +35,6 @@ import org.springframework.core.env.AbstractEnvironment; import org.springframework.core.env.StandardEnvironmentTests; import org.springframework.stereotype.Component; - /** * Tests integration between Environment and SecurityManagers. See SPR-9970. * diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java index aed08c5dbd6..0a81b8e8972 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Logic.java +++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java @@ -18,7 +18,6 @@ package org.springframework.context.support; import org.springframework.beans.factory.BeanNameAware; - public class Logic implements BeanNameAware { private String name; diff --git a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java index 917e8dc918f..51ea8e86af6 100644 --- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java @@ -40,7 +40,6 @@ import org.springframework.tests.mock.jndi.SimpleNamingContextBuilder; import static org.junit.Assert.*; - /** * @author Juergen Hoeller * @author Chris Beams diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java index e9463cdc9b8..b2bad3094db 100644 --- a/spring-context/src/test/java/test/mixin/LockMixin.java +++ b/spring-context/src/test/java/test/mixin/LockMixin.java @@ -19,7 +19,6 @@ package test.mixin; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.support.DelegatingIntroductionInterceptor; - /** * Mixin to provide stateful locking functionality. * Test/demonstration of AOP mixin support rather than a diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java index 5ef5a7705db..05bbb8d324a 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeType.java +++ b/spring-core/src/main/java/org/springframework/util/MimeType.java @@ -27,7 +27,6 @@ import java.util.Locale; import java.util.Map; import java.util.TreeSet; - /** * Represents a MIME Type, as originally defined in RFC 2046 and subsequently used in * other Internet protocols including HTTP. This class however does not contain support diff --git a/spring-core/src/main/java/org/springframework/util/StreamUtils.java b/spring-core/src/main/java/org/springframework/util/StreamUtils.java index cc3107d81ff..0556c71e8ce 100644 --- a/spring-core/src/main/java/org/springframework/util/StreamUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StreamUtils.java @@ -27,7 +27,6 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.Charset; - /** * Simple utility methods for dealing with streams. The copy methods of this class are * similar to those defined in {@link FileCopyUtils} except that all affected streams are diff --git a/spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java b/spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java index 530cc5e8a16..bf0385380a6 100644 --- a/spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java +++ b/spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java @@ -35,7 +35,6 @@ import org.junit.Test; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; - /** * Tests for {@link SerializableTypeWrapper}. * diff --git a/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java b/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java index 4e0a2ce0a76..7055fc86442 100644 --- a/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java +++ b/spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java @@ -24,7 +24,6 @@ import java.lang.reflect.Method; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; - /** * Tests for StandardReflectionParameterNameDiscoverer * diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java index 131917c8ccf..70f3effd0b7 100644 --- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java @@ -28,7 +28,6 @@ import java.util.Map; import org.junit.Test; import org.springframework.mock.env.MockPropertySource; - import static java.lang.String.*; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; diff --git a/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java index efd0455fdcb..c19c4782294 100644 --- a/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java +++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java @@ -20,7 +20,6 @@ import java.util.List; import org.springframework.core.io.Resource; - public class GenericObject { private List resourceList; diff --git a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java index f8d767a1978..50988460c73 100644 --- a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java +++ b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java @@ -28,7 +28,6 @@ import org.springframework.core.convert.support.DefaultConversionService; import static org.junit.Assert.*; - /** * @author Arjen Poutsma * @author Juergen Hoeller 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 2a623ddccce..381e6c45003 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 @@ -17,7 +17,6 @@ package org.springframework.expression.spel; 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 diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java index 38ac64801be..4f27e433d54 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java @@ -32,7 +32,6 @@ import org.springframework.expression.ParseException; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.testresources.PlaceOfBirth; - /** * Tests set value expressions. * diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java index 78b3dfbede9..65007ab5679 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; - /** * Tests the evaluation of expressions that access variables and functions (lambda/java). * diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java index b97bec09676..6eaa338fc4e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java @@ -18,7 +18,6 @@ package org.springframework.jdbc.datasource.embedded; import java.sql.Driver; - /** * DataSourceFactory helper that allows essential JDBC connection properties to be configured consistently, * independent of the actual DataSource implementation. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java index 7e4ed06ae71..ca77be8d98b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java @@ -20,7 +20,6 @@ import java.util.Map; import org.springframework.messaging.Message; import org.springframework.util.Assert; - /** * Base class for a messaging template that can resolve String-based destinations. * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java index 52d6ec94934..6595609c722 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java @@ -26,7 +26,6 @@ import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.messaging.support.converter.SimpleMessageConverter; import org.springframework.util.Assert; - /** * Base class for templates that support sending messages. * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java index aeef5cb26b8..ab9c7b518d9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java @@ -20,7 +20,6 @@ import java.util.Map; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; - /** * Base class for a messaging template that send and receive messages. * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/method/AbstractExceptionHandlerMethodResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/method/AbstractExceptionHandlerMethodResolver.java index 75d1d2495e9..f0cf215cd39 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/method/AbstractExceptionHandlerMethodResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/method/AbstractExceptionHandlerMethodResolver.java @@ -24,7 +24,6 @@ import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.ConcurrentHashMap; - /** * Cache exception handling method mappings and provide options to look up a method * that should handle an exception. If multiple methods match, they are sorted using diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/method/HandlerMethodReturnValueHandlerComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/method/HandlerMethodReturnValueHandlerComposite.java index 299e22430ed..322fcbbb278 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/method/HandlerMethodReturnValueHandlerComposite.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/method/HandlerMethodReturnValueHandlerComposite.java @@ -26,7 +26,6 @@ import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; import org.springframework.util.Assert; - /** * @author Rossen Stoyanchev * @since 4.0 diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/BrokerAvailabilityEvent.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/BrokerAvailabilityEvent.java index ce418eee3b3..ddc202637e2 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/BrokerAvailabilityEvent.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/BrokerAvailabilityEvent.java @@ -18,7 +18,6 @@ package org.springframework.messaging.simp; import org.springframework.context.ApplicationEvent; - /** * Event raised when a broker's availabilty changes * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java index 394e3769cb5..cb1e1abf251 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java @@ -20,7 +20,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler; import org.springframework.util.Assert; - /** * Registration class for configuring a {@link StompBrokerRelayMessageHandler}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java index 6a15cd8050f..a89a8e17a72 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java @@ -28,7 +28,6 @@ import org.springframework.util.ClassUtils; import static org.junit.Assert.*; - /** * Test fixture for {@link AnnotationExceptionHandlerMethodResolver} tests. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java index b54cbf7580a..de0b2690041 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java @@ -31,7 +31,6 @@ import org.springframework.messaging.support.MessageBuilder; import static org.junit.Assert.*; - /** * Test fixture for {@link HeaderMethodArgumentResolver} tests. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java index 0f6b32ae044..9007ffcf915 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java @@ -32,7 +32,6 @@ import org.springframework.messaging.support.NativeMessageHeaderAccessor; import static org.junit.Assert.*; - /** * Test fixture for {@link HeadersMethodArgumentResolver} tests. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java index f64276d599b..8cb225cf393 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java @@ -29,7 +29,6 @@ import org.springframework.messaging.support.converter.StringMessageConverter; import static org.junit.Assert.*; - /** * Test fixture for {@link PayloadArgumentResolver}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java index ec03cc7dcd3..1b98ba1aad8 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java @@ -18,7 +18,6 @@ package org.springframework.messaging.simp; import java.security.Principal; - /** * An implementation of {@link Principal} for testing. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java index 31c7df1b8a3..e4a88ccf5a9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java @@ -41,7 +41,6 @@ import static org.junit.Assert.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; - /** * Test fixture for {@link SendToMethodReturnValueHandlerTests}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java index 8b9c5b0bcbc..dab67a65219 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java @@ -40,7 +40,6 @@ import static org.junit.Assert.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; - /** * Test fixture for {@link SubscriptionMethodReturnValueHandler}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java index d803b336e30..5a036448a0f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java @@ -51,7 +51,6 @@ import java.util.List; import static org.junit.Assert.*; - /** * Test fixture for {@link AbstractMessageBrokerConfiguration}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistryTests.java index fdc4c6c9480..2403646fb33 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistryTests.java @@ -30,7 +30,6 @@ import org.springframework.util.MultiValueMap; import static org.junit.Assert.*; - /** * Test fixture for {@link DefaultSubscriptionRegistry}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistryTests.java index e03a8dfdf1f..879f97abb6c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistryTests.java @@ -25,7 +25,6 @@ import org.junit.Test; import static org.junit.Assert.*; - /** * Test fixture for {@link DefaultUserSessionRegistry} * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodMessageHandlerTests.java index 1c872ea1ea6..29609dd7447 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodMessageHandlerTests.java @@ -39,7 +39,6 @@ import org.springframework.stereotype.Controller; import static org.junit.Assert.*; - /** * Test fixture for {@link SimpAnnotationMethodMessageHandler}. * @author Rossen Stoyanchev diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java index 0fa8929a25c..a026515de06 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java @@ -33,7 +33,6 @@ import org.springframework.messaging.support.MessageBuilder; import static org.junit.Assert.*; import static org.mockito.Mockito.*; - /** * * @author Rossen Stoyanchev diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java index 901e4e2b14e..cf4939351be 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java @@ -31,7 +31,6 @@ import reactor.io.Buffer; import static org.junit.Assert.*; - /** * Test fixture for {@link StompCodec}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java index 24c77e96a00..93fa9e8624f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java @@ -30,7 +30,6 @@ import org.springframework.util.MultiValueMap; import static org.junit.Assert.*; - /** * Test fixture for {@link StompHeaderAccessor}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java index bfd3bfc4196..d62aa56289f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java @@ -27,7 +27,6 @@ import org.springframework.messaging.MessageHeaders; import static org.junit.Assert.*; - /** * @author Mark Fisher */ diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java index 5fa77f70747..e2db3528289 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java @@ -25,7 +25,6 @@ import org.springframework.messaging.MessageHeaders; import static org.junit.Assert.*; - /** * Test fixture for {@link MessageHeaderAccessor}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java index 20bf9f25359..d07469cf5e9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java @@ -30,7 +30,6 @@ import org.springframework.util.MultiValueMap; import static org.junit.Assert.*; - /** * Test fixture for {@link NativeMessageHeaderAccessor}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/AbstractMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/AbstractMessageConverterTests.java index 403a3661e5c..5d116cebaea 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/AbstractMessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/AbstractMessageConverterTests.java @@ -31,7 +31,6 @@ import org.springframework.util.MimeTypeUtils; import static org.junit.Assert.*; - /** * Test fixture for {@link AbstractMessageConverter}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/DefaultContentTypeResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/DefaultContentTypeResolverTests.java index 0534372aa3f..4c77cb0787b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/DefaultContentTypeResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/DefaultContentTypeResolverTests.java @@ -27,7 +27,6 @@ import org.springframework.util.MimeTypeUtils; import static org.junit.Assert.*; - /** * Test fixture for {@link DefaultContentTypeResolver}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/MappingJackson2MessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/MappingJackson2MessageConverterTests.java index ce01c450c8d..2c95d13e40b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/MappingJackson2MessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/MappingJackson2MessageConverterTests.java @@ -31,7 +31,6 @@ import org.springframework.util.MimeType; import static org.junit.Assert.*; - /** * Test fixture for {@link MappingJackson2MessageConverter}. * diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/StringMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/StringMessageConverterTests.java index 9780f83984d..49b94a30c24 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/converter/StringMessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/converter/StringMessageConverterTests.java @@ -30,7 +30,6 @@ import org.springframework.util.MimeTypeUtils; import static org.junit.Assert.*; - /** * Test fixture for {@link StringMessageConverter}. * diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java index c57dbcfc1e4..249a1611401 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java @@ -53,7 +53,6 @@ import org.springframework.web.util.NestedServletException; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; - /** * @author Juergen Hoeller * @author Rossen Stoyanchev diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index bd75b70adbf..af994088037 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -51,7 +51,6 @@ import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; - import static org.junit.Assert.*; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import static org.mockito.BDDMockito.*; diff --git a/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java b/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java index b3f42091ef4..df328150465 100644 --- a/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java +++ b/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java @@ -21,7 +21,6 @@ import static org.junit.Assert.fail; import org.junit.Test; - /** * Test fixture for {@link JsonPathExpectationsHelper}. * diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java index 948310f750c..b8a38d41c9c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java @@ -39,7 +39,6 @@ import org.springframework.test.web.Person; import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.web.client.RestTemplate; - /** * Examples of defining expectations on XML request content with XMLUnit. * diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java index 63ee9376bf9..86144325f1d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java @@ -49,7 +49,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.mockito.Mockito.*; - /** * Tests with Java configuration. * diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java index 2cce037b55b..840e4862cee 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java @@ -27,7 +27,6 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl import static org.junit.Assert.*; - /** * @author Rossen Stoyanchev */ diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/AsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/AsyncWebRequest.java index 8b2bc8b9e82..529e6644221 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/AsyncWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/AsyncWebRequest.java @@ -18,7 +18,6 @@ package org.springframework.web.context.request.async; import org.springframework.web.context.request.NativeWebRequest; - /** * Extends {@link NativeWebRequest} with methods for asynchronous request processing. * diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java index e2a8f1f2f29..3b3cd6ea9e3 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java @@ -23,7 +23,6 @@ import javax.servlet.ServletContext; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.web.context.ServletContextAware; - /** * Subclass of {@link PropertyPlaceholderConfigurer} that resolves placeholders as * ServletContext init parameters (that is, {@code web.xml} context-param diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java index acbbdfa15f5..535cb01eaca 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java @@ -32,7 +32,6 @@ import org.springframework.util.ReflectionUtils.MethodFilter; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.method.HandlerMethodSelector; - /** * Discovers annotated exception handling methods in a given class type, including all * super types, and helps to resolve an Exception to a method that can handle it. The diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java index c89e38aa38f..37be7bb915f 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java @@ -45,7 +45,6 @@ import org.springframework.web.context.request.ServletWebRequest; import static org.junit.Assert.*; - /** * @author Brian Clozel */ diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index eec01e8a673..a928fc00e6a 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -49,7 +49,6 @@ import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.*; - /** * Test fixture with {@link org.springframework.web.method.annotation.RequestParamMethodArgumentResolver}. * diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java index 9fb45c609a5..a4b56826acc 100644 --- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java @@ -23,7 +23,6 @@ import javax.servlet.jsp.tagext.TagSupport; import static org.junit.Assert.*; import org.junit.Test; - /** * Unit tests for the {@link TagUtils} class. * diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java index 746ffa40f01..eb382c1dd50 100644 --- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java +++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java @@ -25,7 +25,6 @@ import org.apache.tiles.preparer.ViewPreparer; import org.apache.tiles.preparer.factory.NoSuchPreparerException; import org.springframework.web.context.WebApplicationContext; - /** * Tiles3 {@link org.apache.tiles.preparer.PreparerFactory} implementation * that expects preparer class names and builds preparer instances for those, diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java index 0203f698af9..36a714fe6d0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java @@ -18,7 +18,6 @@ package org.springframework.web.servlet.mvc.condition; import org.springframework.web.bind.annotation.RequestMapping; - /** * A contract for {@code "name!=value"} style expression used to specify request * parameters and request header conditions in {@code @RequestMapping}. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java index fffbf7c923d..685f1357167 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java @@ -21,7 +21,6 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; - /** * A holder for a {@link RequestCondition} useful when the type of the request * condition is not known ahead of time, e.g. custom condition. Since this diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java index 18c4fa85136..c4debab1f33 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java @@ -23,7 +23,6 @@ import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.mock.web.test.MockServletContext; import org.springframework.web.context.support.StaticWebApplicationContext; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java index e17f0b00878..54a7d016ce4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java @@ -13,7 +13,6 @@ import org.springframework.web.servlet.View; import org.springframework.web.servlet.view.InternalResourceView; import org.springframework.web.servlet.view.RedirectView; - /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java index 2fe380c1859..8e4272981df 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.util.CollectionUtils; - /** * A variation of {@link WebSocketConfigurationSupport} that detects implementations of * {@link WebSocketConfigurer} in Spring configuration and invokes them in order to diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index 0c79a2eb6ed..e41c42322ab 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -34,7 +34,6 @@ import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.server.support.JettyRequestUpgradeStrategy; import org.springframework.web.socket.server.support.TomcatRequestUpgradeStrategy; - /** * Base class for WebSocket integration tests. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java index bfbe8e1333e..5d9af0aa310 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java @@ -23,7 +23,6 @@ import org.springframework.util.SocketUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; - /** * Jetty based {@link WebSocketTestServer}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java index fd42a85d8dc..2d1e855a841 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java @@ -29,7 +29,6 @@ import org.springframework.util.SocketUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; - /** * Tomcat based {@link WebSocketTestServer}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java index 792cafde6b7..7eb973817fc 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java @@ -39,7 +39,6 @@ import org.springframework.web.socket.support.WebSocketHttpHeaders; import static org.junit.Assert.*; - /** * Tests for {@link JettyWebSocketClient}. * @author Rossen Stoyanchev diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.java index 27879b0152d..6d3c1c9b8aa 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.java @@ -58,7 +58,6 @@ import org.springframework.web.socket.server.HandshakeHandler; import static org.junit.Assert.*; import static org.springframework.web.socket.messaging.StompTextMessageBuilder.*; - /** * Integration tests with annotated message-handling methods. * @author Rossen Stoyanchev diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompTextMessageBuilder.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompTextMessageBuilder.java index 7a2f2e60cca..d382a76590c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompTextMessageBuilder.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompTextMessageBuilder.java @@ -23,7 +23,6 @@ import java.util.List; import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.web.socket.TextMessage; - /** * A builder for creating WebSocket messages with STOMP frame content. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java index b78b4f83ce0..72ff870f34a 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java @@ -27,7 +27,6 @@ import org.springframework.web.socket.support.TestWebSocketSession; import static org.mockito.Mockito.*; - /** * Test fixture for {@link SubProtocolWebSocketHandler}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java index 36b1a062609..e34f87923b5 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java @@ -37,7 +37,6 @@ import org.springframework.web.socket.sockjs.transport.handler.WebSocketTranspor import static org.junit.Assert.*; - /** * Test fixture for {@link WebMvcStompWebSocketEndpointRegistration}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistryTests.java index 73f0a2dc7e7..cbeff8dd10e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistryTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistryTests.java @@ -33,7 +33,6 @@ import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler; import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; - /** * Test fixture for {@link WebMvcStompEndpointRegistry}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupportTests.java index 944a44f4c58..c852431edc9 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupportTests.java @@ -47,7 +47,6 @@ import java.util.Map; import static org.junit.Assert.*; - /** * Test fixture for {@link WebSocketMessageBrokerConfigurationSupport}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java index 6e1c586dcef..00f7d7fb1a0 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java @@ -35,7 +35,6 @@ import org.springframework.web.socket.support.WebSocketHttpHeaders; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; - /** * Test fixture for {@link DefaultHandshakeHandler}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java index 7f80cde7e0c..55ddfcdcd29 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java @@ -37,7 +37,6 @@ import org.springframework.web.socket.sockjs.transport.handler.WebSocketTranspor import static org.junit.Assert.*; - /** * Test fixture for {@link AbstractWebSocketHandlerRegistration}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java index b9e50bb0c57..4ccefcc31f6 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java @@ -39,7 +39,6 @@ import org.springframework.web.socket.sockjs.transport.handler.WebSocketTranspor import static org.junit.Assert.*; - /** * Integration tests for WebSocket Java server-side configuration. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java index e0f28e5f922..96aeb23dc5e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java @@ -29,7 +29,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import static org.mockito.Mockito.*; - /** * Test fixture for {@link HandshakeInterceptorChain}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java index bc51fd5d77f..69560510666 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java @@ -28,7 +28,6 @@ import org.springframework.web.socket.WebSocketHandler; import static org.junit.Assert.*; - /** * Test fixture for {@link HttpSessionHandshakeInterceptor}. * diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/support/TestPrincipal.java b/spring-websocket/src/test/java/org/springframework/web/socket/support/TestPrincipal.java index f6a755ebd91..7503b8c55f0 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/support/TestPrincipal.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/support/TestPrincipal.java @@ -18,7 +18,6 @@ package org.springframework.web.socket.support; import java.security.Principal; - /** * An implementation of {@link Principal} for testing. *