From 6f0c7eb8c166040eb16787ba0a1248c67e075aa1 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 09:22:33 +0100 Subject: [PATCH 1/2] Update test source and target JDK compatibility "test" source and target compatibility has been upgraded to 1.7 except where noted, allowing us to use 1.7 language features such as diamond-style (<>) generics declarations, automatic resource management and multi-catch. More importantly, we will be able to upgrade to 1.8 once it is available in order to make use of lambda expressions, etc in our test cases. IDE configurations must be relaxed to allow 1.7 across the board, as neither Eclipse nor IDEA are clever enough to allow for different language levels across production and test resources. See [1] for a feature request on that front. spring-oxm is a special case here, and has been pinned at 1.6 compatibility even for its test sources in order to avoid a class verification error that JibX throws when encountering 1.7-level bytecode [2]. Likewise with spring-orm, toplink encounters a similar class verification error, so has been pinned to 1.6 for the time being. When we remove the (already deprecated since 3.2) Toplink support we can restore compatibility to 1.7. [1]: http://youtrack.jetbrains.com/issue/IDEA-97814 [2]: http://jira.codehaus.org/browse/JIBX-465 Issue: SPR-10129 --- build.gradle | 26 +++++++++++++++++-- .../oxm/castor/CastorUnmarshallerTests.java | 10 ++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 540694d2ee0..5e996570c49 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,14 @@ configure(allprojects) { group = "org.springframework" - sourceCompatibility=1.5 - targetCompatibility=1.5 + compileJava { + sourceCompatibility=1.5 + targetCompatibility=1.5 + } + compileTestJava { + sourceCompatibility=1.7 + targetCompatibility=1.7 + } [compileJava, compileTestJava]*.options*.compilerArgs = [ "-Xlint:serial", @@ -333,6 +339,14 @@ project("spring-tx") { project("spring-oxm") { description = "Spring Object/XML Marshalling" apply from: "oxm.gradle" + + compileTestJava { + // necessary to avoid java.lang.VerifyError on jibx compilation + // see http://jira.codehaus.org/browse/JIBX-465 + sourceCompatibility=1.6 + targetCompatibility=1.6 + } + dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) @@ -458,6 +472,14 @@ project("spring-web") { project("spring-orm") { description = "Spring Object/Relational Mapping" + + compileTestJava { + // necessary to avoid java.lang.VerifyError on toplink compilation + // TODO: remove this block when we remove toplink + sourceCompatibility=1.6 + targetCompatibility=1.6 + } + dependencies { compile("aopalliance:aopalliance:1.0") optional("org.hibernate:hibernate-core:3.3.2.GA") diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java index 4c5387aaa34..367b4aa5c15 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,8 @@ import org.springframework.oxm.AbstractUnmarshallerTests; import org.springframework.oxm.MarshallingException; import org.springframework.oxm.Unmarshaller; +import static org.hamcrest.CoreMatchers.*; + import static org.junit.Assert.*; /** @@ -66,7 +68,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { protected void testFlight(Object o) { Flight flight = (Flight) o; assertNotNull("Flight is null", flight); - assertEquals("Number is invalid", 42L, flight.getNumber()); + assertThat("Number is invalid", flight.getNumber(), equalTo(42L)); } @Override @@ -104,10 +106,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { assertEquals("Invalid amount of items", 2, order.getOrderItemCount()); OrderItem item = order.getOrderItem(0); assertEquals("Invalid items", "1", item.getId()); - assertEquals("Invalid items", 15, item.getQuantity()); + assertThat("Invalid items", item.getQuantity(), equalTo(15)); item = order.getOrderItem(1); assertEquals("Invalid items", "3", item.getId()); - assertEquals("Invalid items", 20, item.getQuantity()); + assertThat("Invalid items", item.getQuantity(), equalTo(20)); } @Test From 4c8cd7b0bd45bbe37ec9cc588b0f29608831b05f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Dec 2012 13:59:24 +0100 Subject: [PATCH 2/2] Add @Override annotations to test sources Issue: SPR-10129 --- .../AspectJExpressionPointcutTests.java | 2 + .../BeanNamePointcutMatchingTests.java | 1 + ...hodInvocationProceedingJoinPointTests.java | 4 ++ .../TrickyAspectJPointcutExpressionTests.java | 2 + .../AbstractAspectJAdvisorFactoryTests.java | 11 +++ .../annotation/ArgumentBindingTests.java | 1 + .../annotation/AspectProxyFactoryTests.java | 1 + .../AspectJPrecedenceComparatorTests.java | 1 + .../aop/framework/AopProxyUtilsTests.java | 1 + .../framework/IntroductionBenchmarkTests.java | 1 + .../aop/framework/MethodInvocationTests.java | 1 + .../aop/framework/NullPrimitiveTests.java | 3 + .../aop/framework/PrototypeTargetTests.java | 2 + .../aop/framework/ProxyFactoryTests.java | 4 ++ .../adapter/ThrowsAdviceInterceptorTests.java | 1 + .../ConcurrencyThrottleInterceptorTests.java | 1 + .../CustomizableTraceInterceptorTests.java | 1 + .../interceptor/DebugInterceptorTests.java | 1 + .../ExposeBeanNameAdvisorsTests.java | 1 + .../ExposeInvocationInterceptorTests.java | 3 + .../aop/support/AopUtilsTests.java | 2 + .../aop/support/ComposablePointcutTests.java | 4 ++ ...elegatingIntroductionInterceptorTests.java | 8 +++ .../support/JdkRegexpMethodPointcutTests.java | 1 + .../aop/support/MethodMatchersTests.java | 3 + .../aop/support/PointcutsTests.java | 9 +++ .../target/LazyCreationTargetSourceTests.java | 2 + .../aop/target/LazyInitTargetSourceTests.java | 1 + .../PrototypeBasedTargetSourceTests.java | 2 + .../target/ThreadLocalTargetSourceTests.java | 1 + .../dynamic/RefreshableTargetSourceTests.java | 2 + .../java/test/aop/CountingBeforeAdvice.java | 1 + .../test/java/test/aop/DefaultLockable.java | 3 + .../test/java/test/aop/NopInterceptor.java | 1 + .../test/java/test/aop/PerTargetAspect.java | 1 + .../test/aop/SerializableNopInterceptor.java | 2 + .../test/java/test/beans/DerivedTestBean.java | 4 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../java/test/beans/SerializablePerson.java | 5 ++ .../src/test/java/test/beans/TestBean.java | 17 +++++ .../CollectingReaderEventListener.java | 4 ++ .../foo/ComponentBeanDefinitionParser.java | 1 + .../java/com/foo/ComponentFactoryBean.java | 3 + .../com/foo/ComponentNamespaceHandler.java | 1 + .../springframework/beans/BeanUtilsTests.java | 4 ++ .../beans/BeanWrapperGenericsTests.java | 6 ++ .../beans/BeanWrapperTests.java | 13 ++++ .../beans/ConcurrentBeanWrapperTests.java | 1 + .../beans/ExtendedBeanInfoTests.java | 5 ++ ...uiredAnnotationBeanPostProcessorTests.java | 2 + .../factory/ConcurrentBeanFactoryTests.java | 2 + .../DefaultListableBeanFactoryTests.java | 31 +++++++++ .../beans/factory/FactoryBeanTests.java | 8 +++ .../factory/SharedBeanRegistryTests.java | 1 + ...wiredAnnotationBeanPostProcessorTests.java | 7 ++ .../CustomAutowireConfigurerTests.java | 2 + ...njectAnnotationBeanPostProcessorTests.java | 7 ++ .../config/CustomEditorConfigurerTests.java | 2 + .../PropertyResourceConfigurerTests.java | 3 + .../factory/config/SimpleScopeTests.java | 1 + .../beans/factory/config/TestTypes.java | 5 ++ .../parsing/CustomProblemReporterTests.java | 3 + .../support/BeanFactoryGenericsTests.java | 2 + .../PropertiesBeanDefinitionReaderTests.java | 1 + .../beans/factory/support/Spr8954Tests.java | 3 + .../security/CallbacksSecurityTests.java | 18 +++++ .../security/support/CustomFactoryBean.java | 3 + .../support/security/support/DestroyBean.java | 1 + .../support/security/support/InitBean.java | 1 + .../factory/xml/AbstractBeanFactoryTests.java | 2 + .../factory/xml/BeanNameGenerationTests.java | 1 + .../xml/CollectingReaderEventListener.java | 4 ++ .../factory/xml/CollectionMergingTests.java | 1 + .../beans/factory/xml/CountingFactory.java | 3 + .../xml/DefaultLifecycleMethodsTests.java | 1 + .../xml/DelegatingEntityResolverTests.java | 1 + .../beans/factory/xml/DependenciesBean.java | 1 + .../factory/xml/EventPublicationTests.java | 1 + .../beans/factory/xml/GeneratedNameBean.java | 1 + .../factory/xml/MetadataAttachmentTests.java | 1 + .../xml/ProfileXmlBeanDefinitionTests.java | 1 + .../factory/xml/ProtectedLifecycleBean.java | 6 ++ .../xml/UtilNamespaceHandlerTests.java | 1 + .../xml/XmlListableBeanFactoryTests.java | 5 ++ .../beans/propertyeditors/BeanInfoTests.java | 2 + .../propertyeditors/CustomEditorTests.java | 46 +++++++++++++ .../support/PropertyComparatorTests.java | 1 + .../test/java/test/beans/DerivedTestBean.java | 4 ++ .../test/java/test/beans/DummyFactory.java | 7 ++ .../test/java/test/beans/LifecycleBean.java | 6 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../src/test/java/test/beans/TestBean.java | 20 ++++++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../cache/ehcache/EhCacheSupportTests.java | 3 + .../javamail/InternetAddressEditorTests.java | 1 + .../mail/javamail/JavaMailSenderTests.java | 4 ++ .../scheduling/quartz/QuartzSupportTests.java | 28 ++++++++ .../JasperReportsUtilsTests.java | 1 + .../AutowiredQualifierFooService.java | 3 + .../example/scannable/FooServiceImpl.java | 3 + .../scannable/ScopedProxyTestBean.java | 3 + .../java/example/scannable/StubFooDao.java | 1 + .../AspectAndAdvicePrecedenceTests.java | 10 +++ ...AspectJExpressionPointcutAdvisorTests.java | 1 + .../aop/aspectj/BeanNamePointcutTests.java | 1 + .../DeclarationOrderIndependenceTests.java | 6 ++ .../aop/aspectj/ProceedTests.java | 9 +++ .../SubtypeSensitiveMatchingTests.java | 3 + .../aspectj/TargetPointcutSelectionTests.java | 2 + ...tSelectionOnlyPointcutsAtAspectJTests.java | 3 + ...sAndTargetSelectionOnlyPointcutsTests.java | 1 + .../aop/aspectj/_TestTypes.java | 5 ++ .../autoproxy/AnnotationPointcutTests.java | 1 + .../AspectImplementingInterfaceTests.java | 1 + .../AspectJAutoProxyCreatorTests.java | 6 ++ .../AtAspectJAnnotationBindingTests.java | 3 + .../aop/aspectj/autoproxy/_TestTypes.java | 4 ++ .../autoproxy/benchmark/BenchmarkTests.java | 5 ++ .../autoproxy/spr3064/SPR3064Tests.java | 1 + .../GenericBridgeMethodMatchingTests.java | 2 + .../GenericParameterMatchingTests.java | 2 + .../aop/framework/AbstractAopProxyTests.java | 60 ++++++++++++++++ .../aop/framework/CglibProxyTests.java | 6 ++ .../aop/framework/JdkDynamicProxyTests.java | 7 ++ .../aop/framework/ProxyFactoryBeanTests.java | 10 +++ .../aop/framework/_TestTypes.java | 3 + .../AdvisorAdapterRegistrationTests.java | 4 ++ .../AdvisorAutoProxyCreatorTests.java | 1 + .../autoproxy/AutoProxyCreatorTests.java | 2 + .../BeanNameAutoProxyCreatorInitTests.java | 1 + .../BeanNameAutoProxyCreatorTests.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 20 ++++++ .../factory/AbstractBeanFactoryTests.java | 1 + .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../BridgeMethodAutowiringTests.java | 1 + .../beans/factory/config/SimpleMapScope.java | 5 ++ .../CollectingReaderEventListener.java | 4 ++ .../beans/factory/xml/DependenciesBean.java | 1 + .../factory/xml/QualifierAnnotationTests.java | 3 + .../factory/xml/XmlBeanFactoryTestTypes.java | 11 +++ .../factory/xml/XmlBeanFactoryTests.java | 10 +++ .../support/CustomNamespaceHandlerTests.java | 9 +++ .../AnnotatedClassCacheableService.java | 22 ++++++ .../cache/config/DefaultCacheableService.java | 22 ++++++ .../cache/config/EnableCachingTests.java | 4 ++ .../springframework/context/ACATester.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + ...ntextSingletonBeanFactoryLocatorTests.java | 2 + ...notationConfigApplicationContextTests.java | 7 ++ .../AnnotationProcessorPerformanceTests.java | 2 + ...ommonAnnotationBeanPostProcessorTests.java | 10 +++ .../annotation/ComponentScanParserTests.java | 1 + .../ConfigurationClassAndBFPPTests.java | 2 + ...tionWithFactoryBeanAndAutowiringTests.java | 6 ++ ...tionWithFactoryBeanAndParametersTests.java | 3 + .../DestroyMethodInferenceTests.java | 1 + .../EnableLoadTimeWeavingTests.java | 3 + .../FooServiceDependentConverter.java | 1 + .../context/annotation/ImportAwareTests.java | 5 ++ .../ImportBeanDefinitionRegistrarTests.java | 4 ++ .../NestedConfigurationClassTests.java | 1 + .../Spr3775InitDestroyLifecycleTests.java | 4 ++ .../context/annotation/Spr6602Tests.java | 3 + .../annotation/TestBeanNameGenerator.java | 1 + .../annotation/TestScopeMetadataResolver.java | 1 + .../ConfigurationBeanNameTests.java | 1 + ...ClassCglibCallbackDeregistrationTests.java | 1 + .../ConfigurationClassProcessingTests.java | 4 ++ .../configuration/ScopingTests.java | 5 ++ .../configuration/Spr7167Tests.java | 1 + .../context/annotation3/StubFooDao.java | 1 + .../context/annotation5/OtherFooDao.java | 1 + .../StringToBarConverter.java | 1 + .../event/ApplicationContextEventTests.java | 5 ++ .../EventPublicationInterceptorTests.java | 4 ++ .../context/event/LifecycleEventTests.java | 4 ++ .../ApplicationContextExpressionTests.java | 5 ++ .../BeanFactoryPostProcessorTests.java | 1 + .../ClassPathXmlApplicationContextTests.java | 1 + .../ConversionServiceFactoryBeanTests.java | 5 ++ .../DefaultLifecycleProcessorTests.java | 22 ++++++ .../FactoryBeanAndApplicationListener.java | 4 ++ .../context/support/LifecycleTestBean.java | 3 + .../context/support/Logic.java | 1 + .../context/support/ResourceConverter.java | 1 + .../context/support/Service.java | 4 ++ .../support/SimpleThreadScopeTest.java | 2 + ...ticApplicationContextMulticasterTests.java | 4 ++ .../StaticApplicationContextTests.java | 2 + .../support/StaticMessageSourceTests.java | 3 + .../context/support/TestProxyFactoryBean.java | 1 + .../core/task/NoOpRunnable.java | 1 + .../LocalSlsbInvokerInterceptorTests.java | 2 + ...StatelessSessionProxyFactoryBeanTests.java | 4 ++ ...mpleRemoteSlsbInvokerInterceptorTests.java | 2 + ...StatelessSessionProxyFactoryBeanTests.java | 9 +++ .../format/number/NumberFormattingTests.java | 1 + ...tingConversionServiceFactoryBeanTests.java | 8 +++ .../FormattingConversionServiceTests.java | 8 +++ .../ReflectiveLoadTimeWeaverTests.java | 2 + .../springframework/jmx/AbstractJmxTests.java | 2 + .../jmx/AbstractMBeanServerTests.java | 2 + .../org/springframework/jmx/JmxTestBean.java | 7 ++ .../access/MBeanClientInterceptorTests.java | 4 ++ ...moteMBeanClientInterceptorTestsIgnore.java | 3 + .../export/CustomEditorConfigurerTests.java | 1 + .../export/MBeanExporterOperationsTests.java | 2 + .../jmx/export/MBeanExporterTests.java | 8 +++ .../jmx/export/NotificationListenerTests.java | 3 + .../export/NotificationPublisherTests.java | 9 +++ .../PropertyPlaceholderConfigurerTests.java | 1 + .../jmx/export/TestDynamicMBean.java | 6 ++ .../AnnotationMetadataAssemblerTests.java | 4 ++ .../export/annotation/AnnotationTestBean.java | 7 ++ .../annotation/AnnotationTestBeanFactory.java | 3 + .../annotation/AnnotationTestSubBean.java | 4 ++ .../annotation/JmxUtilsAnnotationTests.java | 2 + ...tractMetadataAssemblerAutodetectTests.java | 1 + .../AbstractMetadataAssemblerTests.java | 4 ++ ...aceBasedMBeanInfoAssemblerCustomTests.java | 5 ++ ...aceBasedMBeanInfoAssemblerMappedTests.java | 5 ++ ...InterfaceBasedMBeanInfoAssemblerTests.java | 5 ++ ...ExclusionMBeanInfoAssemblerComboTests.java | 5 ++ ...xclusionMBeanInfoAssemblerMappedTests.java | 5 ++ ...usionMBeanInfoAssemblerNotMappedTests.java | 5 ++ ...ethodExclusionMBeanInfoAssemblerTests.java | 5 ++ ...ameBasedMBeanInfoAssemblerMappedTests.java | 5 ++ ...ethodNameBasedMBeanInfoAssemblerTests.java | 5 ++ .../assembler/ReflectiveAssemblerTests.java | 5 ++ .../export/naming/KeyNamingStrategyTests.java | 4 ++ .../PropertiesFileNamingStrategyTests.java | 1 + .../naming/PropertiesNamingStrategyTests.java | 4 ++ .../ModelMBeanNotificationPublisherTests.java | 2 + .../jmx/support/JmxUtilsTests.java | 9 +++ .../jndi/JndiObjectFactoryBeanTests.java | 4 ++ .../jndi/JndiTemplateTests.java | 7 ++ .../jndi/SimpleNamingContextTests.java | 9 +++ .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../remoting/rmi/RmiSupportTests.java | 10 +++ ...AsyncAnnotationBeanPostProcessorTests.java | 3 + .../annotation/AsyncExecutionTests.java | 7 ++ .../annotation/EnableAsyncTests.java | 1 + .../annotation/EnableSchedulingTests.java | 7 ++ .../ScheduledExecutorFactoryBeanTests.java | 4 ++ .../ThreadPoolTaskSchedulerTests.java | 4 ++ .../ExecutorBeanDefinitionParserTests.java | 1 + ...heduledTasksBeanDefinitionParserTests.java | 1 + .../support/PeriodicTriggerTests.java | 3 + .../scheduling/timer/TimerSupportTests.java | 7 ++ .../timer/TimerTaskExecutorTests.java | 5 ++ .../scripting/config/OtherTestBean.java | 3 + .../scripting/groovy/ConcreteMessenger.java | 2 + .../groovy/GroovyScriptFactoryTests.java | 2 + .../scripting/groovy/LogUserAdvice.java | 1 + .../scripting/groovy/TestServiceImpl.java | 1 + .../jruby/JRubyScriptFactoryTests.java | 1 + .../scripting/support/StubMessenger.java | 2 + .../org/springframework/ui/ModelMapTests.java | 1 + .../DataBinderFieldAccessTests.java | 2 + .../validation/DataBinderTests.java | 50 ++++++++++++++ .../DefaultMessageCodesResolverTests.java | 1 + .../validation/ValidationUtilsTests.java | 4 ++ .../beanvalidation/MethodValidationTests.java | 1 + .../beanvalidation/ValidatorFactoryTests.java | 2 + .../advice/CountingAfterReturningAdvice.java | 1 + .../test/advice/CountingBeforeAdvice.java | 1 + .../java/test/aspect/PerTargetAspect.java | 1 + .../src/test/java/test/beans/CustomScope.java | 5 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../src/test/java/test/beans/TestBean.java | 17 +++++ .../java/test/interceptor/NopInterceptor.java | 1 + .../SerializableNopInterceptor.java | 2 + .../TimestampIntroductionInterceptor.java | 1 + .../test/java/test/mixin/DefaultLockable.java | 3 + .../src/test/java/test/mixin/LockMixin.java | 4 ++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 18 +++++ .../core/AttributeAccessorSupportTests.java | 2 + .../core/BridgeMethodResolverTests.java | 69 +++++++++++++++++++ .../core/DefaultControlFlowTests.java | 1 + .../GenericCollectionTypeResolverTests.java | 2 + .../core/Jdk14ControlFlowTests.java | 1 + .../core/OrderComparatorTests.java | 2 + ...ioritizedParameterNameDiscovererTests.java | 4 ++ .../core/annotation/AnnotationUtilsTests.java | 5 ++ .../core/convert/TypeDescriptorTests.java | 8 +++ .../converter/ConvertingComparatorTests.java | 2 + .../CollectionToCollectionConverterTests.java | 12 ++++ .../support/DefaultConversionTests.java | 1 + .../GenericConversionServiceTests.java | 19 +++++ .../core/enums/LabeledEnumTests.java | 4 ++ .../core/io/ResourceTests.java | 6 ++ .../core/io/support/MyDummyFactory1.java | 1 + .../core/io/support/MyDummyFactory2.java | 1 + .../core/style/ToStringCreatorTests.java | 1 + .../task/SimpleAsyncTaskExecutorTests.java | 4 ++ .../util/AutoPopulatingListTests.java | 1 + .../util/CachingMapDecoratorTests.java | 1 + .../springframework/util/ClassUtilsTests.java | 1 + .../util/ConcurrentReferenceHashMapTests.java | 6 ++ .../util/FileSystemUtilsTests.java | 1 + .../util/MethodInvokerTests.java | 6 ++ .../util/MockLog4jAppender.java | 3 + .../util/PropertyPlaceholderHelperTests.java | 1 + .../util/ReflectionUtilsTests.java | 2 + .../util/ResourceUtilsTests.java | 1 + .../spel/ConstructorInvocationTests.java | 1 + .../expression/spel/EvaluationTests.java | 3 + .../spel/ExpressionLanguageScenarioTests.java | 10 +++ ...essionTestsUsingCoreConversionService.java | 2 + .../expression/spel/IndexingTests.java | 5 ++ .../expression/spel/MapAccessTests.java | 5 ++ .../spel/MethodInvocationTests.java | 3 + .../spel/OperatorOverloaderTests.java | 2 + .../expression/spel/PropertyAccessTests.java | 5 ++ .../spel/ScenariosForSpringSecurity.java | 15 ++++ .../spel/SpelDocumentationTests.java | 3 + .../expression/spel/SpelReproTests.java | 16 +++++ .../spel/TemplateExpressionParsingTests.java | 6 ++ .../expression/spel/ast/OpPlusTests.java | 1 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../jdbc/AbstractJdbcTests.java | 2 + .../InitializeDatabaseIntegrationTests.java | 1 + .../jdbc/core/AbstractRowMapperTests.java | 1 + .../jdbc/core/JdbcTemplateQueryTests.java | 5 ++ .../jdbc/core/JdbcTemplateTests.java | 52 ++++++++++++++ .../jdbc/core/RowMapperTests.java | 4 ++ .../core/SimpleRowCountCallbackHandler.java | 1 + .../jdbc/core/StatementCreatorUtilsTests.java | 2 + .../NamedParameterJdbcTemplateTests.java | 9 +++ .../namedparam/NamedParameterQueryTests.java | 4 ++ .../core/simple/CallMetaDataContextTests.java | 2 + ...rameterizedBeanPropertyRowMapperTests.java | 1 + .../jdbc/core/simple/SimpleJdbcCallTests.java | 2 + .../core/simple/SimpleJdbcInsertTests.java | 2 + .../core/simple/SimpleJdbcTemplateTests.java | 3 + .../simple/TableMetaDataContextTests.java | 2 + .../core/support/JdbcDaoSupportTests.java | 2 + .../jdbc/core/support/LobSupportTests.java | 2 + .../jdbc/core/support/SqlLobValueTests.java | 7 ++ .../DataSourceJtaTransactionTests.java | 15 ++++ .../DataSourceTransactionManagerTests.java | 58 ++++++++++++++++ .../DriverManagerDataSourceTests.java | 3 + .../datasource/TestDataSourceWrapper.java | 2 + .../EmbeddedDatabaseFactoryTests.java | 1 + .../lookup/JndiDataSourceLookupTests.java | 2 + .../datasource/lookup/StubDataSource.java | 2 + .../jdbc/object/CustomerMapper.java | 1 + .../jdbc/object/GenericSqlQueryTests.java | 3 + .../object/GenericStoredProcedureTests.java | 3 + .../jdbc/object/RdbmsOperationTests.java | 1 + .../jdbc/object/SqlQueryTests.java | 20 ++++++ .../jdbc/object/SqlUpdateTests.java | 3 + .../jdbc/object/StoredProcedureTests.java | 8 +++ .../support/CustomSqlExceptionTranslator.java | 1 + .../jdbc/support/KeyHolderTests.java | 1 + ...LErrorCodeSQLExceptionTranslatorTests.java | 1 + .../support/SQLErrorCodesFactoryTests.java | 5 ++ .../rowset/ResultSetWrappingRowSetTests.java | 1 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../core/task/StubTaskExecutor.java | 1 + .../jca/StubActivationSpec.java | 3 + .../jca/StubResourceAdapter.java | 5 ++ .../jms/StubConnectionFactory.java | 2 + .../org/springframework/jms/StubQueue.java | 1 + .../org/springframework/jms/StubTopic.java | 1 + .../jms/config/JmsNamespaceHandlerTests.java | 6 ++ .../JmsTransactionManagerTests.java | 20 ++++++ .../jms/connection/TestConnection.java | 11 +++ .../jms/connection/TestExceptionListener.java | 1 + .../jms/core/JmsTemplate102JtaTests.java | 2 + .../jms/core/JmsTemplate102Tests.java | 13 ++++ .../core/JmsTemplate102TransactedTests.java | 2 + .../jms/core/JmsTemplateJtaTests.java | 2 + .../jms/core/JmsTemplateTests.java | 10 +++ .../jms/core/JmsTemplateTransactedTests.java | 2 + .../core/support/JmsGatewaySupportTests.java | 2 + .../SimpleMessageListenerContainerTests.java | 15 ++++ .../MessageListenerAdapter102Tests.java | 6 ++ .../adapter/MessageListenerAdapterTests.java | 11 +++ .../adapter/StubMessageListenerAdapter.java | 1 + .../StubMessageListenerAdapter102.java | 1 + .../DefaultJmsActivationSpecFactoryTests.java | 1 + .../StubJmsActivationSpecFactory.java | 1 + .../jms/remoting/JmsInvokerTests.java | 66 ++++++++++++++++++ .../SimpleMessageConverter102Tests.java | 2 + .../support/SimpleMessageConverterTests.java | 2 + .../JndiDestinationResolverTests.java | 4 ++ .../CallCountingTransactionManager.java | 4 ++ .../web/DelegatingServletInputStream.java | 2 + .../web/DelegatingServletOutputStream.java | 3 + .../mock/web/MockFilterChain.java | 4 ++ .../mock/web/MockFilterConfig.java | 4 ++ .../mock/web/MockHttpServletRequest.java | 54 +++++++++++++++ .../mock/web/MockHttpServletResponse.java | 38 ++++++++++ .../mock/web/MockHttpSession.java | 17 +++++ .../mock/web/MockRequestDispatcher.java | 2 + .../mock/web/MockServletConfig.java | 4 ++ .../mock/web/MockServletContext.java | 25 +++++++ .../mock/web/PassThroughFilterChain.java | 1 + .../HibernateTransactionManagerTests.java | 32 +++++++++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../beans/factory/config/SimpleMapScope.java | 5 ++ .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../hibernate3/HibernateInterceptorTests.java | 6 ++ .../HibernateJtaTransactionTests.java | 46 +++++++++++++ .../hibernate3/HibernateTemplateTests.java | 37 ++++++++++ .../HibernateTransactionManagerTests.java | 58 ++++++++++++++++ .../LocalSessionFactoryBeanTests.java | 47 +++++++++++++ .../support/HibernateDaoSupportTests.java | 2 + .../orm/hibernate3/support/LobTypeTests.java | 2 + .../support/OpenSessionInViewTests.java | 10 +++ .../support/ScopedBeanInterceptorTests.java | 4 ++ .../orm/ibatis/SqlMapClientTests.java | 4 ++ .../ibatis/support/LobTypeHandlerTests.java | 4 ++ .../orm/jdo/JdoInterceptorTests.java | 5 ++ .../orm/jdo/JdoTemplateTests.java | 14 ++++ .../orm/jdo/JdoTransactionManagerTests.java | 50 ++++++++++++++ .../LocalPersistenceManagerFactoryTests.java | 5 ++ .../orm/jdo/support/JdoDaoSupportTests.java | 2 + .../OpenPersistenceManagerInViewTests.java | 2 + ...AbstractEntityManagerFactoryBeanTests.java | 2 + ...tEntityManagerFactoryIntegrationTests.java | 1 + .../orm/jpa/DefaultJpaDialectTests.java | 2 + .../orm/jpa/JpaInterceptorTests.java | 5 ++ .../orm/jpa/JpaTemplateTests.java | 7 ++ .../orm/jpa/JpaTransactionManagerTests.java | 56 +++++++++++++++ ...ontainerEntityManagerFactoryBeanTests.java | 8 +++ .../LocalEntityManagerFactoryBeanTests.java | 2 + ...kEntityManagerFactoryIntegrationTests.java | 1 + ...eEntityManagerFactoryIntegrationTests.java | 1 + ...iEntityManagerFactoryIntegrationTests.java | 1 + ...aEntityManagerFactoryIntegrationTests.java | 2 + ...oryWithAspectJWeavingIntegrationTests.java | 1 + .../orm/jpa/support/JpaDaoSupportTests.java | 3 + .../support/OpenEntityManagerInViewTests.java | 6 ++ .../support/PersistenceInjectionTests.java | 5 ++ ...kEntityManagerFactoryIntegrationTests.java | 1 + ...iEntityManagerFactoryIntegrationTests.java | 1 + ...DependencyInjectionSpringContextTests.java | 1 + .../AbstractSingleSpringContextTests.java | 3 + ...sactionalDataSourceSpringContextTests.java | 1 + ...stractTransactionalSpringContextTests.java | 2 + .../test/ConditionalTestCase.java | 1 + ...ractAnnotationAwareTransactionalTests.java | 1 + .../annotation/SystemProfileValueSource.java | 1 + .../test/jpa/AbstractJpaTests.java | 4 ++ .../transaction/MockJtaTransaction.java | 7 ++ .../oxm/jaxb/Jaxb2MarshallerTests.java | 4 ++ .../web/struts/TestAction.java | 1 + .../web/servlet/DefaultMvcResultTests.java | 2 + .../test/web/servlet/StubMvcResult.java | 9 +++ .../MockHttpServletRequestBuilderTests.java | 1 + .../result/PrintingResultHandlerTests.java | 3 + .../samples/standalone/AsyncTests.java | 1 + .../samples/standalone/FilterTests.java | 1 + .../standalone/RequestBuilderTests.java | 1 + ...ConditionalDelegatingFilterProxyTests.java | 3 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../mock/web/MockFilterChainTests.java | 3 + ...stractSpr3350SingleSpringContextTests.java | 1 + ...sBasedSpr3350SingleSpringContextTests.java | 2 + ...DependencyInjectionSpringContextTests.java | 1 + ...lBasedSpr3350SingleSpringContextTests.java | 1 + ...alueAnnotationAwareTransactionalTests.java | 1 + .../test/context/ContextLoaderUtilsTests.java | 2 + .../MergedContextConfigurationTests.java | 2 + .../SpringRunnerContextCacheTests.java | 1 + ...ransactionalJUnit38SpringContextTests.java | 2 + ...ProfileValueJUnit38SpringContextTests.java | 1 + .../ClassLevelDisabledSpringRunnerTests.java | 5 ++ ...TransactionalJUnit4SpringContextTests.java | 3 + ...edProfileValueSourceSpringRunnerTests.java | 1 + ...ackTrueTransactionalSpringRunnerTests.java | 2 + .../SpringJUnit4ClassRunnerAppCtxTests.java | 3 + .../junit4/aci/DevProfileInitializer.java | 1 + .../junit4/aci/FooBarAliasInitializer.java | 1 + ...alizerWithoutConfigFilesOrClassesTest.java | 1 + ...rgedInitializersAnnotationConfigTests.java | 1 + ...eredInitializersAnnotationConfigTests.java | 3 + .../hibernate/HibernatePersonRepository.java | 2 + .../service/impl/StandardPersonService.java | 2 + ...aTransactionManagementConfigurerTests.java | 1 + ...TransactionalTestNGSpringContextTests.java | 2 + .../FailingBeforeAndAfterMethodsTests.java | 7 ++ .../context/web/AbstractBasicWacTests.java | 1 + .../CallCountingTransactionManager.java | 4 ++ .../test/util/ReflectionTestUtilsTests.java | 6 ++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../CollectingReaderEventListener.java | 4 ++ ...tenceExceptionTranslationAdvisorTests.java | 2 + ...xceptionTranslationPostProcessorTests.java | 1 + .../dao/support/DataAccessUtilsTests.java | 1 + .../jca/cci/CciLocalTransactionTests.java | 2 + .../jca/cci/CciTemplateTests.java | 1 + .../jca/cci/EisOperationTests.java | 2 + .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../CallCountingTransactionManager.java | 4 ++ .../JndiJtaTransactionManagerTests.java | 5 ++ .../JtaTransactionManagerTests.java | 50 ++++++++++++++ ...kCallbackPreferringTransactionManager.java | 4 ++ .../transaction/MockJtaTransaction.java | 7 ++ .../transaction/TestTransactionManager.java | 6 ++ .../transaction/TransactionSupportTests.java | 7 ++ .../TxNamespaceHandlerEventTests.java | 1 + .../transaction/TxNamespaceHandlerTests.java | 1 + ...tationTransactionAttributeSourceTests.java | 33 +++++++++ ...AnnotationTransactionInterceptorTests.java | 7 ++ ...ationTransactionNamespaceHandlerTests.java | 2 + .../EnableTransactionManagementTests.java | 1 + .../config/AnnotationDrivenTests.java | 1 + .../AbstractTransactionAspectTests.java | 7 ++ .../BeanFactoryTransactionTests.java | 6 ++ .../MapTransactionAttributeSource.java | 2 + .../PlatformTransactionManagerFacade.java | 3 + .../TransactionInterceptorTests.java | 5 ++ .../transaction/jta/MockUOWManager.java | 11 +++ .../WebSphereUowTransactionManagerTests.java | 19 +++++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 28 ++++++++ .../beans/factory/DummyFactory.java | 7 ++ .../core/task/MockRunnable.java | 1 + .../http/MockHttpInputMessage.java | 2 + .../http/MockHttpOutputMessage.java | 2 + ...BufferedSimpleHttpRequestFactoryTests.java | 1 + ...mponentsClientHttpRequestFactoryTests.java | 1 + ...rceptingClientHttpRequestFactoryTests.java | 18 +++++ ...treamingSimpleHttpRequestFactoryTests.java | 1 + .../FormHttpMessageConverterTests.java | 4 ++ .../test/DelegatingServletInputStream.java | 2 + .../test/DelegatingServletOutputStream.java | 3 + .../mock/web/test/MockAsyncContext.java | 13 ++++ .../mock/web/test/MockBodyContent.java | 28 ++++++++ .../web/test/MockExpressionEvaluator.java | 3 + .../mock/web/test/MockFilterChain.java | 4 ++ .../mock/web/test/MockFilterConfig.java | 4 ++ .../mock/web/test/MockHttpServletRequest.java | 66 ++++++++++++++++++ .../web/test/MockHttpServletResponse.java | 42 +++++++++++ .../mock/web/test/MockHttpSession.java | 17 +++++ .../mock/web/test/MockJspWriter.java | 26 +++++++ .../mock/web/test/MockMultipartFile.java | 8 +++ .../test/MockMultipartHttpServletRequest.java | 9 +++ .../mock/web/test/MockPageContext.java | 27 ++++++++ .../mock/web/test/MockPart.java | 9 +++ .../mock/web/test/MockRequestDispatcher.java | 2 + .../mock/web/test/MockServletConfig.java | 4 ++ .../mock/web/test/MockServletContext.java | 51 ++++++++++++++ .../mock/web/test/PassThroughFilterChain.java | 1 + .../remoting/caucho/CauchoRemotingTests.java | 6 ++ .../httpinvoker/HttpInvokerTests.java | 19 +++++ .../remoting/jaxrpc/JaxRpcSupportTests.java | 17 +++++ .../remoting/jaxws/OrderServiceImpl.java | 1 + .../bind/ServletRequestDataBinderTests.java | 2 + .../support/WebRequestDataBinderTests.java | 1 + .../request/RequestContextListenerTests.java | 1 + .../context/request/RequestScopeTests.java | 1 + .../context/request/SessionScopeTests.java | 7 ++ .../request/async/DeferredResultTests.java | 2 + .../request/async/WebAsyncManagerTests.java | 1 + .../async/WebAsyncManagerTimeoutTests.java | 5 ++ .../web/filter/CompositeFilterTests.java | 3 + .../filter/DelegatingFilterProxyTests.java | 3 + .../filter/HiddenHttpMethodFilterTest.java | 2 + .../web/filter/RequestContextFilterTests.java | 1 + .../web/filter/RequestLoggingFilterTests.java | 4 ++ .../filter/ShallowEtagHeaderFilterTests.java | 3 + .../web/jsf/DelegatingPhaseListenerTests.java | 5 ++ .../jsf/DelegatingVariableResolverTests.java | 3 + .../web/jsf/MockFacesContext.java | 19 +++++ .../web/jsf/MockLifecycle.java | 5 ++ .../ModelAttributeMethodProcessorTests.java | 3 + .../support/InvocableHandlerMethodTests.java | 2 + .../method/support/StubArgumentResolver.java | 2 + .../support/StubReturnValueHandler.java | 2 + .../CommonsMultipartResolverTests.java | 17 +++++ .../util/ExpressionEvaluationUtilsTests.java | 3 + .../web/util/MockLog4jAppender.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../factory/AbstractBeanFactoryTests.java | 1 + .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../springframework/context/ACATester.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + .../web/DelegatingServletOutputStream.java | 3 + .../mock/web/MockHttpServletResponse.java | 38 ++++++++++ .../mock/web/MockHttpSession.java | 17 +++++ .../mock/web/MockMultipartFile.java | 8 +++ .../mock/web/MockRequestDispatcher.java | 2 + .../mock/web/MockServletContext.java | 25 +++++++ .../mock/web/portlet/MockActionResponse.java | 7 ++ .../mock/web/portlet/MockBaseURL.java | 9 +++ .../mock/web/portlet/MockCacheControl.java | 8 +++ .../web/portlet/MockClientDataRequest.java | 7 ++ .../mock/web/portlet/MockEvent.java | 3 + .../mock/web/portlet/MockEventRequest.java | 2 + .../mock/web/portlet/MockEventResponse.java | 1 + .../mock/web/portlet/MockMimeResponse.java | 16 +++++ .../portlet/MockMultipartActionRequest.java | 6 ++ .../mock/web/portlet/MockPortalContext.java | 5 ++ .../mock/web/portlet/MockPortletConfig.java | 11 +++ .../mock/web/portlet/MockPortletContext.java | 20 ++++++ .../mock/web/portlet/MockPortletRequest.java | 38 ++++++++++ .../portlet/MockPortletRequestDispatcher.java | 3 + .../mock/web/portlet/MockPortletResponse.java | 7 ++ .../mock/web/portlet/MockPortletSession.java | 18 +++++ .../mock/web/portlet/MockPortletURL.java | 5 ++ .../mock/web/portlet/MockRenderRequest.java | 1 + .../mock/web/portlet/MockRenderResponse.java | 2 + .../mock/web/portlet/MockResourceRequest.java | 4 ++ .../web/portlet/MockResourceResponse.java | 1 + .../mock/web/portlet/MockResourceURL.java | 3 + .../web/portlet/MockStateAwareResponse.java | 11 +++ .../ServletWrappingPortletContext.java | 20 ++++++ .../ComplexPortletApplicationContext.java | 39 +++++++++++ .../web/portlet/DispatcherPortletTests.java | 1 + .../SimplePortletApplicationContext.java | 5 ++ .../bind/PortletRequestDataBinderTests.java | 1 + ...AbstractXmlWebApplicationContextTests.java | 4 ++ .../context/PortletConfigAwareBean.java | 1 + .../context/PortletContextAwareBean.java | 1 + .../XmlPortletApplicationContextTests.java | 6 ++ .../handler/ParameterHandlerMappingTests.java | 1 + .../PortletModeHandlerMappingTests.java | 1 + ...rtletModeParameterHandlerMappingTests.java | 1 + .../SimpleMappingExceptionResolverTests.java | 1 + .../portlet/mvc/CommandControllerTests.java | 16 +++++ .../PortletModeNameViewControllerTests.java | 1 + .../mvc/PortletWrappingControllerTests.java | 5 ++ .../Portlet20AnnotationControllerTests.java | 25 +++++++ .../PortletAnnotationControllerTests.java | 24 +++++++ .../web/portlet/util/PortletUtilsTests.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 20 ++++++ .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../springframework/context/ACATester.java | 1 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../web/context/AbstractBeanFactoryTests.java | 1 + .../web/context/ContextLoaderTests.java | 6 ++ .../ResourceBundleMessageSourceTests.java | 3 + .../web/context/ServletConfigAwareBean.java | 1 + .../web/context/ServletContextAwareBean.java | 1 + .../XmlWebApplicationContextTests.java | 8 +++ .../support/HttpRequestHandlerTests.java | 1 + .../support/ServletContextSupportTests.java | 4 ++ .../servlet/ComplexWebApplicationContext.java | 33 +++++++++ .../web/servlet/DispatcherServletTests.java | 2 + .../servlet/SimpleWebApplicationContext.java | 4 ++ ...tationDrivenBeanDefinitionParserTests.java | 7 ++ .../web/servlet/config/MvcNamespaceTests.java | 2 + .../annotation/InterceptorRegistryTests.java | 3 + ...MvcConfigurationSupportExtensionTests.java | 3 + .../BeanNameUrlHandlerMappingTests.java | 1 + .../mvc/CancellableFormControllerTests.java | 3 + .../servlet/mvc/CommandControllerTests.java | 12 ++++ .../web/servlet/mvc/ControllerTests.java | 5 ++ .../web/servlet/mvc/FormControllerTests.java | 14 ++++ .../mvc/WizardFormControllerTests.java | 9 +++ ...ontrollerClassNameHandlerMappingTests.java | 1 + .../JdkProxyServletAnnotationTests.java | 3 + ...estSpecificMappingInfoComparatorTests.java | 1 + .../ServletAnnotationControllerTests.java | 35 ++++++++++ .../servlet/mvc/annotation/Spr7766Tests.java | 1 + .../servlet/mvc/annotation/Spr7839Tests.java | 1 + .../web/servlet/mvc/mapping/Controller.java | 1 + ...ControllerBeanNameHandlerMappingTests.java | 1 + ...ontrollerClassNameHandlerMappingTests.java | 1 + .../mvc/mapping/WelcomeController.java | 1 + .../mvc/method/RequestMappingInfoTests.java | 1 + ...HandlerMethodAnnotationDetectionTests.java | 18 +++++ .../HttpEntityMethodProcessorTests.java | 3 + ...ResolverMethodReturnValueHandlerTests.java | 1 + ...MappingHandlerAdapterIntegrationTests.java | 5 ++ ...equestPartMethodArgumentResolverTests.java | 1 + ...tResponseBodyMethodProcessorMockTests.java | 1 + ...questResponseBodyMethodProcessorTests.java | 3 + ...nnotationControllerHandlerMethodTests.java | 58 ++++++++++++++++ .../ServletInvocableHandlerMethodTests.java | 2 + ...letRequestMethodArgumentResolverTests.java | 1 + ...nnotationControllerHandlerMethodTests.java | 3 + .../RedirectAttributesModelMapTests.java | 1 + .../support/MockFilterRegistration.java | 11 +++ .../support/MockServletRegistration.java | 14 ++++ .../RequestDataValueProcessorWrapper.java | 4 ++ .../BindTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/BindTagTests.java | 2 + .../web/servlet/tags/EvalTagTests.java | 1 + ...scapeTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/HtmlEscapeTagTests.java | 9 +++ ...ssageTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/MessageTagTests.java | 20 ++++++ .../web/servlet/tags/ParamTagTests.java | 1 + .../web/servlet/tags/ThemeTagTests.java | 1 + .../tags/form/AbstractFormTagTests.java | 2 + .../form/AbstractHtmlElementTagTests.java | 1 + .../web/servlet/tags/form/ButtonTagTests.java | 2 + .../servlet/tags/form/CheckboxTagTests.java | 5 ++ .../servlet/tags/form/CheckboxesTagTests.java | 8 +++ .../web/servlet/tags/form/ErrorsTagTests.java | 4 ++ .../web/servlet/tags/form/FormTagTests.java | 2 + .../tags/form/HiddenInputTagTests.java | 3 + .../web/servlet/tags/form/InputTagTests.java | 3 + .../web/servlet/tags/form/ItemPet.java | 2 + .../web/servlet/tags/form/LabelTagTests.java | 4 ++ .../servlet/tags/form/OptionTagEnumTests.java | 3 + .../web/servlet/tags/form/OptionTagTests.java | 15 ++++ .../servlet/tags/form/OptionsTagTests.java | 6 ++ .../tags/form/PasswordInputTagTests.java | 5 ++ .../tags/form/RadioButtonTagTests.java | 5 ++ .../tags/form/RadioButtonsTagTests.java | 4 ++ .../web/servlet/tags/form/SelectTagTests.java | 22 ++++++ .../servlet/tags/form/SimpleFloatEditor.java | 2 + .../web/servlet/tags/form/TagWriterTests.java | 1 + .../servlet/tags/form/TextareaTagTests.java | 3 + .../web/servlet/view/BaseViewTests.java | 3 + .../view/InternalResourceViewTests.java | 2 + ...esourceBundleViewResolverNoCacheTests.java | 1 + .../view/ResourceBundleViewResolverTests.java | 3 + .../web/servlet/view/ViewResolverTests.java | 6 ++ .../servlet/view/document/ExcelViewTests.java | 11 +++ .../servlet/view/document/PdfViewTests.java | 1 + .../freemarker/FreeMarkerConfigurerTests.java | 2 + .../view/freemarker/FreeMarkerViewTests.java | 2 + .../AbstractJasperReportsTests.java | 1 + .../AbstractJasperReportsViewTests.java | 2 + ...rableJasperReportsViewWithStreamTests.java | 2 + ...rableJasperReportsViewWithWriterTests.java | 2 + .../jasperreports/ExporterParameterTests.java | 1 + .../JasperReportsCsvViewTests.java | 2 + .../JasperReportsHtmlViewTests.java | 2 + .../JasperReportsMultiFormatViewTests.java | 5 ++ ...ultiFormatViewWithCustomMappingsTests.java | 3 + .../JasperReportsPdfViewTests.java | 2 + .../JasperReportsXlsViewTests.java | 2 + .../view/velocity/TestVelocityEngine.java | 1 + .../velocity/VelocityConfigurerTests.java | 4 ++ .../view/velocity/VelocityMacroTests.java | 4 ++ .../view/velocity/VelocityRenderTests.java | 5 ++ .../velocity/VelocityToolboxViewTests.java | 2 + .../velocity/VelocityViewResolverTests.java | 4 ++ .../view/velocity/VelocityViewTests.java | 8 +++ .../servlet/view/xslt/TestXsltViewTests.java | 13 ++++ ...visorAutoProxyCreatorIntegrationTests.java | 8 +++ .../EnableCachingIntegrationTests.java | 1 + ...ionScannerJsr330ScopeIntegrationTests.java | 3 + ...efinitionScannerScopeIntegrationTests.java | 3 + .../core/env/EnvironmentIntegrationTests.java | 1 + .../support/BeanFactoryTypeConverter.java | 3 + ...ansactionalAnnotationIntegrationTests.java | 3 + .../CallCountingTransactionManager.java | 4 ++ ...TransactionManagementIntegrationTests.java | 3 + .../ProxyAnnotationDiscoveryTests.java | 2 + .../advice/CountingAfterReturningAdvice.java | 1 + .../test/advice/CountingBeforeAdvice.java | 1 + src/test/java/test/beans/NestedTestBean.java | 1 + src/test/java/test/beans/TestBean.java | 20 ++++++ .../java/test/interceptor/NopInterceptor.java | 1 + .../SerializableNopInterceptor.java | 2 + 797 files changed, 4745 insertions(+) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java index 2b09c8a30d0..630c1e3ea44 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java @@ -113,6 +113,7 @@ public final class AspectJExpressionPointcutTests { public static class OtherIOther implements IOther { + @Override public void absquatulate() { // Empty } @@ -354,6 +355,7 @@ class CallCountingInterceptor implements MethodInterceptor { private int count; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { count++; return methodInvocation.proceed(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java index 37140304cbf..1c30480fbd6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java @@ -90,6 +90,7 @@ public final class BeanNamePointcutMatchingTests { private static boolean matches(final String beanName, String pcExpression) { @SuppressWarnings("serial") AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut() { + @Override protected String getCurrentProxiedBeanName() { return beanName; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index e72e475abee..2af6f16be4f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -79,6 +79,7 @@ public final class MethodInvocationProceedingJoinPointTests { pf.addAdvice(new MethodBeforeAdvice() { private int depth; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint(); assertTrue("Method named in toString", jp.toString().contains(method.getName())); @@ -135,6 +136,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { SourceLocation sloc = AbstractAspectJAdvice.currentJoinPoint().getSourceLocation(); assertEquals("Same source location must be returned on subsequent requests", sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation()); @@ -167,6 +169,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { StaticPart staticPart = AbstractAspectJAdvice.currentJoinPoint().getStaticPart(); assertEquals("Same static part must be returned on subsequent requests", staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart()); @@ -186,6 +189,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { // makeEncSJP, although meant for computing the enclosing join point, // it serves our purpose here diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index c10c50ddf8a..088ba138c35 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -137,6 +137,7 @@ public class TrickyAspectJPointcutExpressionTests { @Log public static class TestServiceImpl implements TestService { + @Override public String sayHello() { throw new TestException("TestServiceImpl"); } @@ -148,6 +149,7 @@ public class TrickyAspectJPointcutExpressionTests { private int countThrows = 0; + @Override public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index f6f82fb4122..ae3ac04918e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -675,19 +675,23 @@ public abstract class AbstractAspectJAdvisorFactoryTests { return this.count; } + @Override public Object getAspectInstance() { ++this.count; return new PerTypeWithinAspect(); } + @Override public ClassLoader getAspectClassLoader() { return PerTypeWithinAspect.class.getClassLoader(); } + @Override public AspectMetadata getAspectMetadata() { return new AspectMetadata(PerTypeWithinAspect.class, "perTypeWithin"); } + @Override public int getOrder() { return Ordered.LOWEST_PRECEDENCE; } @@ -897,14 +901,17 @@ abstract class AbstractMakeModifiable { public static class ModifiableImpl implements MutableModifable { private boolean modified; + @Override public void acceptChanges() { modified = false; } + @Override public boolean isModified() { return modified; } + @Override public void markDirty() { this.modified = true; } @@ -1020,17 +1027,21 @@ class MakeLockable { class CannotBeUnlocked implements Lockable, Comparable { + @Override public void lock() { } + @Override public void unlock() { throw new UnsupportedOperationException(); } + @Override public boolean locked() { return true; } + @Override public int compareTo(Object arg0) { throw new UnsupportedOperationException(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java index ebb9f03c437..6a5a746063c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java @@ -84,6 +84,7 @@ public final class ArgumentBindingTests { public static class TransactionalBean implements ITransactionalBean { + @Override @Transactional public void doInTransaction() { } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java index d6c24cd0a10..c0b30c27e28 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java @@ -111,6 +111,7 @@ public final class AspectProxyFactoryTests { private int age; + @Override public int getAge() { return age; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java index de10e14b420..9c4b78b54d3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java @@ -194,6 +194,7 @@ public final class AspectJPrecedenceComparatorTests { private Advisor createSpringAOPAfterAdvice(int order) { AfterReturningAdvice advice = new AfterReturningAdvice() { + @Override public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { } }; diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java index fc5268c840d..96a22b33536 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java @@ -129,6 +129,7 @@ public final class AopProxyUtilsTests { public void testProxiedUserInterfacesWithNoInterface() { Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[0], new InvocationHandler() { + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { return null; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java index 9de89648053..5940cd57187 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java @@ -42,6 +42,7 @@ public final class IntroductionBenchmarkTests { @SuppressWarnings("serial") public static class SimpleCounterIntroduction extends DelegatingIntroductionInterceptor implements Counter { + @Override public int getCount() { return EXPECTED_COMPARE; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java index f5c4a8edcae..f4602bf0b5c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java @@ -42,6 +42,7 @@ public final class MethodInvocationTests { final Object returnValue = new Object(); List is = new LinkedList(); is.add(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return returnValue; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java index 1879f8a4cd4..11b127d0bcb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java @@ -44,6 +44,7 @@ public class NullPrimitiveTests { public void testNullPrimitiveWithJdkProxy() { class SimpleFoo implements Foo { + @Override public int getValue() { return 100; } @@ -52,6 +53,7 @@ public class NullPrimitiveTests { SimpleFoo target = new SimpleFoo(); ProxyFactory factory = new ProxyFactory(target); factory.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return null; } @@ -76,6 +78,7 @@ public class NullPrimitiveTests { Bar target = new Bar(); ProxyFactory factory = new ProxyFactory(target); factory.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return null; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java index 814b9025409..64abdd4891e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java @@ -73,6 +73,7 @@ public final class PrototypeTargetTests { constructionCount++; } + @Override public void doSomething() { } } @@ -81,6 +82,7 @@ public final class PrototypeTargetTests { public static class TestInterceptor implements MethodInterceptor { private int invocationCount = 0; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { invocationCount++; return methodInvocation.proceed(); diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java index f8999fe6744..1255baae2a9 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java @@ -165,6 +165,7 @@ public final class ProxyFactoryTests { @Test public void testAddRepeatedInterface() { TimeStamped tst = new TimeStamped() { + @Override public long getTimeStamp() { throw new UnsupportedOperationException("getTimeStamp"); } @@ -181,6 +182,7 @@ public final class ProxyFactoryTests { public void testGetsAllInterfaces() throws Exception { // Extend to get new interface class TestBeanSubclass extends TestBean implements Comparable { + @Override public int compareTo(Object arg0) { throw new UnsupportedOperationException("compareTo"); } @@ -214,6 +216,7 @@ public final class ProxyFactoryTests { @Test public void testInterceptorInclusionMethods() { class MyInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw new UnsupportedOperationException(); } @@ -350,6 +353,7 @@ public final class ProxyFactoryTests { this.ts = ts; } + @Override public long getTimeStamp() { return ts; } 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 ceae4f577e8..1a245999d12 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 @@ -125,6 +125,7 @@ public final class ThrowsAdviceInterceptorTests { @SuppressWarnings("serial") MyThrowsHandler th = new MyThrowsHandler() { + @Override public void afterThrowing(RemoteException ex) throws Throwable { super.afterThrowing(ex); throw t; diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java index 9b3aaf6d9a3..0d2edb525aa 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java @@ -120,6 +120,7 @@ public final class ConcurrencyThrottleInterceptorTests { this.ex = ex; } + @Override public void run() { if (this.ex != null) { try { diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java index 1fe27b3dfc5..14845cfd5ce 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java @@ -189,6 +189,7 @@ public final class CustomizableTraceInterceptorTests { this.log = log; } + @Override protected Log getLoggerForInvocation(MethodInvocation invocation) { return this.log; } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java index cd7f8b8bda5..92908baac7c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java @@ -96,6 +96,7 @@ public final class DebugInterceptorTests { this.log = log; } + @Override protected Log getLoggerForInvocation(MethodInvocation invocation) { return log; } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index c5f6cf8fe43..fc19053502b 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -38,6 +38,7 @@ public final class ExposeBeanNameAdvisorsTests { this.beanName = beanName; } + @Override public int getAge() { assertEquals(beanName, ExposeBeanNameAdvisors.getBeanName()); return super.getAge(); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java index 72e2cf36933..f514800cfb5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java @@ -53,12 +53,14 @@ public final class ExposeInvocationInterceptorTests { abstract class ExposedInvocationTestBean extends TestBean { + @Override public String getName() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); return super.getName(); } + @Override public void absquatulate() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); @@ -70,6 +72,7 @@ abstract class ExposedInvocationTestBean extends TestBean { class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean { + @Override protected void assertions(MethodInvocation invocation) { assertTrue(invocation.getThis() == this); assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), 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 6b86cd7232a..6090b16b8dd 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 @@ -40,6 +40,7 @@ public final class AopUtilsTests { @Test public void testPointcutCanNeverApply() { class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazzy) { return false; } @@ -58,6 +59,7 @@ public final class AopUtilsTests { @Test public void testPointcutAppliesToOneMethodOnObject() { class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazz) { return method.getName().equals("hashCode"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java index 41c3e2dd54a..b66105de6c7 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java @@ -35,24 +35,28 @@ import test.beans.TestBean; public final class ComposablePointcutTests { public static MethodMatcher GETTER_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } }; public static MethodMatcher GET_AGE_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("getAge"); } }; public static MethodMatcher ABSQUATULATE_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("absquatulate"); } }; public static MethodMatcher SETTER_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index f74bb4c61e9..65d58d61f89 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -112,8 +112,10 @@ public final class DelegatingIntroductionInterceptorTests { public void testAutomaticInterfaceRecognitionInDelegate() throws Exception { final long t = 1001L; class Tester implements TimeStamped, ITester { + @Override public void foo() throws Exception { } + @Override public long getTimeStamp() { return t; } @@ -141,8 +143,10 @@ public final class DelegatingIntroductionInterceptorTests { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester { + @Override public void foo() throws Exception { } + @Override public long getTimeStamp() { return t; } @@ -206,6 +210,7 @@ public final class DelegatingIntroductionInterceptorTests { String company = "Interface21"; target.setCompany(company); TestBean delegate = new TestBean() { + @Override public ITestBean getSpouse() { return this; } @@ -250,6 +255,7 @@ public final class DelegatingIntroductionInterceptorTests { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped { + @Override public long getTimeStamp() { return t; } @@ -278,6 +284,7 @@ public final class DelegatingIntroductionInterceptorTests { this.ts = ts; } + @Override public long getTimeStamp() { return ts; } @@ -292,6 +299,7 @@ public final class DelegatingIntroductionInterceptorTests { this.t = t; } + @Override public long getTimeStamp() { return t; } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java index ca4f8839c8e..404fc55d81f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java @@ -21,6 +21,7 @@ package org.springframework.aop.support; */ public final class JdkRegexpMethodPointcutTests extends AbstractRegexpMethodPointcutTests { + @Override protected AbstractRegexpMethodPointcut getRegexpMethodPointcut() { return new JdkRegexpMethodPointcut(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java index a55b083a3f3..614ba7a532e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java @@ -107,6 +107,7 @@ public final class MethodMatchersTests { public StartsWithMatcher(String s) { this.prefix = s; } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith(prefix); } @@ -114,12 +115,14 @@ public final class MethodMatchersTests { private static class TestDynamicMethodMatcherWhichMatches extends DynamicMethodMatcher { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return true; } } private static class TestDynamicMethodMatcherWhichDoesNotMatch extends DynamicMethodMatcher { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return false; } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java index e7967198669..72255612dfe 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java @@ -53,14 +53,17 @@ public final class PointcutsTests { * Matches only TestBean class, not subclasses */ public static Pointcut allTestBeanMethodsPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new ClassFilter() { + @Override public boolean matches(Class clazz) { return clazz.equals(TestBean.class); } }; } + @Override public boolean matches(Method m, Class targetClass) { return true; } @@ -73,10 +76,12 @@ public final class PointcutsTests { } public static Pointcut myTestBeanSetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBean.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set"); } @@ -84,10 +89,12 @@ public final class PointcutsTests { // Will match MyTestBeanSubclass public static Pointcut myTestBeanGetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBean.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } @@ -98,10 +105,12 @@ public final class PointcutsTests { } public static Pointcut myTestBeanSubclassGetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBeanSubclass.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java index d6dc8f426cd..55661a89012 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java @@ -32,9 +32,11 @@ public final class LazyCreationTargetSourceTests { @Test public void testCreateLazy() { TargetSource targetSource = new AbstractLazyCreationTargetSource() { + @Override protected Object createObject() { return new InitCountingBean(); } + @Override public Class getTargetClass() { return InitCountingBean.class; } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java index d08d6f5357c..4283695ba6c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java @@ -83,6 +83,7 @@ public final class LazyInitTargetSourceTests { @SuppressWarnings("serial") public static class CustomLazyInitTargetSource extends LazyInitTargetSource { + @Override protected void postProcessTargetObject(Object targetObject) { ((ITestBean) targetObject).setName("Rob Harrop"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java index 3fe1c3ca709..39325e2dcbd 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java @@ -70,10 +70,12 @@ public final class PrototypeBasedTargetSourceTests { */ private TestBean thisFieldIsNotSerializable = new TestBean(); + @Override public Object getTarget() throws Exception { return newPrototypeInstance(); } + @Override public void releaseTarget(Object target) throws Exception { // Do nothing } 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 2519e89f823..875ba6dc827 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 @@ -113,6 +113,7 @@ public class ThreadLocalTargetSourceTests { class Runner implements Runnable { public SideEffectBean mine; + @Override public void run() { this.mine = (SideEffectBean) beanFactory.getBean("apartment"); assertEquals(INITIAL_COUNT, mine.getCount() ); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index ee0913a1146..3f90fb8aefc 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -116,6 +116,7 @@ public final class RefreshableTargetSourceTests { this.requiresRefresh = requiresRefresh; } + @Override protected Object freshTarget() { this.callCount++; return new Object(); @@ -125,6 +126,7 @@ public final class RefreshableTargetSourceTests { return this.callCount; } + @Override protected boolean requiresRefresh() { return this.requiresRefresh; } diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java index 7a7baa3ef25..d59b8ddd3be 100644 --- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java +++ b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java index 82c59d8bc54..a7f6c4ac7ef 100644 --- a/spring-aop/src/test/java/test/aop/DefaultLockable.java +++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java @@ -25,14 +25,17 @@ public class DefaultLockable implements Lockable { private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } + @Override public boolean locked() { return this.locked; } diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java index 1dc341d427b..fd4d9e9ff60 100644 --- a/spring-aop/src/test/java/test/aop/NopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java @@ -31,6 +31,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/spring-aop/src/test/java/test/aop/PerTargetAspect.java b/spring-aop/src/test/java/test/aop/PerTargetAspect.java index cee24201381..3896f2dc7ab 100644 --- a/spring-aop/src/test/java/test/aop/PerTargetAspect.java +++ b/spring-aop/src/test/java/test/aop/PerTargetAspect.java @@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java index 3b306743b27..5a21b1d7f09 100644 --- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java @@ -37,10 +37,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; } diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java index 8cb213cefe4..a26ee9b471b 100644 --- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-aop/src/test/java/test/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java index a630f8662a7..6855305fb3d 100644 --- a/spring-aop/src/test/java/test/beans/NestedTestBean.java +++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java index adb2966907e..60fa67417de 100644 --- a/spring-aop/src/test/java/test/beans/SerializablePerson.java +++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java index 8f14fd61a2c..5c5e4abb232 100644 --- a/spring-aop/src/test/java/test/beans/TestBean.java +++ b/spring-aop/src/test/java/test/beans/TestBean.java @@ -146,10 +146,12 @@ public class TestBean implements ITestBean, IOther, Comparable { return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -165,10 +167,12 @@ public class TestBean implements ITestBean, IOther, Comparable { } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -181,14 +185,17 @@ public class TestBean implements ITestBean, IOther, Comparable { this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -215,10 +222,12 @@ public class TestBean implements ITestBean, IOther, Comparable { this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -287,6 +296,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -295,6 +305,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -347,18 +358,21 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -366,9 +380,11 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -398,6 +414,7 @@ public class TestBean implements ITestBean, IOther, Comparable { return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java index 4d9355f616f..be5819bb3cc 100644 --- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java +++ b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java @@ -46,6 +46,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -54,6 +55,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -67,6 +69,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return collection.toArray(new ComponentDefinition[collection.size()]); } + @Override @SuppressWarnings("unchecked") public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); @@ -82,6 +85,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java index 3483077e854..94dd439bfb0 100644 --- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java +++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java @@ -13,6 +13,7 @@ import org.w3c.dom.Element; public class ComponentBeanDefinitionParser extends AbstractBeanDefinitionParser { + @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { return parseComponentElement(element); diff --git a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java index e62eab786e1..ac47c4efea9 100644 --- a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java +++ b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java @@ -16,6 +16,7 @@ public class ComponentFactoryBean implements FactoryBean { this.children = children; } + @Override public Component getObject() throws Exception { if (this.children != null && this.children.size() > 0) { for (Component child : children) { @@ -25,10 +26,12 @@ public class ComponentFactoryBean implements FactoryBean { return this.parent; } + @Override public Class getObjectType() { return Component.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java index 3ccc7f167b5..b29eeca0614 100644 --- a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java +++ b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java @@ -3,6 +3,7 @@ package com.foo; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; public class ComponentNamespaceHandler extends NamespaceHandlerSupport { + @Override public void init() { registerBeanDefinitionParser("component", new ComponentBeanDefinitionParser()); 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 fb6831eb8c2..f62d8003566 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -360,18 +360,22 @@ public final class BeanUtilsTests { private String value; + @Override public String getKey() { return key; } + @Override public void setKey(String aKey) { key = aKey; } + @Override public String getValue() { return value; } + @Override public void setValue(String aValue) { value = aValue; } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index c1f3b5e3acc..5825d6a08b5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -507,6 +507,7 @@ public class BeanWrapperGenericsTests { private Map>> mapOfListOfListOfInteger; + @Override public Map getMapOfInteger() { return mapOfInteger; } @@ -515,10 +516,12 @@ public class BeanWrapperGenericsTests { this.mapOfInteger = mapOfInteger; } + @Override public Map> getMapOfListOfInteger() { return mapOfListOfInteger; } + @Override public void setMapOfListOfInteger(Map> mapOfListOfInteger) { this.mapOfListOfInteger = mapOfListOfInteger; } @@ -591,6 +594,7 @@ public class BeanWrapperGenericsTests { private double version; + @Override public Double getVersion() { return this.version; } @@ -613,10 +617,12 @@ public class BeanWrapperGenericsTests { private Long id; + @Override public Long getId() { return id; } + @Override public void setId(Long aId) { this.id = aId; } 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 d420e860c54..930c530961e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -329,6 +329,7 @@ public final class BeanWrapperTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setValue(Object value) { super.setValue(value.toString()); } @@ -500,6 +501,7 @@ public final class BeanWrapperTests { PropsTester pt = new PropsTester(); BeanWrapper bw = new BeanWrapperImpl(pt); bw.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) { setValue(text.substring(1)); } @@ -559,6 +561,7 @@ public final class BeanWrapperTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof String[]) { setValue(StringUtils.arrayToDelimitedString(((String[]) value), "-")); @@ -636,6 +639,7 @@ public final class BeanWrapperTests { PropsTester pt = new PropsTester(); BeanWrapper bw = new BeanWrapperImpl(pt); bw.registerCustomEditor(int.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) { setValue(new Integer(Integer.parseInt(text) + 1)); } @@ -1022,6 +1026,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1055,6 +1060,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1078,6 +1084,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1191,6 +1198,7 @@ public final class BeanWrapperTests { PrimitiveArrayBean tb = new PrimitiveArrayBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(int.class, "array", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof Integer) { super.setValue(new Integer(((Integer) value).intValue() + 1)); @@ -1209,6 +1217,7 @@ public final class BeanWrapperTests { PrimitiveArrayBean tb = new PrimitiveArrayBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(int.class, "array[1]", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof Integer) { super.setValue(new Integer(((Integer) value).intValue() + 1)); @@ -1821,6 +1830,7 @@ public final class BeanWrapperTests { this.frozen = true; } + @Override public V put(K key, V value) { if (this.frozen) { throw new UnsupportedOperationException(); @@ -1830,16 +1840,19 @@ public final class BeanWrapperTests { } } + @Override public Set> entrySet() { this.accessed = true; return super.entrySet(); } + @Override public Set keySet() { this.accessed = true; return super.keySet(); } + @Override public int size() { this.accessed = true; return super.size(); diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java index 2a0cf025b09..8eaac3b46bc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java @@ -115,6 +115,7 @@ public final class ConcurrentBeanWrapperTests { this.test = test; } + @Override public void run() { try { for (int i = 0; i < 100; i++) { diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java index 5e05fc91db3..fd53b58af71 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java @@ -214,6 +214,7 @@ public class ExtendedBeanInfoTests { @Test public void cornerSpr9453() throws IntrospectionException { final class Bean implements Spr9453> { + @Override public Class getProp() { return null; } @@ -589,7 +590,9 @@ public class ExtendedBeanInfoTests { public Number setFoo(String foo) { return null; } } class C extends B { + @Override public String getFoo() { return null; } + @Override public Integer setFoo(String foo) { return null; } } @@ -861,6 +864,7 @@ public class ExtendedBeanInfoTests { } interface TextBookOperations extends BookOperations { + @Override TextBook getBook(); } @@ -870,6 +874,7 @@ public class ExtendedBeanInfoTests { } class LawLibrary extends Library implements TextBookOperations { + @Override public LawBook getBook() { return null; } } diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java index dd52eea7b82..5696a0ad8c5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java @@ -182,10 +182,12 @@ class RequiredTestBean implements BeanNameAware, BeanFactoryAware { this.jobTitle = jobTitle; } + @Override @Required public void setBeanName(String name) { } + @Override @Required public void setBeanFactory(BeanFactory beanFactory) { } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java index 3ba946c9626..f3b990fdbab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java @@ -72,6 +72,7 @@ public final class ConcurrentBeanFactoryTests { public void setUp() throws Exception { XmlBeanFactory factory = new XmlBeanFactory(CONTEXT); factory.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Date.class, new CustomDateEditor((DateFormat) DATE_FORMAT.clone(), false)); } @@ -125,6 +126,7 @@ public final class ConcurrentBeanFactoryTests { private class TestRun extends Thread { + @Override public void run() { try { for (int i = 0; i < 10000; i++) { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index d52f73e510b..bc9f1ffba10 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -836,6 +836,7 @@ public class DefaultListableBeanFactoryTests { public void testCustomEditor() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); @@ -853,6 +854,7 @@ public class DefaultListableBeanFactoryTests { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); GenericConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter() { + @Override public Float convert(String source) { try { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); @@ -875,6 +877,7 @@ public class DefaultListableBeanFactoryTests { public void testCustomEditorWithBeanReference() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); @@ -1907,9 +1910,11 @@ public class DefaultListableBeanFactoryTests { RootBeanDefinition bd = new RootBeanDefinition(BeanWithDisposableBean.class); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -1926,9 +1931,11 @@ public class DefaultListableBeanFactoryTests { RootBeanDefinition bd = new RootBeanDefinition(BeanWithCloseable.class); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -1946,9 +1953,11 @@ public class DefaultListableBeanFactoryTests { bd.setDestroyMethodName("close"); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -2117,6 +2126,7 @@ public class DefaultListableBeanFactoryTests { lbf.registerBeanDefinition("test", bd); final String nameSetOnField = "nameSetOnField"; lbf.addBeanPostProcessor(new InstantiationAwareBeanPostProcessorAdapter() { + @Override public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException { TestBean tb = (TestBean) bean; try { @@ -2156,6 +2166,7 @@ public class DefaultListableBeanFactoryTests { TestSecuredBean bean = (TestSecuredBean) Subject.doAsPrivileged(subject, new PrivilegedAction() { + @Override public Object run() { return lbf.getBean("test"); } @@ -2244,14 +2255,17 @@ public class DefaultListableBeanFactoryTests { public ConstructorDependencyFactoryBean(String dependency) { } + @Override public Object getObject() { return "test"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -2262,6 +2276,7 @@ public class DefaultListableBeanFactoryTests { private static boolean closed; + @Override public void destroy() { closed = true; } @@ -2272,6 +2287,7 @@ public class DefaultListableBeanFactoryTests { private static boolean closed; + @Override public void close() { closed = true; } @@ -2316,14 +2332,17 @@ public class DefaultListableBeanFactoryTests { public static class FactoryBeanThatShouldntBeCalled implements FactoryBean { + @Override public Object getObject() { throw new IllegalStateException(); } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return false; } @@ -2334,15 +2353,18 @@ public class DefaultListableBeanFactoryTests { public boolean initialized = false; + @Override public Object getObject() throws Exception { this.initialized = true; return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -2353,23 +2375,28 @@ public class DefaultListableBeanFactoryTests { public boolean initialized = false; + @Override public Object getObject() throws Exception { this.initialized = true; return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } + @Override public boolean isPrototype() { return false; } + @Override public boolean isEagerInit() { return true; } @@ -2452,6 +2479,7 @@ public class DefaultListableBeanFactoryTests { this.numberFormat = numberFormat; } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType) { if (value instanceof String && Float.class.isAssignableFrom(requiredType)) { @@ -2470,11 +2498,13 @@ public class DefaultListableBeanFactoryTests { } } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType, MethodParameter methodParam) { return convertIfNecessary(value, requiredType); } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType, Field field) { return convertIfNecessary(value, requiredType); @@ -2490,6 +2520,7 @@ public class DefaultListableBeanFactoryTests { this.name = name; } + @Override public String getName() { return this.name; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java index c1e5f9acfed..5bb7f93ae06 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java @@ -77,14 +77,17 @@ public final class FactoryBeanTests { public static class NullReturningFactoryBean implements FactoryBean { + @Override public Object getObject() { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } @@ -103,6 +106,7 @@ public final class FactoryBeanTests { return beta; } + @Override public void afterPropertiesSet() { Assert.notNull(beta, "'beta' property is required"); } @@ -131,6 +135,7 @@ public final class FactoryBeanTests { return name; } + @Override public void afterPropertiesSet() { Assert.notNull(gamma, "'gamma' property is required"); } @@ -149,14 +154,17 @@ public final class FactoryBeanTests { this.beta = beta; } + @Override public Object getObject() { return this.beta; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } 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 15dd2bcf93a..e417ccdba09 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 @@ -43,6 +43,7 @@ public final class SharedBeanRegistryTests { assertSame(tb, beanRegistry.getSingleton("tb")); TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return new TestBean(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index a24c78d9893..9df0cbc3090 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -989,6 +989,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { public ExtendedResourceInjectionBean() { } + @Override @Autowired @Required public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1068,6 +1069,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Autowired(required = false) public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1114,6 +1116,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Autowired(required = false) public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1185,6 +1188,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { throw new UnsupportedOperationException(); } + @Override @Autowired public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1447,14 +1451,17 @@ public final class AutowiredAnnotationBeanPostProcessorTests { public static class StringFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java index 4f96efc8d3c..6afaa8b219a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java @@ -69,6 +69,7 @@ public final class CustomAutowireConfigurerTests { public static class CustomResolver implements AutowireCandidateResolver { + @Override public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDescriptor descriptor) { if (!bdHolder.getBeanDefinition().isAutowireCandidate()) { return false; @@ -82,6 +83,7 @@ public final class CustomAutowireConfigurerTests { return false; } + @Override public Object getSuggestedValue(DependencyDescriptor descriptor) { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index fdaa110f360..9760821441d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -609,6 +609,7 @@ public class InjectAnnotationBeanPostProcessorTests { public ExtendedResourceInjectionBean() { } + @Override @Inject @Required public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -662,6 +663,7 @@ public class InjectAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -708,6 +710,7 @@ public class InjectAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -779,6 +782,7 @@ public class InjectAnnotationBeanPostProcessorTests { throw new UnsupportedOperationException(); } + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1074,14 +1078,17 @@ public class InjectAnnotationBeanPostProcessorTests { public static class StringFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java index 265fea19a60..72073bc1905 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java @@ -53,6 +53,7 @@ public final class CustomEditorConfigurerTests { final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN); cec.setPropertyEditorRegistrars(new PropertyEditorRegistrar[] { new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Date.class, new CustomDateEditor(df, true)); } @@ -189,6 +190,7 @@ public final class CustomEditorConfigurerTests { public static class MyTestEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { setValue(new String[] {"test"}); } 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 1f080734bc3..931dd10e8e4 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 @@ -812,6 +812,7 @@ public final class PropertyResourceConfigurerTests { private static class ConvertingOverrideConfigurer extends PropertyOverrideConfigurer { + @Override protected String convertPropertyValue(String originalValue) { return "X" + originalValue; } @@ -826,10 +827,12 @@ public final class PropertyResourceConfigurerTests { private Preferences userRoot = new MockPreferences(); + @Override public Preferences systemRoot() { return systemRoot; } + @Override public Preferences userRoot() { return userRoot; } 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 14b272ee0f0..601e564b63f 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 @@ -53,6 +53,7 @@ public final class SimpleScopeTests { objects.add(new TestBean()); objects.add(new TestBean()); } + @Override public Object get(String name, ObjectFactory objectFactory) { if (index >= objects.size()) { index = 0; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java index 5460f8bd016..e834490226a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java @@ -30,21 +30,26 @@ final class TestTypes {} */ class NoOpScope implements Scope { + @Override public Object get(String name, ObjectFactory objectFactory) { throw new UnsupportedOperationException(); } + @Override public Object remove(String name) { throw new UnsupportedOperationException(); } + @Override public void registerDestructionCallback(String name, Runnable callback) { } + @Override public Object resolveContextualObject(String key) { return null; } + @Override public String getConversationId() { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java index d5e4441f20e..10422ae527e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java @@ -71,10 +71,12 @@ public final class CustomProblemReporterTests { private List warnings = new ArrayList(); + @Override public void fatal(Problem problem) { throw new BeanDefinitionParsingException(problem); } + @Override public void error(Problem problem) { System.out.println(problem); this.errors.add(problem); @@ -84,6 +86,7 @@ public final class CustomProblemReporterTests { return this.errors.toArray(new Problem[this.errors.size()]); } + @Override public void warning(Problem problem) { System.out.println(problem); this.warnings.add(problem); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index f01cc9b303f..9a4612382ee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -391,6 +391,7 @@ public class BeanFactoryGenericsTests { public void testGenericMapWithCollectionValueConstructor() throws MalformedURLException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); } @@ -547,6 +548,7 @@ public class BeanFactoryGenericsTests { public void testGenericMapWithCollectionValueFactoryMethod() throws MalformedURLException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); } 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 3442e720d4c..caacb5604fd 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 @@ -30,6 +30,7 @@ public class PropertiesBeanDefinitionReaderTests extends TestCase { private PropertiesBeanDefinitionReader reader; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.reader = new PropertiesBeanDefinitionReader(beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java index 0cd040b4695..5c1368c4610 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java @@ -61,14 +61,17 @@ public class Spr8954Tests { static class FooFactoryBean implements FactoryBean, AnInterface { + @Override public Foo getObject() throws Exception { return new Foo(); } + @Override public Class getObjectType() { return Foo.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java index cac02472cab..d4c80b410de 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java @@ -129,23 +129,28 @@ public class CallbacksSecurityTests { checkCurrentContext(); } + @Override public void afterPropertiesSet() { checkCurrentContext(); } + @Override public void destroy() { checkCurrentContext(); destroyed = true; } + @Override public void setBeanName(String name) { checkCurrentContext(); } + @Override public void setBeanClassLoader(ClassLoader classLoader) { checkCurrentContext(); } + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { checkCurrentContext(); @@ -164,26 +169,31 @@ public class CallbacksSecurityTests { checkCurrentContext(); } + @Override public boolean isEagerInit() { checkCurrentContext(); return false; } + @Override public boolean isPrototype() { checkCurrentContext(); return true; } + @Override public Object getObject() throws Exception { checkCurrentContext(); return new Object(); } + @Override public Class getObjectType() { checkCurrentContext(); return Object.class; } + @Override public boolean isSingleton() { checkCurrentContext(); return false; @@ -219,6 +229,7 @@ public class CallbacksSecurityTests { return AccessController.doPrivileged(new PrivilegedAction() { + @Override public String run() { Subject subject = Subject.getSubject(acc); if (subject == null) { @@ -246,6 +257,7 @@ public class CallbacksSecurityTests { this.name = name; } + @Override public String getName() { return this.name; } @@ -291,6 +303,7 @@ public class CallbacksSecurityTests { private final AccessControlContext acc = new AccessControlContext( new ProtectionDomain[] { empty }); + @Override public AccessControlContext getAccessControlContext() { return acc; } @@ -320,6 +333,7 @@ public class CallbacksSecurityTests { try { AccessController.doPrivileged(new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { method.invoke(bean); return null; @@ -334,6 +348,7 @@ public class CallbacksSecurityTests { AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { return cl.newInstance(); } @@ -444,6 +459,7 @@ public class CallbacksSecurityTests { AccessController.doPrivileged(new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { beanFactory.getBean("working-factory-method"); beanFactory.getBean("container-execution"); @@ -478,6 +494,7 @@ public class CallbacksSecurityTests { NonPrivilegedBean bean = Subject.doAsPrivileged( subject, new PrivilegedAction() { + @Override public NonPrivilegedBean run() { return lbf.getBean("test", NonPrivilegedBean.class); } @@ -502,6 +519,7 @@ public class CallbacksSecurityTests { // request the beans from non-privileged code Subject.doAsPrivileged(subject, new PrivilegedAction() { + @Override public Object run() { // sanity check assertEquals("user1", getCurrentSubjectName()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java index 12f80e38b72..4296a2f3030 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java @@ -24,15 +24,18 @@ import org.springframework.beans.factory.FactoryBean; */ public class CustomFactoryBean implements FactoryBean { + @Override public Object getObject() throws Exception { return System.getProperties(); } + @Override public Class getObjectType() { System.setProperty("factory.object.type", "true"); return Properties.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java index b429cd8e4b7..175ce84f160 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.DisposableBean; */ public class DestroyBean implements DisposableBean { + @Override public void destroy() throws Exception { System.setProperty("security.destroy", "true"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java index 62f379ee8b5..1009e9e76b9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.InitializingBean; */ public class InitBean implements InitializingBean { + @Override public void afterPropertiesSet() throws Exception { System.getProperties(); } 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 eba0541e09d..35fa49013b1 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 @@ -326,6 +326,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); @@ -350,6 +351,7 @@ class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java index 32e6134823d..ce0ba6e7f03 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java @@ -30,6 +30,7 @@ public class BeanNameGenerationTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override public void setUp() { this.beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java index 2be0637cf69..3b552f0762e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java @@ -45,6 +45,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -53,6 +54,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -66,6 +68,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -80,6 +83,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } 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 55f7f920f5c..0c0974fd722 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 @@ -40,6 +40,7 @@ public class CollectionMergingTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); 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 27ea4461be4..0b0a476bcab 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 @@ -51,14 +51,17 @@ public class CountingFactory implements FactoryBean { } + @Override public Object getObject() { return "myString"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java index 8662e52c782..357dc5d6cee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java @@ -27,6 +27,7 @@ public class DefaultLifecycleMethodsTests extends TestCase { private XmlBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new XmlBeanFactory(new ClassPathResource("defaultLifecycleMethods.xml", getClass())); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java index ec52dfaa8c7..00933e788a9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java @@ -45,6 +45,7 @@ public final class DelegatingEntityResolverTests { private static final class NoOpEntityResolver implements EntityResolver { + @Override public InputSource resolveEntity(String publicId, String systemId) { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index 7387cdf6003..7cb8a586274 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -62,6 +62,7 @@ public class DependenciesBean implements BeanFactoryAware { return spouse; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java index a9e9925d512..765c4384497 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java @@ -42,6 +42,7 @@ public class EventPublicationTests extends TestCase { private final CollectingReaderEventListener eventListener = new CollectingReaderEventListener(); + @Override protected void setUp() throws Exception { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.eventListener); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java index 52eb2b2938c..01afc690242 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java @@ -27,6 +27,7 @@ public class GeneratedNameBean implements BeanNameAware { private GeneratedNameBean child; + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java index b943361f1a2..b8757c3e3f3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java @@ -29,6 +29,7 @@ public class MetadataAttachmentTests extends TestCase { private XmlBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new XmlBeanFactory(new ClassPathResource("withMeta.xml", getClass())); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java index bc4e58426fc..1cd7a541244 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java @@ -171,6 +171,7 @@ public class ProfileXmlBeanDefinitionTests { private static Matcher containsBeanDefinition(final String beanName) { return new TypeSafeMatcher() { + @Override public void describeTo(Description desc) { desc.appendText("a BeanDefinitionRegistry containing bean named ") .appendValue(beanName); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java index ed8167b1126..75af81b55cc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java @@ -57,6 +57,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -65,6 +66,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -79,6 +81,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -130,6 +133,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -144,6 +148,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); @@ -151,6 +156,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 3345bf52fb3..cf83b0be7c2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -46,6 +46,7 @@ public class UtilNamespaceHandlerTests extends TestCase { private CollectingReaderEventListener listener = new CollectingReaderEventListener(); + @Override public void setUp() { this.beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); 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 22d4fcb30c2..9cc47454696 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 @@ -46,6 +46,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest private XmlBeanFactory factory; + @Override protected void setUp() { parent = new DefaultListableBeanFactory(); Map m = new HashMap(); @@ -59,6 +60,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest this.factory = new XmlBeanFactory(new ClassPathResource("test.xml", getClass()), parent); this.factory.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof TestBean) { ((TestBean) bean).setPostProcessed(true); @@ -68,6 +70,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { return bean; } @@ -77,10 +80,12 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest //this.factory.preInstantiateSingletons(); } + @Override protected BeanFactory getBeanFactory() { return factory; } + @Override public void testCount() { assertCount(24); } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java index 9be6a107f39..7f4cf0d9fa0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java @@ -70,6 +70,7 @@ public class BeanInfoTests extends TestCase { public static class ValueBeanBeanInfo extends SimpleBeanInfo { + @Override public PropertyDescriptor[] getPropertyDescriptors() { try { PropertyDescriptor pd = new PropertyDescriptor("value", ValueBean.class); @@ -96,6 +97,7 @@ public class BeanInfoTests extends TestCase { this.target = target; } + @Override public void setAsText(String text) throws IllegalArgumentException { if (JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_15) { Assert.isTrue(this.target instanceof ValueBean, "Target must be available on JDK 1.5+"); 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 c5a230a2c86..c8cf8d7649e 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 @@ -113,6 +113,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -130,6 +131,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -148,6 +150,7 @@ public class CustomEditorTests { tb.setSpouse(new TestBean()); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "spouse.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -166,6 +169,7 @@ public class CustomEditorTests { tb.setSpouse(new TestBean()); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -853,6 +857,7 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -905,16 +910,19 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(false); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } }); bw.registerCustomEditor(String.class, "list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } }); bw.registerCustomEditor(String.class, "map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } @@ -969,31 +977,37 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(false); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array0" + text); } }); bw.registerCustomEditor(String.class, "array[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array1" + text); } }); bw.registerCustomEditor(String.class, "list[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list0" + text); } }); bw.registerCustomEditor(String.class, "list[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list1" + text); } }); bw.registerCustomEditor(String.class, "map[key1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("mapkey1" + text); } }); bw.registerCustomEditor(String.class, "map[key2].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("mapkey2" + text); } @@ -1060,28 +1074,34 @@ public class CustomEditorTests { tb5.setNestedIndexedBean(new IndexedTestBean()); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array.nestedIndexedBean.array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(5); } }); bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } }); bw.registerCustomEditor(String.class, "map.nestedIndexedBean.map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1138,16 +1158,19 @@ public class CustomEditorTests { tb5.setNestedIndexedBean(new IndexedTestBean()); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array[0].nestedIndexedBean.array[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } }); bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } }); bw.registerCustomEditor(String.class, "map[key1].nestedIndexedBean.map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } @@ -1174,28 +1197,34 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("map" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1222,55 +1251,67 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array0" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "array[1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list[0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list0" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list[1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map[key1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("mapkey1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map[key2]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("mapkey2" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1297,6 +1338,7 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { List result = new ArrayList(); result.add(new TestBean("list" + text, 99)); @@ -1347,6 +1389,7 @@ public class CustomEditorTests { IndexedTestBean tb = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 99)); } @@ -1362,6 +1405,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("-" + text + "-"); } @@ -1436,6 +1480,7 @@ public class CustomEditorTests { private static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); @@ -1448,6 +1493,7 @@ public class CustomEditorTests { private static class OldValueAccessingTestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java index 34bfbac3b9a..ab995152794 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java @@ -104,6 +104,7 @@ public class PropertyComparatorTests { private String lastName; + @Override public int compareTo(Object o) { return nickName.compareTo(((Dog)o).nickName); } diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java index fbc9fb50900..87133f27d56 100644 --- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -79,10 +81,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java index 75b585a498f..99f2efc2665 100644 --- a/spring-beans/src/test/java/test/beans/DummyFactory.java +++ b/spring-beans/src/test/java/test/beans/DummyFactory.java @@ -81,6 +81,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -92,6 +93,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -100,6 +102,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -126,6 +129,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -151,6 +155,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -165,11 +170,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java index 145413deefb..e0dd4d3e322 100644 --- a/spring-beans/src/test/java/test/beans/LifecycleBean.java +++ b/spring-beans/src/test/java/test/beans/LifecycleBean.java @@ -59,6 +59,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -67,6 +68,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -81,6 +83,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -132,6 +135,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -146,6 +150,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -153,6 +158,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java index a630f8662a7..6855305fb3d 100644 --- a/spring-beans/src/test/java/test/beans/NestedTestBean.java +++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java index 7e8089e6e7a..1ad802cc977 100644 --- a/spring-beans/src/test/java/test/beans/TestBean.java +++ b/spring-beans/src/test/java/test/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java index 8ea783e17cc..646a6797171 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java @@ -188,6 +188,7 @@ public class EhCacheSupportTests extends TestCase { cacheFb.setCacheManager(cm); cacheFb.setCacheName("myCache1"); cacheFb.setCacheEntryFactory(new CacheEntryFactory() { + @Override public Object createEntry(Object key) throws Exception { return key; } @@ -212,9 +213,11 @@ public class EhCacheSupportTests extends TestCase { cacheFb.setCacheManager(cm); cacheFb.setCacheName("myCache1"); cacheFb.setCacheEntryFactory(new UpdatingCacheEntryFactory() { + @Override public Object createEntry(Object key) throws Exception { return key; } + @Override public void updateEntryValue(Object key, Object value) throws Exception { } }); diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java index 3233099baca..cd49644c6e3 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java @@ -30,6 +30,7 @@ public class InternetAddressEditorTests extends TestCase { private InternetAddressEditor editor; + @Override protected void setUp() { editor = new InternetAddressEditor(); } diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index b0deb96a6a2..fc5bf4cfc52 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -170,6 +170,7 @@ public class JavaMailSenderTests extends TestCase { final List messages = new ArrayList(); MimeMessagePreparator preparator = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org")); messages.add(mimeMessage); @@ -194,12 +195,14 @@ public class JavaMailSenderTests extends TestCase { final List messages = new ArrayList(); MimeMessagePreparator preparator1 = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("he@mail.org")); messages.add(mimeMessage); } }; MimeMessagePreparator preparator2 = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("she@mail.org")); messages.add(mimeMessage); @@ -300,6 +303,7 @@ public class JavaMailSenderTests extends TestCase { public void testJavaMailSenderWithParseExceptionOnMimeMessagePreparator() { MockJavaMailSender sender = new MockJavaMailSender(); MimeMessagePreparator preparator = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setFrom(new InternetAddress("")); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 0607947d6ca..3d78535c8b8 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -154,6 +154,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -248,6 +249,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -346,6 +348,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -401,6 +404,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -570,6 +574,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -605,6 +610,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -1040,30 +1046,39 @@ public class QuartzSupportTests { private static class TestSchedulerListener implements SchedulerListener { + @Override public void jobScheduled(Trigger trigger) { } + @Override public void jobUnscheduled(String triggerName, String triggerGroup) { } + @Override public void triggerFinalized(Trigger trigger) { } + @Override public void triggersPaused(String triggerName, String triggerGroup) { } + @Override public void triggersResumed(String triggerName, String triggerGroup) { } + @Override public void jobsPaused(String jobName, String jobGroup) { } + @Override public void jobsResumed(String jobName, String jobGroup) { } + @Override public void schedulerError(String msg, SchedulerException cause) { } + @Override public void schedulerShutdown() { } } @@ -1071,16 +1086,20 @@ public class QuartzSupportTests { private static class TestJobListener implements JobListener { + @Override public String getName() { return null; } + @Override public void jobToBeExecuted(JobExecutionContext context) { } + @Override public void jobExecutionVetoed(JobExecutionContext context) { } + @Override public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { } } @@ -1088,20 +1107,25 @@ public class QuartzSupportTests { private static class TestTriggerListener implements TriggerListener { + @Override public String getName() { return null; } + @Override public void triggerFired(Trigger trigger, JobExecutionContext context) { } + @Override public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) { return false; } + @Override public void triggerMisfired(Trigger trigger) { } + @Override public void triggerComplete(Trigger trigger, JobExecutionContext context, int triggerInstructionCode) { } } @@ -1111,6 +1135,7 @@ public class QuartzSupportTests { private int count; + @Override public void execute(Runnable task) { this.count++; task.run(); @@ -1131,6 +1156,7 @@ public class QuartzSupportTests { param = value; } + @Override public synchronized void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { count++; } @@ -1150,6 +1176,7 @@ public class QuartzSupportTests { param = value; } + @Override protected synchronized void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException { count++; } @@ -1169,6 +1196,7 @@ public class QuartzSupportTests { param = value; } + @Override public void run() { count++; } diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java index 7e22fe88f75..4f8cc86fca8 100644 --- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java +++ b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java @@ -236,6 +236,7 @@ public class JasperReportsUtilsTests extends TestCase { private boolean invoked = false; + @Override public void afterPageExport() { this.invoked = true; } diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java index 2bdea2ecce8..1bf169f777c 100644 --- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java +++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java @@ -45,14 +45,17 @@ public class AutowiredQualifierFooService implements FooService { this.initCalled = true; } + @Override public String foo(int id) { return this.fooDao.findFoo(id); } + @Override public Future asyncFoo(int id) { return new AsyncResult(this.fooDao.findFoo(id)); } + @Override public boolean isInitCalled() { return this.initCalled; } diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java index ef2b6094b31..e4941f4bf82 100644 --- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java +++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java @@ -74,16 +74,19 @@ public class FooServiceImpl implements FooService { this.initCalled = true; } + @Override public String foo(int id) { return this.fooDao.findFoo(id); } + @Override public Future asyncFoo(int id) { System.out.println(Thread.currentThread().getName()); Assert.state(ServiceInvocationCounter.getThreadLocalCount() != null, "Thread-local counter not exposed"); return new AsyncResult(this.fooDao.findFoo(id)); } + @Override public boolean isInitCalled() { return this.initCalled; } diff --git a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java index 34d31600986..601722be844 100644 --- a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java +++ b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java @@ -28,14 +28,17 @@ import org.springframework.scheduling.annotation.AsyncResult; @Scope("myScope") public class ScopedProxyTestBean implements FooService { + @Override public String foo(int id) { return "bar"; } + @Override public Future asyncFoo(int id) { return new AsyncResult("bar"); } + @Override public boolean isInitCalled() { return false; } diff --git a/spring-context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java index b4ea5b65d5d..052d9cd25e1 100644 --- a/spring-context/src/test/java/example/scannable/StubFooDao.java +++ b/spring-context/src/test/java/example/scannable/StubFooDao.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Repository; @Qualifier("testing") public class StubFooDao implements FooDao { + @Override public String findFoo(int id) { return "bar"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index 0355c8f7c37..6eae7b3b64b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -110,26 +110,32 @@ public final class AspectAndAdvicePrecedenceTests { } } + @Override public void beforeAdviceOne(String beanName) { checkAdvice("beforeAdviceOne(" + beanName + ")"); } + @Override public void beforeAdviceTwo(String beanName) { checkAdvice("beforeAdviceTwo(" + beanName + ")"); } + @Override public void aroundAdviceOne(String beanName) { checkAdvice("aroundAdviceOne(" + beanName + ")"); } + @Override public void aroundAdviceTwo(String beanName) { checkAdvice("aroundAdviceTwo(" + beanName + ")"); } + @Override public void afterAdviceOne(String beanName) { checkAdvice("afterAdviceOne(" + beanName + ")"); } + @Override public void afterAdviceTwo(String beanName) { checkAdvice("afterAdviceTwo(" + beanName + ")"); } @@ -147,6 +153,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered { private Collaborator collaborator; + @Override public void setBeanName(String name) { this.name = name; } @@ -155,6 +162,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered { this.order = order; } + @Override public int getOrder() { return order; } @@ -223,6 +231,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware { /* (non-Javadoc) * @see org.springframework.aop.MethodBeforeAdvice#before(java.lang.reflect.Method, java.lang.Object[], java.lang.Object) */ + @Override public void before(Method method, Object[] args, Object target) throws Throwable { this.collaborator.beforeAdviceOne(this.name); @@ -235,6 +244,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.name = name; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java index dbe4e3e51a0..977038a1f01 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java @@ -60,6 +60,7 @@ class CallCountingInterceptor implements MethodInterceptor { private int count; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { count++; return methodInvocation.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 2e998b24df3..5d5930c80be 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -126,6 +126,7 @@ public final class BeanNamePointcutTests { private int interceptionCount; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { interceptionCount++; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java index cfeb2ca217c..0eb1c2192d7 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java @@ -88,6 +88,7 @@ public final class DeclarationOrderIndependenceTests { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.beanName = name; } @@ -148,6 +149,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyTarget#doSomething() */ + @Override public void doSomething() { this.x = 10; } @@ -155,6 +157,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyTarget#getX() */ + @Override public int getX() { return x; } @@ -171,6 +174,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#afterReturningAdviceFired() */ + @Override public void afterReturningAdviceFired() { this.afterReturningFired = true; } @@ -178,6 +182,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#aroundAdviceFired() */ + @Override public void aroundAdviceFired() { this.aroundFired = true; } @@ -185,6 +190,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#beforeAdviceFired() */ + @Override public void beforeAdviceFired() { this.beforeFired = true; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index 70464c53128..22e729d6338 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java @@ -101,34 +101,42 @@ class SimpleBeanImpl implements SimpleBean { private String name; private String sex; + @Override public int getAge() { return age; } + @Override public float getMyFloat() { return aFloat; } + @Override public String getName() { return name; } + @Override public String getSex() { return sex; } + @Override public void setAge(int age) { this.age = age; } + @Override public void setMyFloat(float f) { this.aFloat = f; } + @Override public void setName(String name) { this.name = name; } + @Override public void setSex(String sex) { this.sex = sex; } @@ -143,6 +151,7 @@ class ProceedTestingAspect implements Ordered { private int order; public void setOrder(int order) { this.order = order; } + @Override public int getOrder() { return this.order; } public Object capitalize(ProceedingJoinPoint pjp, String value) throws Throwable { diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java index bcd1234398d..a31b0be91ec 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java @@ -74,6 +74,7 @@ interface SerializableFoo extends Serializable { void foo(); } class SubtypeMatchingTestClassA implements NonSerializableFoo { + @Override public void foo() {} } @@ -81,6 +82,7 @@ class SubtypeMatchingTestClassA implements NonSerializableFoo { @SuppressWarnings("serial") class SubtypeMatchingTestClassB implements SerializableFoo { + @Override public void foo() {} } @@ -89,6 +91,7 @@ interface Bar { void bar(Object o); } class SubtypeMatchingTestClassC implements Bar { + @Override public void bar(Object o) {} } \ No newline at end of file diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index f440f0490b0..8b9ab4ea519 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java @@ -82,6 +82,7 @@ public final class TargetPointcutSelectionTests { // include the advised method's implementation (instead a base class should include it) public static abstract class AbstractTestImpl implements TestInterface { + @Override public void interfaceMethod() { } } @@ -107,6 +108,7 @@ public final class TargetPointcutSelectionTests { public static class TestInterceptor extends TestAspect implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { increment(); return mi.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index 6633bb808ea..5bf6196f593 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -108,6 +108,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { } public static class TestImpl implements TestInterface { + @Override public void doIt() { } } @@ -119,11 +120,13 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { @TestAnnotation public static class AnnotatedClassTestImpl implements TestInterface { + @Override public void doIt() { } } public static class AnnotatedMethodTestImpl implements TestInterface { + @Override @TestAnnotation public void doIt() { } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index bcd93c0523e..2ae946206eb 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -115,6 +115,7 @@ interface TestInterface { class TestImpl implements TestInterface { + @Override public void doIt() { } } \ No newline at end of file diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java index 935cf4bd583..2bb1fb39a66 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java @@ -118,22 +118,27 @@ final class Counter implements ICounter { public Counter() { } + @Override public void increment() { count++; } + @Override public void decrement() { count--; } + @Override public int getCount() { return count; } + @Override public void setCount(int counter) { this.count = counter; } + @Override public void reset() { this.count = 0; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java index 925038414ec..a8247ac352b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java @@ -55,6 +55,7 @@ public final class AnnotationPointcutTests { class TestMethodInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { return "this value"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java index e88d5ada0b4..bdf4d1ddc1f 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java @@ -57,6 +57,7 @@ class InterfaceExtendingAspect implements AnInterface { pjp.proceed(); } + @Override public void interfaceMethod() { } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java index 9bb9c8d83a3..66aa6e0e579 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java @@ -387,6 +387,7 @@ class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } @@ -438,14 +439,17 @@ class DummyAspectWithParameter { class DummyFactoryBean implements FactoryBean { + @Override public Object getObject() throws Exception { throw new UnsupportedOperationException(); } + @Override public Class getObjectType() { throw new UnsupportedOperationException(); } + @Override public boolean isSingleton() { throw new UnsupportedOperationException(); } @@ -573,12 +577,14 @@ class TestBeanAdvisor extends StaticMethodMatcherPointcutAdvisor { public TestBeanAdvisor() { setAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { ++count; } }); } + @Override public boolean matches(Method method, Class targetClass) { return ITestBean.class.isAssignableFrom(targetClass); } 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 1868a63a3d0..ef61c94dfda 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 @@ -82,16 +82,19 @@ class AtAspectJAnnotationBindingTestAspect { class ResourceArrayFactoryBean implements FactoryBean { + @Override @TestAnnotation("some value") public Object getObject() throws Exception { return new Resource[0]; } + @Override @TestAnnotation("some value") public Class getObjectType() { return Resource[].class; } + @Override public boolean isSingleton() { return true; } 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 66897ba62de..247e416e1ce 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 @@ -72,22 +72,26 @@ interface AnnotatedTestBean { */ class AnnotatedTestBeanImpl implements AnnotatedTestBean { + @Override @TestAnnotation("this value") public String doThis() { return "doThis"; } + @Override @TestAnnotation("that value") public String doThat() { return "doThat"; } + @Override @TestAnnotation("array value") public String[] doArray() { return new String[] {"doThis", "doThat"}; } // not annotated + @Override public String doTheOther() { return "doTheOther"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java index 918dd87535b..8d12136b544 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java @@ -206,6 +206,7 @@ class MultiplyReturnValueInterceptor implements MethodInterceptor { return this.multiple; } + @Override public Object invoke(MethodInvocation mi) throws Throwable { ++invocations; int result = (Integer) mi.proceed(); @@ -219,6 +220,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice { public int afterTakesInt; + @Override public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { ++afterTakesInt; } @@ -226,6 +228,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice { public static Advisor advisor() { return new DefaultPointcutAdvisor( new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return method.getParameterTypes().length == 1 && method.getParameterTypes()[0].equals(Integer.class); @@ -261,6 +264,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice { public int beforeStringReturn; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { ++beforeStringReturn; } @@ -268,6 +272,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice { public static Advisor advisor() { return new DefaultPointcutAdvisor( new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return method.getReturnType().equals(String.class); } 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 17e5943b3a0..e048453a4fe 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 @@ -81,6 +81,7 @@ interface Service { class ServiceImpl implements Service { + @Override @Transaction public void serveMe() { } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java index b8c85fbef33..8085f19b229 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java @@ -87,9 +87,11 @@ interface DerivedInterface extends BaseInterface { class DerivedStringParameterizedClass implements DerivedInterface { + @Override public void genericDerivedInterfaceMethod(String t) { } + @Override public void genericBaseInterfaceMethod(String t) { } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index 6260e98b061..9bf53313296 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -82,9 +82,11 @@ public final class GenericParameterMatchingTests { static class GenericImpl implements GenericInterface { + @Override public void save(T bean) { } + @Override public void saveAll(Collection beans) { } } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 5af410a894b..51b63bd7d6c 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -409,6 +409,7 @@ public abstract class AbstractAopProxyTests { final String s = "foo"; // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (!context) { assertNoInvocationContext(); @@ -457,6 +458,7 @@ public abstract class AbstractAopProxyTests { final Exception expectedException = new Exception(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw expectedException; } @@ -491,6 +493,7 @@ public abstract class AbstractAopProxyTests { final Exception unexpectedException = new Exception(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw unexpectedException; } @@ -523,6 +526,7 @@ public abstract class AbstractAopProxyTests { final RuntimeException unexpectedException = new RuntimeException(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw unexpectedException; } @@ -573,6 +577,7 @@ public abstract class AbstractAopProxyTests { AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class, IOther.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { // Assert that target matches BEFORE invocation returns assertEquals("Target is correct", expectedTarget, invocation.getThis()); @@ -727,6 +732,7 @@ public abstract class AbstractAopProxyTests { pc.addAdvice(di); final long ts = 37; pc.addAdvice(new DelegatingIntroductionInterceptor(new TimeStamped() { + @Override public long getTimeStamp() { return ts; } @@ -811,6 +817,7 @@ public abstract class AbstractAopProxyTests { /** * @see test.util.TimeStamped#getTimeStamp() */ + @Override public long getTimeStamp() { throw new UnsupportedOperationException(); } @@ -1132,6 +1139,7 @@ public abstract class AbstractAopProxyTests { pc.addInterface(ITestBean.class); MethodInterceptor twoBirthdayInterceptor = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { // Clone the invocation to proceed three times // "The Moor's Last Sigh": this technology can cause premature aging @@ -1144,6 +1152,7 @@ public abstract class AbstractAopProxyTests { }; @SuppressWarnings("serial") StaticMethodMatcherPointcutAdvisor advisor = new StaticMethodMatcherPointcutAdvisor(twoBirthdayInterceptor) { + @Override public boolean matches(Method m, Class targetClass) { return "haveBirthday".equals(m.getName()); } @@ -1173,6 +1182,7 @@ public abstract class AbstractAopProxyTests { * Changes the name, then changes it back. */ MethodInterceptor nameReverter = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone(); String oldName = ((ITestBean) mi.getThis()).getName(); @@ -1186,6 +1196,7 @@ public abstract class AbstractAopProxyTests { class NameSaver implements MethodInterceptor { private List names = new LinkedList(); + @Override public Object invoke(MethodInvocation mi) throws Throwable { names.add(mi.getArguments()[0]); return mi.proceed(); @@ -1219,12 +1230,14 @@ public abstract class AbstractAopProxyTests { ProxyFactory pc = new ProxyFactory(target); NopInterceptor overLoadVoids = new NopInterceptor(); pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadVoids) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("overload") && m.getParameterTypes().length == 0; } }); NopInterceptor overLoadInts = new NopInterceptor(); pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadInts) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("overload") && m.getParameterTypes().length == 1 && m.getParameterTypes()[0].equals(int.class); @@ -1255,19 +1268,23 @@ public abstract class AbstractAopProxyTests { Advised config = (Advised) proxy; // This class just checks proxy is bound before getTarget() call config.setTargetSource(new TargetSource() { + @Override public Class getTargetClass() { return TestBean.class; } + @Override public boolean isStatic() { return false; } + @Override public Object getTarget() throws Exception { assertEquals(proxy, AopContext.currentProxy()); return target; } + @Override public void releaseTarget(Object target) throws Exception { } }); @@ -1311,6 +1328,7 @@ public abstract class AbstractAopProxyTests { CountingBeforeAdvice cba = new CountingBeforeAdvice(); @SuppressWarnings("serial") Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cba) { + @Override public boolean matches(Method m, Class targetClass) { return m.getParameterTypes().length == 0; } @@ -1343,6 +1361,7 @@ public abstract class AbstractAopProxyTests { this.expectedValues = expectedValues; this.valuesToAdd = valuesToAdd; } + @Override public Object invoke(MethodInvocation invocation) throws Throwable { ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) invocation; for (Iterator it = rmi.getUserAttributes().keySet().iterator(); it.hasNext(); ){ @@ -1390,6 +1409,7 @@ public abstract class AbstractAopProxyTests { CountingMultiAdvice cca = new CountingMultiAdvice(); @SuppressWarnings("serial") Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cca) { + @Override public boolean matches(Method m, Class targetClass) { return m.getParameterTypes().length == 0 || "exceptional".equals(m.getName()); } @@ -1428,6 +1448,7 @@ public abstract class AbstractAopProxyTests { final RuntimeException rex = new RuntimeException(); @SuppressWarnings("serial") CountingBeforeAdvice ba = new CountingBeforeAdvice() { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { super.before(m, args, target); if (m.getName().startsWith("set")) @@ -1471,6 +1492,7 @@ public abstract class AbstractAopProxyTests { public void testAfterReturningAdvisorIsInvoked() { class SummingAfterAdvice implements AfterReturningAdvice { public int sum; + @Override public void afterReturning(Object returnValue, Method m, Object[] args, Object target) throws Throwable { sum += ((Integer) returnValue).intValue(); } @@ -1478,6 +1500,7 @@ public abstract class AbstractAopProxyTests { SummingAfterAdvice aa = new SummingAfterAdvice(); @SuppressWarnings("serial") Advisor matchesInt = new StaticMethodMatcherPointcutAdvisor(aa) { + @Override public boolean matches(Method m, Class targetClass) { return m.getReturnType() == int.class; } @@ -1535,6 +1558,7 @@ public abstract class AbstractAopProxyTests { MyThrowsHandler th = new MyThrowsHandler(); @SuppressWarnings("serial") Advisor matchesEchoInvocations = new StaticMethodMatcherPointcutAdvisor(th) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("echo"); } @@ -1609,6 +1633,7 @@ public abstract class AbstractAopProxyTests { private static class CheckMethodInvocationIsSameInAndOutInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { Method m = mi.getMethod(); Object retval = mi.proceed(); @@ -1623,6 +1648,7 @@ public abstract class AbstractAopProxyTests { */ private static class CheckMethodInvocationViaThreadLocalIsSameInAndOutInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { String task = "get invocation on way IN"; try { @@ -1649,6 +1675,7 @@ public abstract class AbstractAopProxyTests { */ private static class ProxyMatcherInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { Object proxy = AopContext.currentProxy(); Object ret = mi.proceed(); @@ -1667,6 +1694,7 @@ public abstract class AbstractAopProxyTests { protected static class StringSetterNullReplacementAdvice extends DefaultPointcutAdvisor { private static MethodInterceptor cleaner = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { // We know it can only be invoked if there's a single parameter of type string mi.getArguments()[0] = ""; @@ -1677,9 +1705,11 @@ public abstract class AbstractAopProxyTests { public StringSetterNullReplacementAdvice() { super(cleaner); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return args[0] == null; } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set") && m.getParameterTypes().length == 1 && @@ -1698,6 +1728,7 @@ public abstract class AbstractAopProxyTests { public TestDynamicPointcutAdvice(MethodInterceptor mi, final String pattern) { super(mi); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; @@ -1716,11 +1747,13 @@ public abstract class AbstractAopProxyTests { public TestDynamicPointcutForSettersOnly(MethodInterceptor mi, final String pattern) { super(mi); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; return run; } + @Override public boolean matches(Method m, Class clazz) { return m.getName().startsWith("set"); } @@ -1739,6 +1772,7 @@ public abstract class AbstractAopProxyTests { super(mi); this.pattern = pattern; } + @Override public boolean matches(Method m, Class targetClass) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; @@ -1757,6 +1791,7 @@ public abstract class AbstractAopProxyTests { public Object target; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { this.target = invocation.getThis(); return invocation.proceed(); @@ -1766,6 +1801,7 @@ public abstract class AbstractAopProxyTests { private static class DummyIntroductionAdviceImpl implements DynamicIntroductionAdvice { + @Override public boolean implementsInterface(Class intf) { return true; } @@ -1774,6 +1810,7 @@ public abstract class AbstractAopProxyTests { public static class OwnSpouse extends TestBean { + @Override public ITestBean getSpouse() { return this; } @@ -1790,6 +1827,7 @@ public abstract class AbstractAopProxyTests { return getClass().hashCode(); } + @Override public void absquatulate() { } } @@ -1811,14 +1849,17 @@ public abstract class AbstractAopProxyTests { private int count; + @Override public int getCount() { return count; } + @Override public void incrementViaThis() { this.increment(); } + @Override public void incrementViaProxy() { INeedsToSeeProxy thisViaProxy = (INeedsToSeeProxy) AopContext.currentProxy(); thisViaProxy.increment(); @@ -1829,6 +1870,7 @@ public abstract class AbstractAopProxyTests { protected void checkAdvised(Advised advised) { } + @Override public void increment() { ++count; } @@ -1837,6 +1879,7 @@ public abstract class AbstractAopProxyTests { public static class TargetChecker extends NeedsToSeeProxy { + @Override protected void checkAdvised(Advised advised) { // TODO replace this check: no longer possible //assertEquals(advised.getTarget(), this); @@ -1854,11 +1897,13 @@ public abstract class AbstractAopProxyTests { this.expectedSource = expectedSource; } + @Override public void activated(AdvisedSupport advised) { assertEquals(expectedSource, advised); ++activates; } + @Override public void adviceChanged(AdvisedSupport advised) { assertEquals(expectedSource, advised); ++adviceChanges; @@ -1870,10 +1915,12 @@ public abstract class AbstractAopProxyTests { public int refreshes; + @Override public void activated(AdvisedSupport advised) { ++refreshes; } + @Override public void adviceChanged(AdvisedSupport advised) { ++refreshes; } @@ -1894,17 +1941,21 @@ public abstract class AbstractAopProxyTests { public static class Overloads implements IOverloads { + @Override public void overload() { } + @Override public int overload(int i) { return i; } + @Override public String overload(String s) { return s; } + @Override public void noAdvice() { } } @@ -1914,10 +1965,12 @@ public abstract class AbstractAopProxyTests { public static class CountingMultiAdvice extends MethodCounter implements MethodBeforeAdvice, AfterReturningAdvice, ThrowsAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); @@ -1983,6 +2036,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#getTargetClass() */ + @Override public Class getTargetClass() { return target.getClass(); } @@ -1990,6 +2044,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#getTarget() */ + @Override public Object getTarget() throws Exception { ++gets; return target; @@ -1998,6 +2053,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#releaseTarget(java.lang.Object) */ + @Override public void releaseTarget(Object pTarget) throws Exception { if (pTarget != this.target) throw new RuntimeException("Released wrong target"); @@ -2016,6 +2072,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#isStatic() */ + @Override public boolean isStatic() { return false; } @@ -2025,12 +2082,14 @@ public abstract class AbstractAopProxyTests { static abstract class ExposedInvocationTestBean extends TestBean { + @Override public String getName() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); return super.getName(); } + @Override public void absquatulate() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); @@ -2042,6 +2101,7 @@ public abstract class AbstractAopProxyTests { static class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean { + @Override protected void assertions(MethodInvocation invocation) { TestCase.assertTrue(invocation.getThis() == this); TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java index a52cbe3cc07..d600115868a 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java @@ -58,6 +58,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri private static final String DEPENDENCY_CHECK_CONTEXT = CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml"; + @Override protected Object createProxy(ProxyCreatorSupport as) { as.setProxyTargetClass(true); Object proxy = as.createAopProxy().getProxy(); @@ -65,11 +66,13 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri return proxy; } + @Override protected AopProxy createAopProxy(AdvisedSupport as) { as.setProxyTargetClass(true); return new CglibAopProxy(as); } + @Override protected boolean requiresTarget() { return true; } @@ -207,10 +210,12 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri MethodInterceptor advice = new NopInterceptor(); Pointcut pointcut = new Pointcut() { + @Override public ClassFilter getClassFilter() { return ClassFilter.TRUE; } + @Override public MethodMatcher getMethodMatcher() { return MethodMatcher.TRUE; } @@ -492,6 +497,7 @@ class UnsupportedInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) */ + @Override public Object invoke(MethodInvocation mi) throws Throwable { throw new UnsupportedOperationException(mi.getMethod().getName()); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java index b845070078f..fff56bde6f2 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java @@ -42,6 +42,7 @@ import org.springframework.beans.TestBean; @SuppressWarnings("serial") public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements Serializable { + @Override protected Object createProxy(ProxyCreatorSupport as) { assertFalse("Not forcible CGLIB", as.isProxyTargetClass()); Object proxy = as.createAopProxy().getProxy(); @@ -49,6 +50,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements return proxy; } + @Override protected AopProxy createAopProxy(AdvisedSupport as) { return new JdkDynamicAopProxy(as); } @@ -94,6 +96,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public void testTargetCanGetInvocationWithPrivateClass() throws Throwable { final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() { + @Override protected void assertions(MethodInvocation invocation) { assertTrue(invocation.getThis() == this); assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), @@ -104,6 +107,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class }); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { // Assert that target matches BEFORE invocation returns assertEquals("Target is correct", expectedTarget, invocation.getThis()); @@ -165,10 +169,12 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public static class FooBar implements Foo, Bar { + @Override public Bar getBarThis() { return this; } + @Override public Foo getFooThis() { return this; } @@ -189,6 +195,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements private final String name = "Rob Harrop"; + @Override public String getName() { return this.name; } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index 6c255751b4d..0bf067154ac 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -307,6 +307,7 @@ public final class ProxyFactoryBeanTests { final Exception ex = new UnsupportedOperationException("invoke"); // Add evil interceptor to head of list config.addAdvice(0, new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw ex; } @@ -705,12 +706,14 @@ public final class ProxyFactoryBeanTests { public PointcutForVoid() { setAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { methodNames.add(invocation.getMethod().getName()); return invocation.proceed(); } }); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return m.getReturnType() == Void.TYPE; } @@ -734,10 +737,12 @@ public final class ProxyFactoryBeanTests { */ public static class GlobalAspectInterfaceInterceptor implements IntroductionInterceptor { + @Override public boolean implementsInterface(Class intf) { return intf.equals(AddedGlobalInterface.class); } + @Override public Object invoke(MethodInvocation mi) throws Throwable { if (mi.getMethod().getDeclaringClass().equals(AddedGlobalInterface.class)) { return new Integer(-1); @@ -751,22 +756,27 @@ public final class ProxyFactoryBeanTests { private IntroductionInterceptor gi = new GlobalAspectInterfaceInterceptor(); + @Override public ClassFilter getClassFilter() { return ClassFilter.TRUE; } + @Override public Advice getAdvice() { return this.gi; } + @Override public Class[] getInterfaces() { return new Class[] { AddedGlobalInterface.class }; } + @Override public boolean isPerInstance() { return false; } + @Override public void validateInterfaces() { } } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java index 216510950ed..ea1924b1018 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java @@ -27,14 +27,17 @@ interface IEcho { class Echo implements IEcho { private int a; + @Override public int echoException(int i, Throwable t) throws Throwable { if (t != null) throw t; return i; } + @Override public void setA(int a) { this.a = a; } + @Override public int getA() { return a; } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java index 39dc7410b81..57e8de81126 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java @@ -96,10 +96,12 @@ interface SimpleBeforeAdvice extends BeforeAdvice { @SuppressWarnings("serial") class SimpleBeforeAdviceAdapter implements AdvisorAdapter, Serializable { + @Override public boolean supportsAdvice(Advice advice) { return (advice instanceof SimpleBeforeAdvice); } + @Override public MethodInterceptor getInterceptor(Advisor advisor) { SimpleBeforeAdvice advice = (SimpleBeforeAdvice) advisor.getAdvice(); return new SimpleBeforeAdviceInterceptor(advice) ; @@ -112,6 +114,7 @@ class SimpleBeforeAdviceImpl implements SimpleBeforeAdvice { private int invocationCounter; + @Override public void before() throws Throwable { ++invocationCounter; } @@ -131,6 +134,7 @@ final class SimpleBeforeAdviceInterceptor implements MethodInterceptor { this.advice = advice; } + @Override public Object invoke(MethodInvocation mi) throws Throwable { advice.before(); return mi.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java index 185075670f9..e6bf8c37dae 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java @@ -218,6 +218,7 @@ class CountingTestBean extends TestBean { class SelectivePrototypeTargetSourceCreator extends AbstractBeanFactoryBasedTargetSourceCreator { + @Override protected AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource( Class beanClass, String beanName) { if (!beanName.startsWith("prototype")) { diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java index f8b0e7a01ff..d9237d23b9b 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java @@ -281,6 +281,7 @@ public final class AutoProxyCreatorTests { this.proxyObject = proxyObject; } + @Override protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String name, TargetSource customTargetSource) { if (StaticMessageSource.class.equals(beanClass)) { return DO_NOT_PROXY; @@ -308,6 +309,7 @@ public final class AutoProxyCreatorTests { public int nrOfInvocations = 0; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (!invocation.getMethod().getName().equals("finalize")) { this.nrOfInvocations++; diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java index 77bbaf3e3c2..0197bb68400 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java @@ -47,6 +47,7 @@ public final class BeanNameAutoProxyCreatorInitTests { class NullChecker implements MethodBeforeAdvice { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { check(args); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java index 0b8f9a15cd2..54242e6ffc4 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java @@ -205,6 +205,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#getObject() */ + @Override public Object getObject() throws Exception { return new TestBean(); } @@ -212,6 +213,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return TestBean.class; } @@ -219,6 +221,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java index b93bf96be31..21526c932bd 100644 --- a/spring-context/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index a04d1796443..9c8be8ac4c4 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java index b9999baa5e6..bd402c3040e 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see org.springframework.beans.factory.FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see org.springframework.beans.factory.FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 1dcc1aaf72d..afb3dbe2f1a 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -28,6 +28,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java index 822da917c54..6bb485f835f 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java @@ -49,6 +49,7 @@ class UserServiceImpl extends GenericServiceImpl { protected Foo object; + @Override @Inject @Named("userObject") public void setObject(Foo object) { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 604d2595b01..9901e8feb82 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable { } + @Override public Object get(String name, ObjectFactory objectFactory) { synchronized (this.map) { Object scopedObject = this.map.get(name); @@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public Object remove(String name) { synchronized (this.map) { return this.map.remove(name); } } + @Override public void registerDestructionCallback(String name, Runnable callback) { this.callbacks.add(callback); } + @Override public Object resolveContextualObject(String key) { return null; } @@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public String getConversationId() { return null; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index 8da9a81a6f8..ebd2ad7ea28 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index f17b3dfc89e..d5c2f1ce3d8 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -65,6 +65,7 @@ public final class DependenciesBean implements BeanFactoryAware { return spouse; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java index 09bd64d34df..4a1923181f5 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java @@ -389,14 +389,17 @@ public final class QualifierAnnotationTests { @Qualifier(FACTORY_QUALIFIER) public static class QualifiedFactoryBean implements FactoryBean { + @Override public Theta getObject() { return new Theta() {}; } + @Override public Class getObjectType() { return Theta.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java index cebec37bd66..98f04505649 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java @@ -256,6 +256,7 @@ class DummyBoImpl implements DummyBo { this.dao = dao; } + @Override public void something() { } @@ -430,6 +431,7 @@ class FixedMethodReplacer implements MethodReplacer { public static final String VALUE = "fixedMethodReplacer"; + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { return VALUE; } @@ -513,6 +515,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr protected abstract TestBean protectedOverrideSingleton(); + @Override public TestBean getPrototypeDependency(Object someParam) { return new TestBean(); } @@ -540,6 +543,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr return "replaceMe:" + someParam; } + @Override public String replaceMe(String someParam) { return "replaceMe:" + someParam; } @@ -595,6 +599,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -603,6 +608,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -617,6 +623,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -668,6 +675,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -682,6 +690,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); @@ -689,6 +698,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessAfterInit(); @@ -706,6 +716,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial @SuppressWarnings("serial") class ReverseMethodReplacer implements MethodReplacer, Serializable { + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { String s = (String) args[0]; return new StringBuffer(s).reverse().toString(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 91c0c5f4b3f..997523aaf6c 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -1511,6 +1511,7 @@ public final class XmlBeanFactoryTests { public Object lastArg; + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { assertEquals(1, args.length); assertEquals("doSomething", method.getName()); @@ -1558,6 +1559,7 @@ public final class XmlBeanFactoryTests { constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) { fail(); @@ -1579,6 +1581,7 @@ public final class XmlBeanFactoryTests { this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) { fail(); @@ -1611,6 +1614,7 @@ public final class XmlBeanFactoryTests { prepared = true; } + @Override public void destroy() { destroyed = true; } @@ -1627,6 +1631,7 @@ public final class XmlBeanFactoryTests { prepared = true; } + @Override public void destroy() { destroyed = true; } @@ -1654,12 +1659,14 @@ public final class XmlBeanFactoryTests { public void setInTheMiddleBean(InTheMiddleBean bean) { } + @Override public void afterPropertiesSet() { if (!(PreparingBean1.prepared && PreparingBean2.prepared)) { throw new IllegalStateException("Need prepared PreparingBeans!"); } } + @Override public void destroy() { if (PreparingBean1.destroyed || PreparingBean2.destroyed) { throw new IllegalStateException("Should not be destroyed after PreparingBeans"); @@ -1692,6 +1699,7 @@ public final class XmlBeanFactoryTests { this.dependingBean = dependingBean; } + @Override public void destroy() { if (this.dependingBean.destroyed) { throw new IllegalStateException("Should not be destroyed after DependingBean"); @@ -1794,10 +1802,12 @@ public final class XmlBeanFactoryTests { public static class WrappingPostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { ProxyFactory pf = new ProxyFactory(bean); return pf.getProxy(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index d2366862757..148c3d2e2b9 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -194,6 +194,7 @@ public class CustomNamespaceHandlerTests { super(CLASS.getClassLoader()); } + @Override public InputSource resolveEntity(String publicId, String systemId) throws IOException { InputSource source = super.resolveEntity(publicId, systemId); if (source == null) { @@ -216,6 +217,7 @@ public class CustomNamespaceHandlerTests { */ final class TestNamespaceHandler extends NamespaceHandlerSupport { + @Override public void init() { registerBeanDefinitionParser("testBean", new TestBeanDefinitionParser()); registerBeanDefinitionParser("person", new PersonDefinitionParser()); @@ -228,6 +230,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class TestBeanDefinitionParser implements BeanDefinitionParser { + @Override public BeanDefinition parse(Element element, ParserContext parserContext) { RootBeanDefinition definition = new RootBeanDefinition(); definition.setBeanClass(TestBean.class); @@ -245,10 +248,12 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static final class PersonDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return TestBean.class; } + @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { builder.addPropertyValue("name", element.getAttribute("name")); builder.addPropertyValue("age", element.getAttribute("age")); @@ -257,6 +262,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class PropertyModifyingBeanDefinitionDecorator implements BeanDefinitionDecorator { + @Override public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) { Element element = (Element) node; BeanDefinition def = definition.getBeanDefinition(); @@ -272,6 +278,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class DebugBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator { + @Override protected BeanDefinition createInterceptorDefinition(Node node) { return new RootBeanDefinition(DebugInterceptor.class); } @@ -279,6 +286,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class NopInterceptorBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator { + @Override protected BeanDefinition createInterceptorDefinition(Node node) { return new RootBeanDefinition(NopInterceptor.class); } @@ -286,6 +294,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class ObjectNameBeanDefinitionDecorator implements BeanDefinitionDecorator { + @Override public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) { Attr objectNameAttribute = (Attr) node; definition.getBeanDefinition().setAttribute("objectName", objectNameAttribute.getValue()); diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index 80fa6f50e21..4d4ea48a619 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -32,105 +32,127 @@ public class AnnotatedClassCacheableService implements CacheableService private final AtomicLong counter = new AtomicLong(); public static final AtomicLong nullInvocations = new AtomicLong(); + @Override public Object cache(Object arg1) { return counter.getAndIncrement(); } + @Override public Object conditional(int field) { return null; } + @Override @CacheEvict("default") public void invalidate(Object arg1) { } + @Override @CacheEvict("default") public void evictWithException(Object arg1) { throw new RuntimeException("exception thrown - evict should NOT occur"); } + @Override @CacheEvict(value = "default", allEntries = true) public void evictAll(Object arg1) { } + @Override @CacheEvict(value = "default", beforeInvocation = true) public void evictEarly(Object arg1) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @CacheEvict(value = "default", key = "#p0") public void evict(Object arg1, Object arg2) { } + @Override @CacheEvict(value = "default", key = "#p0", beforeInvocation = true) public void invalidateEarly(Object arg1, Object arg2) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @Cacheable(value = "default", key = "#p0") public Object key(Object arg1, Object arg2) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.caches[0].name") public Object name(Object arg1) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target") public Object rootVars(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut("default") public Object update(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut(value = "default", condition = "#arg.equals(3)") public Object conditionalUpdate(Object arg) { return arg; } + @Override public Object nullValue(Object arg1) { nullInvocations.incrementAndGet(); return null; } + @Override public Number nullInvocations() { return nullInvocations.get(); } + @Override public Long throwChecked(Object arg1) throws Exception { throw new UnsupportedOperationException(arg1.toString()); } + @Override public Long throwUnchecked(Object arg1) { throw new UnsupportedOperationException(); } // multi annotations + @Override @Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") }) public Object multiCache(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#a0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") }) public Object multiEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") }) public Object multiCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", condition = "#a0 == 3") }, evict = { @CacheEvict("secondary") }) public Object multiConditionalCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(put = { @CachePut("primary"), @CachePut("secondary") }) public Object multiUpdate(Object arg1) { return arg1; diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java index fc46127cd47..b3a19df1897 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java @@ -33,83 +33,100 @@ public class DefaultCacheableService implements CacheableService { private final AtomicLong counter = new AtomicLong(); private final AtomicLong nullInvocations = new AtomicLong(); + @Override @Cacheable("default") public Long cache(Object arg1) { return counter.getAndIncrement(); } + @Override @CacheEvict("default") public void invalidate(Object arg1) { } + @Override @CacheEvict("default") public void evictWithException(Object arg1) { throw new RuntimeException("exception thrown - evict should NOT occur"); } + @Override @CacheEvict(value = "default", allEntries = true) public void evictAll(Object arg1) { } + @Override @CacheEvict(value = "default", beforeInvocation = true) public void evictEarly(Object arg1) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @CacheEvict(value = "default", key = "#p0") public void evict(Object arg1, Object arg2) { } + @Override @CacheEvict(value = "default", key = "#p0", beforeInvocation = true) public void invalidateEarly(Object arg1, Object arg2) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @Cacheable(value = "default", condition = "#classField == 3") public Long conditional(int classField) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#p0") public Long key(Object arg1, Object arg2) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName") public Long name(Object arg1) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target") public Long rootVars(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut("default") public Long update(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut(value = "default", condition = "#arg.equals(3)") public Long conditionalUpdate(Object arg) { return Long.valueOf(arg.toString()); } + @Override @Cacheable("default") public Long nullValue(Object arg1) { nullInvocations.incrementAndGet(); return null; } + @Override public Number nullInvocations() { return nullInvocations.get(); } + @Override @Cacheable("default") public Long throwChecked(Object arg1) throws Exception { throw new Exception(arg1.toString()); } + @Override @Cacheable("default") public Long throwUnchecked(Object arg1) { throw new UnsupportedOperationException(arg1.toString()); @@ -117,26 +134,31 @@ public class DefaultCacheableService implements CacheableService { // multi annotations + @Override @Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") }) public Long multiCache(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") }) public Long multiEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") }) public Long multiCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") }) public Long multiConditionalCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(put = { @CachePut("primary"), @CachePut("secondary") }) public Long multiUpdate(Object arg1) { return Long.valueOf(arg1.toString()); diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java index 29114dd9678..3e9138fd5e2 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java +++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java @@ -115,6 +115,7 @@ public class EnableCachingTests extends AbstractAnnotationTests { @Configuration @EnableCaching static class EnableCachingConfig implements CachingConfigurer { + @Override @Bean public CacheManager cacheManager() { SimpleCacheManager cm = new SimpleCacheManager(); @@ -135,6 +136,7 @@ public class EnableCachingTests extends AbstractAnnotationTests { return new AnnotatedClassCacheableService(); } + @Override @Bean public KeyGenerator keyGenerator() { return new SomeKeyGenerator(); @@ -174,9 +176,11 @@ public class EnableCachingTests extends AbstractAnnotationTests { @Bean public CacheManager cm2() { return new NoOpCacheManager(); } + @Override public CacheManager cacheManager() { return cm1(); } + @Override public KeyGenerator keyGenerator() { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java index 3faf3ba364b..e2603726ccf 100644 --- a/spring-context/src/test/java/org/springframework/context/ACATester.java +++ b/spring-context/src/test/java/org/springframework/context/ACATester.java @@ -22,6 +22,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index a0493b62ec2..fe8201644ba 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java index f525d38fe16..8ec1c33a345 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -26,6 +26,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java index 3bda3d37230..9ca20496a31 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java index 720a7cd9b4b..68664e6a01b 100644 --- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -30,18 +30,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java index 834439484c9..c4d12a1881d 100644 --- a/spring-context/src/test/java/org/springframework/context/TestListener.java +++ b/spring-context/src/test/java/org/springframework/context/TestListener.java @@ -34,6 +34,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java index 96750057f5c..e4d3dfbe147 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java @@ -47,6 +47,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml")); } + @Override @Test public void testBasicFunctionality() { ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator( @@ -71,6 +72,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor * 2nd and subsequent calls will actually get back same locator instance. This is not * really an issue, since the contained bean factories will still be loaded and released. */ + @Override @Test public void testGetInstance() { // Try with and without 'classpath*:' prefix, and with 'classpath:' prefix. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java index a829ee49f97..f82a42fc5c6 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java @@ -159,18 +159,22 @@ public class AnnotationConfigApplicationContextTests { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(AutowiredConfig.class); context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return (bean instanceof TestBean ? null : bean); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } }); context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { bean.getClass().getName(); return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { bean.getClass().getName(); return bean; @@ -230,14 +234,17 @@ public class AnnotationConfigApplicationContextTests { static class UntypedFactoryBean implements FactoryBean { + @Override public Object getObject() { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return false; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java index 87921285875..e225b5cfe99 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java @@ -151,6 +151,7 @@ public class AnnotationProcessorPerformanceTests { private static class ResourceAnnotatedTestBean extends TestBean { + @Override @Resource @Required public void setSpouse(ITestBean spouse) { super.setSpouse(spouse); @@ -160,6 +161,7 @@ public class AnnotationProcessorPerformanceTests { private static class AutowiredAnnotatedTestBean extends TestBean { + @Override @Autowired @Required public void setSpouse(ITestBean spouse) { super.setSpouse(spouse); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index b4135bf6468..5029e1c7e6d 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -207,6 +207,7 @@ public class CommonAnnotationBeanPostProcessorTests { bf.registerResolvableDependency(BeanFactory.class, bf); bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() { + @Override public Object getObject() throws BeansException { return new NestedTestBean(); } @@ -452,6 +453,7 @@ public class CommonAnnotationBeanPostProcessorTests { public static class InitDestroyBeanPostProcessor implements DestructionAwareBeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertFalse(((AnnotatedInitDestroyBean) bean).initCalled); @@ -459,6 +461,7 @@ public class CommonAnnotationBeanPostProcessorTests { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertTrue(((AnnotatedInitDestroyBean) bean).initCalled); @@ -466,6 +469,7 @@ public class CommonAnnotationBeanPostProcessorTests { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertFalse(((AnnotatedInitDestroyBean) bean).destroyCalled); @@ -566,6 +570,7 @@ public class CommonAnnotationBeanPostProcessorTests { @Resource private BeanFactory beanFactory; + @Override @Resource public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -597,6 +602,7 @@ public class CommonAnnotationBeanPostProcessorTests { return testBean6; } + @Override @PostConstruct protected void init2() { if (this.testBean3 == null || this.testBean4 == null) { @@ -605,6 +611,7 @@ public class CommonAnnotationBeanPostProcessorTests { super.init2(); } + @Override @PreDestroy protected void destroy2() { super.destroy2(); @@ -627,6 +634,7 @@ public class CommonAnnotationBeanPostProcessorTests { @Resource private BeanFactory beanFactory; + @Override @EJB public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -650,6 +658,7 @@ public class CommonAnnotationBeanPostProcessorTests { return testBean4; } + @Override @PostConstruct protected void init2() { if (this.testBean3 == null || this.testBean4 == null) { @@ -658,6 +667,7 @@ public class CommonAnnotationBeanPostProcessorTests { super.init2(); } + @Override @PreDestroy protected void destroy2() { super.destroy2(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java index 75bef42a0f8..b377f6b4375 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java @@ -147,6 +147,7 @@ public class ComponentScanParserTests { public static class CustomTypeFilter implements TypeFilter { + @Override public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) { return metadataReader.getClassMetadata().getClassName().contains("Custom"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java index d917b0d6086..3e672f556c4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java @@ -75,6 +75,7 @@ public class ConfigurationClassAndBFPPTests { @Bean public BeanFactoryPostProcessor bfpp() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { // no-op } @@ -90,6 +91,7 @@ public class ConfigurationClassAndBFPPTests { @Bean public static final BeanFactoryPostProcessor bfpp() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { // no-op } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java index 14d1932dca6..d79256a53ba 100755 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java @@ -95,12 +95,15 @@ class DummyBean { class MyFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return "foo"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -115,15 +118,18 @@ class MyParameterizedFactoryBean implements FactoryBean { this.obj = obj; } + @Override public T getObject() throws Exception { return obj; } + @Override @SuppressWarnings("unchecked") public Class getObjectType() { return (Class)obj.getClass(); } + @Override public boolean isSingleton() { return true; } 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 b2c1db67d97..3fc42a1f147 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 @@ -63,14 +63,17 @@ class Bar { class FooFactoryBean implements FactoryBean { + @Override public Foo getObject() { return new Foo(); } + @Override public Class getObjectType() { return Foo.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java index d89deb4415c..f8613d29ace 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java @@ -140,6 +140,7 @@ public class DestroyMethodInferenceTests { static class WithInheritedCloseMethod implements Closeable { boolean closed = false; + @Override public void close() throws IOException { closed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java index df6b5fb8e96..fb0683ed279 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java @@ -70,6 +70,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.DISABLED) static class EnableLTWConfig_withAjWeavingDisabled implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); // no expectations -> a class file transformer should NOT be added @@ -81,6 +82,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.AUTODETECT) static class EnableLTWConfig_withAjWeavingAutodetect implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); // no expectations -> a class file transformer should NOT be added @@ -93,6 +95,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.ENABLED) static class EnableLTWConfig_withAjWeavingEnabled implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); mockLTW.addTransformer(isA(ClassFileTransformer.class)); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java index 4546a22de08..a52d8cc5045 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java @@ -31,6 +31,7 @@ public class FooServiceDependentConverter implements Converter initMethods = new ArrayList(); final List destroyMethods = new ArrayList(); + @Override @PostConstruct public void afterPropertiesSet() throws Exception { this.initMethods.add("afterPropertiesSet"); } + @Override @PreDestroy public void destroy() throws Exception { this.destroyMethods.add("destroy"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java index 50453f6b5d2..68dd81c5af2 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java @@ -85,14 +85,17 @@ public class Spr6602Tests { public static class BarFactory implements FactoryBean { + @Override public Bar getObject() throws Exception { return new Bar(); } + @Override public Class getObjectType() { return Bar.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java index 1f77d726b9a..6bed19ab6ea 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; */ public class TestBeanNameGenerator extends AnnotationBeanNameGenerator { + @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { String beanName = super.generateBeanName(definition, registry); return "testing." + beanName; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java index 5471d438af4..eef18312ba0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition; */ public class TestScopeMetadataResolver implements ScopeMetadataResolver { + @Override public ScopeMetadata resolveScopeMetadata(BeanDefinition beanDefinition) { ScopeMetadata metadata = new ScopeMetadata(); metadata.setScopeName("myCustomScope"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java index 445397c384d..39c2654d0b1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java @@ -65,6 +65,7 @@ public class ConfigurationBeanNameTests { public void registerOuterConfig_withBeanNameGenerator() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.setBeanNameGenerator(new AnnotationBeanNameGenerator() { + @Override public String generateBeanName( BeanDefinition definition, BeanDefinitionRegistry registry) { return "custom-" + super.generateBeanName(definition, registry); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java index 1d21211ad79..d198b49180b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java @@ -70,6 +70,7 @@ public class ConfigurationClassCglibCallbackDeregistrationTests { @Configuration static class DisposableConfig implements DisposableBean { boolean destroyed = false; + @Override public void destroy() throws Exception { this.destroyed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java index 8073f92b831..6e8f7c649ce 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java @@ -284,12 +284,14 @@ public class ConfigurationClassProcessingTests { public void setNameSuffix(String nameSuffix) { this.nameSuffix = nameSuffix; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { if (bean instanceof ITestBean) { ((ITestBean) bean).setName(((ITestBean) bean).getName() + nameSuffix); } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -302,6 +304,7 @@ public class ConfigurationClassProcessingTests { //@Bean public BeanFactoryPostProcessor beanFactoryPostProcessor() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { BeanDefinition bd = beanFactory.getBeanDefinition("beanPostProcessor"); bd.getPropertyValues().addPropertyValue("nameSuffix", "-processed-" + myProp); @@ -334,6 +337,7 @@ public class ConfigurationClassProcessingTests { super.setSpouse(spouse); } + @Override public void onApplicationEvent(ContextRefreshedEvent event) { this.refreshed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index b0d617e9cf3..6be61e22c5e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -379,6 +379,7 @@ public class ScopingTests { private Map beans = new HashMap(); + @Override public Object get(String name, ObjectFactory objectFactory) { if (createNewScope) { beans.clear(); @@ -396,18 +397,22 @@ public class ScopingTests { return beans.get(name); } + @Override public String getConversationId() { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { // do nothing } + @Override public Object remove(String name) { return beans.remove(name); } + @Override public Object resolveContextualObject(String key) { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java index 9c8f2400035..910e71b9c96 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java @@ -67,6 +67,7 @@ class MyPostProcessor implements BeanFactoryPostProcessor { public MyPostProcessor(Dependency someDependency) { } + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { AbstractBeanDefinition bd = (AbstractBeanDefinition) beanFactory.getBeanDefinition("someDependency"); bd.setDescription("post processed by MyPostProcessor"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java index 64f491bd4e9..1363f45d896 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java @@ -28,6 +28,7 @@ import example.scannable.FooDao; @Qualifier("testing") public class StubFooDao implements FooDao { + @Override public String findFoo(int id) { return "bar"; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java index 67f07601774..6e1461dd361 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java @@ -24,6 +24,7 @@ import example.scannable.FooDao; @MyRepository public class OtherFooDao implements FooDao { + @Override public String findFoo(int id) { return "other"; } diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java index 5248cb2644a..654ffa9153f 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java @@ -23,6 +23,7 @@ import org.springframework.core.convert.converter.Converter; */ public class StringToBarConverter implements Converter { + @Override public Bar convert(String source) { return new Bar(source); } diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 24dec9ad54d..1811a789381 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -214,10 +214,12 @@ public class ApplicationContextEventTests { public final Set seenEvents = new HashSet(); + @Override public void onApplicationEvent(ApplicationEvent event) { this.seenEvents.add(event); } + @Override public int getOrder() { return 0; } @@ -230,6 +232,7 @@ public class ApplicationContextEventTests { public static abstract class MyOrderedListenerBase implements MyOrderedListenerIfc { + @Override public int getOrder() { return 1; } @@ -244,6 +247,7 @@ public class ApplicationContextEventTests { this.otherListener = otherListener; } + @Override public void onApplicationEvent(MyEvent event) { assertTrue(otherListener.seenEvents.contains(event)); } @@ -254,6 +258,7 @@ public class ApplicationContextEventTests { public static final Set seenEvents = new HashSet(); + @Override public void onApplicationEvent(ApplicationEvent event) { seenEvents.add(event); } diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 4e1f90468cf..3cf6771099a 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -90,6 +90,7 @@ public class EventPublicationInterceptorTests { final TestListener listener = new TestListener(); class TestContext extends StaticApplicationContext { + @Override protected void onRefresh() throws BeansException { addListener(listener); } @@ -140,14 +141,17 @@ public class EventPublicationInterceptorTests { public static class FactoryBeanTestListener extends TestListener implements FactoryBean { + @Override public Object getObject() throws Exception { return "test"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java index b1bbb815acb..c6f95b24bba 100644 --- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java @@ -71,6 +71,7 @@ public class LifecycleEventTests extends TestCase { private int stoppedCount; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof ContextStartedEvent) { this.context = ((ContextStartedEvent) event).getApplicationContext(); @@ -100,14 +101,17 @@ public class LifecycleEventTests extends TestCase { private boolean running; + @Override public boolean isRunning() { return this.running; } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index cfd70979e98..16eccd8d33e 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -57,14 +57,18 @@ public class ApplicationContextExpressionTests { AnnotationConfigUtils.registerAnnotationConfigProcessors(ac); ac.getBeanFactory().registerScope("myScope", new Scope() { + @Override public Object get(String name, ObjectFactory objectFactory) { return objectFactory.getObject(); } + @Override public Object remove(String name) { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { } + @Override public Object resolveContextualObject(String key) { if (key.equals("mySpecialAttr")) { return "42"; @@ -73,6 +77,7 @@ public class ApplicationContextExpressionTests { return null; } } + @Override public String getConversationId() { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java index 2e36dde141e..94d465bcdaf 100644 --- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java @@ -104,6 +104,7 @@ public class BeanFactoryPostProcessorTests { public boolean wasCalled = false; + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { wasCalled = true; } diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index 68ddae1f8c2..903ff415329 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -320,6 +320,7 @@ public final class ClassPathXmlApplicationContextTests { @Test public void testResourceAndInputStream() throws IOException { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) { + @Override public Resource getResource(String location) { if (TEST_PROPERTIES.equals(location)) { return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class); diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java index 34588e19a7a..9ee0025433f 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java @@ -54,14 +54,17 @@ public class ConversionServiceFactoryBeanTests { ConversionServiceFactoryBean factory = new ConversionServiceFactoryBean(); Set converters = new HashSet(); converters.add(new Converter() { + @Override public Foo convert(String source) { return new Foo(); } }); converters.add(new ConverterFactory() { + @Override public Converter getConverter(Class targetType) { return new Converter () { @SuppressWarnings("unchecked") + @Override public T convert(String source) { return (T) new Bar(); } @@ -69,9 +72,11 @@ public class ConversionServiceFactoryBeanTests { } }); converters.add(new GenericConverter() { + @Override public Set getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(String.class, Baz.class)); } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return new Baz(); } diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index a561e2cbf38..cc345c79e07 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -585,10 +585,12 @@ public class DefaultLifecycleProcessorTests { this.stoppedBeans = stoppedBeans; } + @Override public boolean isRunning() { return this.running; } + @Override public void start() { if (this.startedBeans != null) { this.startedBeans.add(this); @@ -596,6 +598,7 @@ public class DefaultLifecycleProcessorTests { this.running = true; } + @Override public void stop() { if (this.stoppedBeans != null) { this.stoppedBeans.add(this); @@ -627,10 +630,12 @@ public class DefaultLifecycleProcessorTests { this.shutdownDelay = shutdownDelay; } + @Override public int getPhase() { return this.phase; } + @Override public boolean isAutoStartup() { return this.autoStartup; } @@ -639,12 +644,14 @@ public class DefaultLifecycleProcessorTests { this.autoStartup = autoStartup; } + @Override public void stop(final Runnable callback) { // calling stop() before the delay to preserve // invocation order in the 'stoppedBeans' list stop(); final int delay = this.shutdownDelay; new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(delay); @@ -665,27 +672,33 @@ public class DefaultLifecycleProcessorTests { public boolean running = false; + @Override public boolean isAutoStartup() { return true; } + @Override public void stop(Runnable callback) { this.running = false; callback.run(); } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } + @Override public boolean isRunning() { return this.running; } + @Override public int getPhase() { return 0; } @@ -698,39 +711,48 @@ public class DefaultLifecycleProcessorTests { DummySmartLifecycleBean bean = new DummySmartLifecycleBean(); + @Override public Object getObject() throws Exception { return this.bean; } + @Override public Class getObjectType() { return DummySmartLifecycleBean.class; } + @Override public boolean isSingleton() { return true; } + @Override public boolean isAutoStartup() { return true; } + @Override public void stop(Runnable callback) { this.running = false; callback.run(); } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } + @Override public boolean isRunning() { return this.running; } + @Override public int getPhase() { return 0; } diff --git a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java index a545e69e688..cd68925cc97 100644 --- a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java +++ b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java @@ -10,18 +10,22 @@ import org.springframework.context.ApplicationListener; */ public class FactoryBeanAndApplicationListener implements FactoryBean, ApplicationListener { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } + @Override public void onApplicationEvent(ApplicationEvent event) { } diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java index 44dcf38bd68..24e94a154b9 100644 --- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java +++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java @@ -43,15 +43,18 @@ public class LifecycleTestBean implements Lifecycle { return stopOrder; } + @Override public boolean isRunning() { return this.running; } + @Override public void start() { this.startOrder = ++startCounter; this.running = true; } + @Override public void stop() { this.stopOrder = ++stopCounter; this.running = false; 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 325ebc10a48..71d169120ec 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 @@ -34,6 +34,7 @@ public class Logic implements BeanNameAware { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.name = name; } diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java index f5834e8e6f6..91ff6bd0229 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java @@ -25,6 +25,7 @@ import org.springframework.core.io.Resource; */ public class ResourceConverter implements Converter { + @Override public Resource convert(String source) { return new FileSystemResource(source + ".xml"); } diff --git a/spring-context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java index 8778978bd80..a0be957e75c 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Service.java +++ b/spring-context/src/test/java/org/springframework/context/support/Service.java @@ -40,10 +40,12 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis private boolean properlyDestroyed = false; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } + @Override public void setMessageSource(MessageSource messageSource) { if (this.messageSource != null) { throw new IllegalArgumentException("MessageSource should not be set twice"); @@ -64,9 +66,11 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis } + @Override public void destroy() { this.properlyDestroyed = true; Thread thread = new Thread() { + @Override public void run() { Assert.isTrue(applicationContext.getBean("messageSource") instanceof StaticMessageSource); try { diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java index 01d95795fa5..42d89e92545 100644 --- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java +++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java @@ -49,11 +49,13 @@ public class SimpleThreadScopeTest { public void getMultipleInstances() throws Exception { final TestBean[] beans = new TestBean[2]; Thread thread1 = new Thread(new Runnable() { + @Override public void run() { beans[0] = applicationContext.getBean("threadScopedObject", TestBean.class); } }); Thread thread2 = new Thread(new Runnable() { + @Override public void run() { beans[1] = applicationContext.getBean("threadScopedObject", TestBean.class); } diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java index 9ac74335896..fc211895acd 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java @@ -43,6 +43,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio protected StaticApplicationContext sac; /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); Map m = new HashMap(); @@ -73,10 +74,12 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio } /** Overridden */ + @Override public void testCount() { assertCount(15); } + @Override public void testEvents() throws Exception { TestApplicationEventMulticaster.counter = 0; super.testEvents(); @@ -88,6 +91,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio private static int counter = 0; + @Override public void multicastEvent(ApplicationEvent event) { super.multicastEvent(event); counter++; diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java index 2dba7fc9eac..b6f936dd1aa 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java @@ -39,6 +39,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes protected StaticApplicationContext sac; /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); Map m = new HashMap(); @@ -66,6 +67,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes } /** Overridden */ + @Override public void testCount() { assertCount(15); } diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java index 73d0cab6517..8469cbd64f2 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java @@ -49,11 +49,13 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { protected StaticApplicationContext sac; /** Overridden */ + @Override public void testCount() { // These are only checked for current Ctx (not parent ctx) assertCount(15); } + @Override public void testMessageSource() throws NoSuchMessageException { // Do nothing here since super is looking for errorCodes we // do NOT have in the Context @@ -195,6 +197,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { } /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); diff --git a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java index 0fa4b0e392e..f51d024715b 100644 --- a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java +++ b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java @@ -28,6 +28,7 @@ public class TestProxyFactoryBean extends AbstractSingletonProxyFactoryBean impl return new NoOpAdvice(); } + @Override public void setBeanFactory(BeanFactory beanFactory) { } diff --git a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java index acec31ff7c1..701f7518ee1 100644 --- a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java +++ b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java @@ -23,6 +23,7 @@ package org.springframework.core.task; */ public class NoOpRunnable implements Runnable { + @Override public void run() { // explicit no-op System.out.println("Running"); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java index bcfc34c71b9..3dc63f5cde3 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java @@ -57,6 +57,7 @@ public class LocalSlsbInvokerInterceptorTests { final NamingException nex = new NamingException(); final String jndiName= "foobar"; JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { assertTrue(jndiName.equals(name)); throw nex; @@ -174,6 +175,7 @@ public class LocalSlsbInvokerInterceptorTests { LocalSlsbInvokerInterceptor si = new LocalSlsbInvokerInterceptor(); si.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() throws NamingException { return mockCtx; } diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java index c2c9e07aaaf..b053e3e0380 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java @@ -52,6 +52,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -85,6 +86,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(myEjb); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -117,6 +119,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals(jndiName)); @@ -158,6 +161,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java index a48935c47c2..cbf75b18310 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java @@ -63,6 +63,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { SimpleRemoteSlsbInvokerInterceptor si = createInterceptor(); si.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockCtx; } @@ -121,6 +122,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { final NamingException nex = new NamingException(); final String jndiName = "foobar"; JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { assertTrue(jndiName.equals(name)); throw nex; diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java index 396d347b178..dca93a798e5 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java @@ -38,10 +38,12 @@ import org.springframework.remoting.RemoteAccessException; */ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRemoteSlsbInvokerInterceptorTests { + @Override protected SimpleRemoteSlsbInvokerInterceptor createInterceptor() { return new SimpleRemoteStatelessSessionProxyFactoryBean(); } + @Override protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class ifc) throws NamingException { SimpleRemoteStatelessSessionProxyFactoryBean fb = (SimpleRemoteStatelessSessionProxyFactoryBean) si; fb.setBusinessInterface(ifc); @@ -64,6 +66,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -97,6 +100,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(myEjb); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -119,6 +123,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem verify(myEjb); } + @Override @Test public void testRemoteException() throws Exception { final RemoteException rex = new RemoteException(); @@ -136,6 +141,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -175,6 +181,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals(jndiName)); @@ -216,6 +223,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals(jndiName)); @@ -257,6 +265,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals(jndiName)); diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java index 9d60580e5d4..556d5a78bd4 100644 --- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java @@ -48,6 +48,7 @@ public class NumberFormattingTests { public void setUp() { DefaultConversionService.addDefaultConverters(conversionService); conversionService.setEmbeddedValueResolver(new StringValueResolver() { + @Override public String resolveStringValue(String strVal) { if ("${pattern}".equals(strVal)) { return "#,##.00"; diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java index a5c07dbe80c..d501dafa400 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java @@ -149,10 +149,12 @@ public class FormattingConversionServiceFactoryBeanTests { private static class TestBeanFormatter implements Formatter { + @Override public String print(TestBean object, Locale locale) { return String.valueOf(object.getSpecialInt()); } + @Override public TestBean parse(String text, Locale locale) throws ParseException { TestBean object = new TestBean(); object.setSpecialInt(Integer.parseInt(text)); @@ -169,20 +171,25 @@ public class FormattingConversionServiceFactoryBeanTests { fieldTypes.add(Integer.class); } + @Override public Set> getFieldTypes() { return fieldTypes; } + @Override public Printer getPrinter(SpecialInt annotation, Class fieldType) { return new Printer() { + @Override public String print(Integer object, Locale locale) { return ":" + object.toString(); } }; } + @Override public Parser getParser(SpecialInt annotation, Class fieldType) { return new Parser() { + @Override public Integer parse(String text, Locale locale) throws ParseException { return Integer.parseInt(text.substring(1)); } @@ -192,6 +199,7 @@ public class FormattingConversionServiceFactoryBeanTests { private static class TestFormatterRegistrar implements FormatterRegistrar { + @Override public void registerFormatters(FormatterRegistry registry) { registry.addFormatter(new TestBeanFormatter()); } diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java index c620be5b741..6fcefd9d751 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java @@ -86,6 +86,7 @@ public class FormattingConversionServiceTests { @Test public void testFormatFieldForTypeWithPrinterParserWithCoercion() throws ParseException { formattingService.addConverter(new Converter() { + @Override public LocalDate convert(DateTime source) { return source.toLocalDate(); } @@ -170,11 +171,13 @@ public class FormattingConversionServiceTests { @SuppressWarnings("unchecked") private void doTestFormatFieldForAnnotation(Class modelClass, boolean directFieldAccess) throws Exception { formattingService.addConverter(new Converter() { + @Override public Long convert(Date source) { return source.getTime(); } }); formattingService.addConverter(new Converter() { + @Override public Date convert(DateTime source) { return source.toDate(); } @@ -277,17 +280,20 @@ public class FormattingConversionServiceTests { @Test public void testFormatFieldForAnnotationWithSubclassAsFieldType() throws Exception { formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory() { + @Override public Printer getPrinter(org.springframework.format.annotation.DateTimeFormat annotation, Class fieldType) { assertEquals(MyDate.class, fieldType); return super.getPrinter(annotation, fieldType); } }); formattingService.addConverter(new Converter() { + @Override public Long convert(MyDate source) { return source.getTime(); } }); formattingService.addConverter(new Converter() { + @Override public Date convert(MyDate source) { return source; } @@ -364,10 +370,12 @@ public class FormattingConversionServiceTests { public static class NullReturningFormatter implements Formatter { + @Override public String print(Integer object, Locale locale) { return null; } + @Override public Integer parse(String text, Locale locale) throws ParseException { return null; } diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java index 09644b02c0e..8abddb5ea30 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java @@ -46,6 +46,7 @@ public final class ReflectiveLoadTimeWeaverTests { JustAddTransformerClassLoader classLoader = new JustAddTransformerClassLoader(); ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(classLoader); weaver.addTransformer(new ClassFileTransformer() { + @Override public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { return "CAFEDEAD".getBytes(); } @@ -97,6 +98,7 @@ public final class ReflectiveLoadTimeWeaverTests { private int numTimesGetThrowawayClassLoaderCalled = 0; + @Override public int getNumTimesGetThrowawayClassLoaderCalled() { return this.numTimesGetThrowawayClassLoaderCalled; } diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java index bb94cbe364a..3f3580b37dd 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java @@ -31,10 +31,12 @@ public abstract class AbstractJmxTests extends AbstractMBeanServerTests { private ConfigurableApplicationContext ctx; + @Override protected final void onSetUp() throws Exception { ctx = loadContext(getApplicationContextPath()); } + @Override protected final void onTearDown() throws Exception { if (ctx != null) { ctx.close(); diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java index c40b734119d..06122a2a02e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java @@ -45,6 +45,7 @@ public abstract class AbstractMBeanServerTests extends TestCase { protected MBeanServer server; + @Override public final void setUp() throws Exception { this.server = MBeanServerFactory.createMBeanServer(); try { @@ -63,6 +64,7 @@ public abstract class AbstractMBeanServerTests extends TestCase { return ctx; } + @Override protected void tearDown() throws Exception { releaseServer(); onTearDown(); diff --git a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java index e73f6106c76..5268a8d6533 100644 --- a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java @@ -43,10 +43,12 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedAttribute * (description="The Age Attribute", currencyTimeLimit=15) */ + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -54,6 +56,7 @@ public class JmxTestBean implements IJmxTestBean { /** * @@org.springframework.jmx.export.metadata.ManagedOperation(currencyTimeLimit=30) */ + @Override public long myOperation() { return 1L; } @@ -63,6 +66,7 @@ public class JmxTestBean implements IJmxTestBean { * (description="The Name Attribute", currencyTimeLimit=20, * defaultValue="bar", persistPolicy="OnUpdate") */ + @Override public void setName(String name) throws Exception { if ("Juergen".equals(name)) { throw new IllegalArgumentException("Juergen"); @@ -80,6 +84,7 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedAttribute * (defaultValue="foo", persistPeriod=300) */ + @Override public String getName() { return name; } @@ -117,6 +122,7 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=0, name="x", description="Left operand") * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=1, name="y", description="Right operand") */ + @Override public int add(int x, int y) { return x + y; } @@ -124,6 +130,7 @@ public class JmxTestBean implements IJmxTestBean { /** * Test method that is not exposed by the MetadataAssembler. */ + @Override public void dontExposeMe() { throw new RuntimeException(); } diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java index a6af50e1325..29d2c04037d 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java @@ -50,6 +50,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { protected boolean runTests = true; + @Override public void onSetUp() throws Exception { target = new JmxTestBean(); target.setAge(100); @@ -277,10 +278,12 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { private static class ProxyTestAssembler extends AbstractReflectiveMBeanInfoAssembler { + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return true; } + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { if ("setAge".equals(method.getName())) { return false; @@ -288,6 +291,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { return true; } + @Override protected boolean includeOperation(Method method, String beanKey) { if ("dontExposeMe".equals(method.getName())) { return false; diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java index 77aefe6167c..b33a5793aa3 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java @@ -46,6 +46,7 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep private JMXConnector connector; + @Override public void onSetUp() throws Exception { super.onSetUp(); this.connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(getServiceUrl(), null, getServer()); @@ -61,11 +62,13 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep return new JMXServiceURL(SERVICE_URL); } + @Override protected MBeanServerConnection getServerConnection() throws Exception { this.connector = JMXConnectorFactory.connect(getServiceUrl()); return this.connector.getMBeanServerConnection(); } + @Override public void tearDown() throws Exception { if (this.connector != null) { this.connector.close(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java index d9aba5b4c07..67c8adc64b4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java @@ -31,6 +31,7 @@ public class CustomEditorConfigurerTests extends AbstractJmxTests { private final SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/customConfigurer.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java index d95c6b4f28b..716fccfc7c5 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java @@ -67,6 +67,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { MBeanExporter exporter = new MBeanExporter(); exporter.setServer(getServer()); exporter.setNamingStrategy(new ObjectNamingStrategy() { + @Override public ObjectName getObjectName(Object managedBean, String beanKey) { return objectNameTemplate; } @@ -92,6 +93,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { exporter.setServer(getServer()); exporter.setEnsureUniqueRuntimeObjectNames(false); exporter.setNamingStrategy(new ObjectNamingStrategy() { + @Override public ObjectName getObjectName(Object managedBean, String beanKey) { return objectNameTemplate; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java index 85865af76fc..83011aec3bb 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java @@ -98,6 +98,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { public void testRegisterNotificationListenerForNonExistentMBean() throws Exception { Map listeners = new HashMap(); NotificationListener dummyListener = new NotificationListener() { + @Override public void handleNotification(Notification notification, Object handback) { throw new UnsupportedOperationException(); } @@ -666,6 +667,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private boolean invoked = false; + @Override public ModelMBeanInfo getMBeanInfo(Object managedResource, String beanKey) throws JMException { invoked = true; return null; @@ -678,10 +680,12 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private List unregistered = new ArrayList(); + @Override public void mbeanRegistered(ObjectName objectName) { registered.add(objectName); } + @Override public void mbeanUnregistered(ObjectName objectName) { unregistered.add(objectName); } @@ -703,6 +707,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { this.objectName = objectName; } + @Override public ObjectName getObjectName() throws MalformedObjectNameException { return this.objectName; } @@ -717,6 +722,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private String name; + @Override public String getName() { return name; } @@ -730,6 +736,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private List notifications = new ArrayList(); + @Override public void handleNotification(Notification notification, Object handback) { this.notifications.add(notification); } @@ -756,6 +763,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { this.namedBean = namedBean; } + @Override public boolean includeBean(Class beanClass, String beanName) { return this.namedBean.equals(beanName); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java index 3ab938d95d9..3eb6fe9baa1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java @@ -158,6 +158,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { NotificationListenerBean listenerBean = new NotificationListenerBean(); listenerBean.setNotificationListener(listener); listenerBean.setNotificationFilter(new NotificationFilter() { + @Override public boolean isNotificationEnabled(Notification notification) { if (notification instanceof AttributeChangeNotification) { AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification; @@ -434,6 +435,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { private Map attributeHandbacks = new HashMap(); + @Override public void handleNotification(Notification notification, Object handback) { if (notification instanceof AttributeChangeNotification) { AttributeChangeNotification attNotification = (AttributeChangeNotification) notification; @@ -473,6 +475,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { this.objectName = objectName; } + @Override public ObjectName getObjectName() throws MalformedObjectNameException { return this.objectName; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java index 24d7f4b57d0..ef79c481c6b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java @@ -119,6 +119,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { private Notification lastNotification; + @Override public void handleNotification(Notification notification, Object handback) { this.lastNotification = notification; this.count++; @@ -139,6 +140,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { private NotificationPublisher notificationPublisher; + @Override public void setNotificationPublisher(NotificationPublisher notificationPublisher) { this.notificationPublisher = notificationPublisher; } @@ -158,28 +160,34 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { public static class MyNotificationPublisherMBean extends NotificationBroadcasterSupport implements DynamicMBean { + @Override public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException { return null; } + @Override public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException { } + @Override public AttributeList getAttributes(String[] attributes) { return null; } + @Override public AttributeList setAttributes(AttributeList attributes) { return null; } + @Override public Object invoke(String actionName, Object params[], String signature[]) throws MBeanException, ReflectionException { return null; } + @Override public MBeanInfo getMBeanInfo() { return new MBeanInfo(MyNotificationPublisherMBean.class.getName(), "", new MBeanAttributeInfo[0], new MBeanConstructorInfo[0], new MBeanOperationInfo[0], new MBeanNotificationInfo[0]); @@ -192,6 +200,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { public static class MyNotificationPublisherStandardMBean extends NotificationBroadcasterSupport implements MyMBean { + @Override public void sendNotification() { sendNotification(new Notification("test", this, 1)); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java index 96167d24ec7..ba052565270 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java @@ -26,6 +26,7 @@ import org.springframework.jmx.IJmxTestBean; */ public class PropertyPlaceholderConfigurerTests extends AbstractJmxTests { + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/propertyPlaceholderConfigurer.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java index a52d6a7e78c..7ed0f6c7ec3 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java @@ -37,6 +37,7 @@ public class TestDynamicMBean implements DynamicMBean { } } + @Override public Object getAttribute(String attribute) { if ("Name".equals(attribute)) { return "Rob Harrop"; @@ -44,21 +45,26 @@ public class TestDynamicMBean implements DynamicMBean { return null; } + @Override public void setAttribute(Attribute attribute) { } + @Override public AttributeList getAttributes(String[] attributes) { return null; } + @Override public AttributeList setAttributes(AttributeList attributes) { return null; } + @Override public Object invoke(String actionName, Object[] params, String[] signature) { return null; } + @Override public MBeanInfo getMBeanInfo() { MBeanAttributeInfo attr = new MBeanAttributeInfo("name", "java.lang.String", "", true, false, false); return new MBeanInfo( diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java index 5f65e056f61..e75c9a7ad52 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java @@ -48,18 +48,22 @@ public class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerT assertNotNull(op); } + @Override protected JmxAttributeSource getAttributeSource() { return new AnnotationJmxAttributeSource(); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected IJmxTestBean createJmxTestBean() { return new AnnotationTestSubBean(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/annotation/annotations.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java index 97a3581954e..4d751020b6e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java @@ -40,20 +40,24 @@ public class AnnotationTestBean implements IJmxTestBean { private boolean isSuperman; + @Override @ManagedAttribute(description = "The Age Attribute", currencyTimeLimit = 15) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override @ManagedOperation(currencyTimeLimit = 30) public long myOperation() { return 1L; } + @Override @ManagedAttribute(description = "The Name Attribute", currencyTimeLimit = 20, defaultValue = "bar", @@ -62,6 +66,7 @@ public class AnnotationTestBean implements IJmxTestBean { this.name = name; } + @Override @ManagedAttribute(defaultValue = "foo", persistPeriod = 300) public String getName() { return name; @@ -85,6 +90,7 @@ public class AnnotationTestBean implements IJmxTestBean { return isSuperman; } + @Override @org.springframework.jmx.export.annotation.ManagedOperation(description = "Add Two Numbers Together") @ManagedOperationParameters({@ManagedOperationParameter(name="x", description="Left operand"), @ManagedOperationParameter(name="y", description="Right operand")}) @@ -95,6 +101,7 @@ public class AnnotationTestBean implements IJmxTestBean { /** * Test method that is not exposed by the MetadataAssembler. */ + @Override public void dontExposeMe() { throw new RuntimeException(); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java index 3e47e82bfd3..2dc4fa087b6 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java @@ -30,14 +30,17 @@ public class AnnotationTestBeanFactory implements FactoryBean getObjectType() { return FactoryCreatedAnnotationTestBean.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java index 8bfbc77ac08..dc9f58375c2 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java @@ -38,17 +38,21 @@ public class AnnotationTestSubBean extends AnnotationTestBean implements IAnnota return super.getAge(); } + @Override public String getColour() { return this.colour; } + @Override public void setColour(String colour) { this.colour = colour; } + @Override public void fromInterface() { } + @Override public int getExpensiveToCalculate() { return Integer.MAX_VALUE; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java index d409d1e8e2c..675deb0ae3d 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java @@ -54,6 +54,7 @@ public class JmxUtilsAnnotationTests extends TestCase { public static class FooNotX implements FooNotMXBean { + @Override public String getName() { return "Rob Harrop"; } @@ -69,6 +70,7 @@ public class JmxUtilsAnnotationTests extends TestCase { public static class FooX implements FooIfc { + @Override public String getName() { return "Rob Harrop"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java index 6aa94facb25..968b955a477 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java @@ -23,6 +23,7 @@ import org.springframework.jmx.export.metadata.JmxAttributeSource; */ public abstract class AbstractMetadataAssemblerAutodetectTests extends AbstractAutodetectTests { + @Override protected AutodetectCapableMBeanInfoAssembler getAssembler() { MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler(); assembler.setAttributeSource(getAttributeSource()); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index 93735097c67..15e5812236b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -204,12 +204,15 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble assertNull("Metric Category should not be populated", desc.getFieldValue("metricCategory")); } + @Override protected abstract String getObjectName(); + @Override protected int getExpectedAttributeCount() { return 6; } + @Override protected int getExpectedOperationCount() { return 9; } @@ -218,6 +221,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble return new JmxTestBean(); } + @Override protected MBeanInfoAssembler getAssembler() { MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler(); assembler.setAttributeSource(getAttributeSource()); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index 4be8a6cc92f..27beb0b470f 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -26,18 +26,22 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse protected static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 5; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { InterfaceBasedMBeanInfoAssembler assembler = new InterfaceBasedMBeanInfoAssembler(); assembler.setManagedInterfaces(new Class[] {ICustomJmxBean.class}); @@ -52,6 +56,7 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse assertFalse(attr.isWritable()); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index a0681cc398a..0ada6be5756 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -75,24 +75,29 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse assertNickName(attr); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { return getWithMapping( "org.springframework.jmx.export.assembler.IAdditionalTestMethods, " + "org.springframework.jmx.export.assembler.ICustomJmxBean"); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java index 6d8266b4aca..cfe72619900 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java @@ -21,22 +21,27 @@ package org.springframework.jmx.export.assembler; */ public class InterfaceBasedMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { + @Override protected String getObjectName() { return "bean:name=testBean4"; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { return new InterfaceBasedMBeanInfoAssembler(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java index 73d4fb56f51..53629c55bb6 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java @@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerComboTests extends AbstractJmxAsse assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java index a3f11f9fef6..2015cbbece8 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java @@ -44,22 +44,27 @@ public class MethodExclusionMBeanInfoAssemblerMappedTests extends AbstractJmxAss assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java index c19ef5969da..9cb85d799d1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java @@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerNotMappedTests extends AbstractJmx assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 11; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java index 2370488f80c..e13a4ff2aff 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java @@ -33,22 +33,27 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler private static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 9; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssembler.xml"; } + @Override protected MBeanInfoAssembler getAssembler() { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); assembler.setIgnoredMethods(new String[] {"dontExposeMe", "setSuperman"}); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java index 496c3d7c9fc..b7741897e70 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java @@ -54,22 +54,27 @@ public class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAss assertNickName(attr); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { return getWithMapping("getNickName,setNickName,add,myOperation,getName,setName,getAge"); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java index 28cc9f5b535..1ae6c75130a 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java @@ -26,18 +26,22 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler protected static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 5; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { MethodNameBasedMBeanInfoAssembler assembler = new MethodNameBasedMBeanInfoAssembler(); assembler.setManagedMethods(new String[] {"add", "myOperation", "getName", "setName", "getAge"}); @@ -52,6 +56,7 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler assertFalse(attr.isWritable()); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodNameAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java index 91f97e0a1dd..5e0a4bf9849 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java @@ -26,22 +26,27 @@ public class ReflectiveAssemblerTests extends AbstractJmxAssemblerTests { protected static final String OBJECT_NAME = "bean:name=testBean1"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 11; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected MBeanInfoAssembler getAssembler() { return new SimpleReflectiveMBeanInfoAssembler(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/reflectiveAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java index c98f88489f8..28696ff1a16 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java @@ -23,18 +23,22 @@ public class KeyNamingStrategyTests extends AbstractNamingStrategyTests { private static final String OBJECT_NAME = "spring:name=test"; + @Override protected ObjectNamingStrategy getStrategy() throws Exception { return new KeyNamingStrategy(); } + @Override protected Object getManagedResource() { return new Object(); } + @Override protected String getKey() { return OBJECT_NAME; } + @Override protected String getCorrectObjectName() { return OBJECT_NAME; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java index 9772ff4ae46..4b0e1a39207 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java @@ -23,6 +23,7 @@ import org.springframework.core.io.ClassPathResource; */ public class PropertiesFileNamingStrategyTests extends PropertiesNamingStrategyTests { + @Override protected ObjectNamingStrategy getStrategy() throws Exception { KeyNamingStrategy strat = new KeyNamingStrategy(); strat.setMappingLocation(new ClassPathResource("jmx-names.properties", getClass())); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java index fefc10ffc88..4c474100a79 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java @@ -26,6 +26,7 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests { private static final String OBJECT_NAME = "bean:name=namingTest"; + @Override protected ObjectNamingStrategy getStrategy() throws Exception { KeyNamingStrategy strat = new KeyNamingStrategy(); Properties mappings = new Properties(); @@ -35,14 +36,17 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests { return strat; } + @Override protected Object getManagedResource() { return new Object(); } + @Override protected String getKey() { return "namingTest"; } + @Override protected String getCorrectObjectName() { return OBJECT_NAME; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 6f9ab8e724a..cfffabaead9 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -113,10 +113,12 @@ public final class ModelMBeanNotificationPublisherTests { return this.actualNotification; } + @Override public void sendNotification(Notification notification) throws RuntimeOperationsException { this.actualNotification = notification; } + @Override public void sendAttributeChangeNotification(AttributeChangeNotification notification) throws RuntimeOperationsException { this.actualNotification = notification; } diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java index b72082cef14..333d2e5f27c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java @@ -151,28 +151,35 @@ public class JmxUtilsTests extends TestCase { super(IJmxTestBean.class); } + @Override public int add(int x, int y) { return 0; } + @Override public long myOperation() { return 0; } + @Override public int getAge() { return 0; } + @Override public void setAge(int age) { } + @Override public void setName(String name) { } + @Override public String getName() { return null; } + @Override public void dontExposeMe() { } } @@ -186,6 +193,7 @@ public class JmxUtilsTests extends TestCase { public static class Foo implements FooMBean { + @Override public String getName() { return "Rob Harrop"; } @@ -200,6 +208,7 @@ public class JmxUtilsTests extends TestCase { public static class FooX implements FooMXBean { + @Override public String getName() { return "Rob Harrop"; } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index 5acfff76088..fbc8e6221ee 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -233,6 +233,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -259,6 +260,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -287,6 +289,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -386,6 +389,7 @@ public class JndiObjectFactoryBeanTests { expectLastCall().times(2); replay(mockCtx); jof.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockCtx; } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java index 4d658bc2cf7..f4fbd094534 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -42,6 +42,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -62,6 +63,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -86,6 +88,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -111,6 +114,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -136,6 +140,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -155,6 +160,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -173,6 +179,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } 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 bc635f183da..3851c6bbee3 100644 --- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java @@ -219,38 +219,47 @@ public class SimpleNamingContextTests { class StubDataSource implements DataSource { + @Override public Connection getConnection() throws SQLException { return null; } + @Override public Connection getConnection(String username, String password) throws SQLException { return null; } + @Override public PrintWriter getLogWriter() throws SQLException { return null; } + @Override public int getLoginTimeout() throws SQLException { return 0; } + @Override public void setLogWriter(PrintWriter arg0) throws SQLException { } + @Override public void setLoginTimeout(int arg0) throws SQLException { } + @Override public boolean isWrapperFor(Class arg0) throws SQLException { return false; } + @Override public T unwrap(Class arg0) throws SQLException { return null; } + @Override public Logger getParentLogger() { return null; } diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java index dbb46d53859..c92f3d0aca0 100644 --- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java +++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java @@ -322,18 +322,23 @@ public class RmiSupportTests extends TestCase { final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class[] {String.class}); MethodInvocation mi = new MethodInvocation() { + @Override public Method getMethod() { return setNameMethod; } + @Override public Object[] getArguments() { return new Object[] {"bla"}; } + @Override public Object proceed() throws Throwable { throw new UnsupportedOperationException(); } + @Override public Object getThis() { return rb; } + @Override public AccessibleObject getStaticPart() { return setNameMethod; } @@ -363,11 +368,14 @@ public class RmiSupportTests extends TestCase { public void testRmiInvokerWithSpecialLocalMethods() throws Exception { String serviceUrl = "rmi://localhost:1090/test"; RmiProxyFactoryBean factory = new RmiProxyFactoryBean() { + @Override protected Remote lookupStub() { return new RmiInvocationHandler() { + @Override public String getTargetInterfaceName() { return null; } + @Override public Object invoke(RemoteInvocation invocation) throws RemoteException { throw new RemoteException(); } @@ -400,6 +408,7 @@ public class RmiSupportTests extends TestCase { private int counter = 0; + @Override protected Remote lookupStub() { counter++; return new RemoteBean(); @@ -432,6 +441,7 @@ public class RmiSupportTests extends TestCase { private static String name; + @Override public void setName(String nam) throws RemoteException { if (nam != null && nam.endsWith("Exception")) { RemoteException rex = null; diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java index be6ef187d25..e52582125a1 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java @@ -116,16 +116,19 @@ public class AsyncAnnotationBeanPostProcessorTests { private final CountDownLatch latch = new CountDownLatch(1); + @Override public Thread getThread() { return this.thread; } + @Override @Async public void test() { this.thread = Thread.currentThread(); this.latch.countDown(); } + @Override public void await(long timeout) { try { this.latch.await(timeout, TimeUnit.MILLISECONDS); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java index f5f0aca4357..a0985345de8 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java @@ -248,10 +248,12 @@ public class AsyncExecutionTests { public static class AsyncInterfaceBean implements AsyncInterface { + @Override public void doSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); } + @Override public Future returnSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); return new AsyncResult(Integer.toString(i)); @@ -273,14 +275,17 @@ public class AsyncExecutionTests { public static class AsyncMethodsInterfaceBean implements AsyncMethodsInterface { + @Override public void doNothing(int i) { assertTrue(Thread.currentThread().getName().equals(originalThreadName)); } + @Override public void doSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); } + @Override public Future returnSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); return new AsyncResult(Integer.toString(i)); @@ -290,6 +295,7 @@ public class AsyncExecutionTests { public static class AsyncMethodListener implements ApplicationListener { + @Override @Async public void onApplicationEvent(ApplicationEvent event) { listenerCalled++; @@ -305,6 +311,7 @@ public class AsyncExecutionTests { listenerConstructed++; } + @Override public void onApplicationEvent(ApplicationEvent event) { listenerCalled++; assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java index e96c31f7395..3b3329e0d95 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java @@ -247,6 +247,7 @@ public class EnableAsyncTests { return new AsyncBean(); } + @Override public Executor getAsyncExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setThreadNamePrefix("Custom-"); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java index 9cab4804834..349c6ec3870 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java @@ -216,6 +216,7 @@ public class EnableSchedulingTests { return null; } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler1()); } @@ -318,6 +319,7 @@ public class EnableSchedulingTests { return new ThreadAwareWorker(); } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler2()); } @@ -378,6 +380,7 @@ public class EnableSchedulingTests { return scheduler; } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler2()); } @@ -410,10 +413,12 @@ public class EnableSchedulingTests { return new ThreadPoolTaskScheduler(); } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler()); taskRegistrar.addFixedRateTask(new IntervalTask( new Runnable() { + @Override public void run() { worker().executedByThread = Thread.currentThread().getName(); } @@ -449,11 +454,13 @@ public class EnableSchedulingTests { scheduler.initialize(); scheduler.schedule( new Runnable() { + @Override public void run() { counter().incrementAndGet(); } }, new Trigger() { + @Override public Date nextExecutionTime(TriggerContext triggerContext) { return new Date(new Date().getTime()+10); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 0b0f791cc54..08825992187 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -65,6 +65,7 @@ public class ScheduledExecutorFactoryBeanTests { mockScheduledExecutorService.replay(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { return executor; } @@ -88,6 +89,7 @@ public class ScheduledExecutorFactoryBeanTests { mockScheduledExecutorService.replay(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { return executor; } @@ -233,6 +235,7 @@ public class ScheduledExecutorFactoryBeanTests { @SuppressWarnings("serial") public void testSettingThreadFactoryToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { assertNotNull("Bah; the setThreadFactory(..) method must use a default ThreadFactory if a null arg is passed in."); return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler); @@ -250,6 +253,7 @@ public class ScheduledExecutorFactoryBeanTests { @SuppressWarnings("serial") public void testSettingRejectedExecutionHandlerToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { assertNotNull("Bah; the setRejectedExecutionHandler(..) method must use a default RejectedExecutionHandler if a null arg is passed in."); return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler); diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java index 7d3b05f6319..c17d9f27faa 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java @@ -239,6 +239,7 @@ public class ThreadPoolTaskSchedulerTests { this.latch = new CountDownLatch(expectedRunCount); } + @Override public void run() { lastThread = Thread.currentThread(); if (actualRunCount.incrementAndGet() > expectedRunCount) { @@ -259,6 +260,7 @@ public class ThreadPoolTaskSchedulerTests { this.expectedRunCount = expectedRunCount; } + @Override public String call() throws Exception { if (actualRunCount.incrementAndGet() > expectedRunCount) { throw new RuntimeException("intentional test failure"); @@ -278,6 +280,7 @@ public class ThreadPoolTaskSchedulerTests { this.latch = new CountDownLatch(expectedErrorCount); } + @Override public void handleError(Throwable t) { this.lastError = t; this.latch.countDown(); @@ -295,6 +298,7 @@ public class ThreadPoolTaskSchedulerTests { this.maxRunCount = maxRunCount; } + @Override public Date nextExecutionTime(TriggerContext triggerContext) { if (this.actualRunCount.incrementAndGet() > this.maxRunCount) { return null; diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java index 3425f60db59..6c32a85bd08 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java @@ -56,6 +56,7 @@ public class ExecutorBeanDefinitionParserTests { assertEquals(60, getKeepAliveSeconds(executor)); assertEquals(false, getAllowCoreThreadTimeOut(executor)); FutureTask task = new FutureTask(new Callable() { + @Override public String call() throws Exception { return "foo"; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java index 921a5c4e117..697c747d337 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java @@ -123,6 +123,7 @@ public class ScheduledTasksBeanDefinitionParserTests { static class TestTrigger implements Trigger { + @Override public Date nextExecutionTime(TriggerContext triggerContext) { return null; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java index c0faca5e685..8e045073255 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java @@ -254,14 +254,17 @@ public class PeriodicTriggerTests { this.completion = completion; } + @Override public Date lastActualExecutionTime() { return this.actual; } + @Override public Date lastCompletionTime() { return this.completion; } + @Override public Date lastScheduledExecutionTime() { return this.scheduled; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 2659b23576b..5d210b344ae 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -50,27 +50,32 @@ public class TimerSupportTests extends TestCase { final List success = new ArrayList(3); final Timer timer = new Timer(true) { + @Override public void schedule(TimerTask task, long delay, long period) { if (task == timerTask0 && delay == 0 && period == 10) { success.add(Boolean.TRUE); } } + @Override public void scheduleAtFixedRate(TimerTask task, long delay, long period) { if (task == timerTask1 && delay == 10 && period == 20) { success.add(Boolean.TRUE); } } + @Override public void schedule(TimerTask task, long delay) { if (task instanceof DelegatingTimerTask && delay == 20) { success.add(Boolean.TRUE); } } + @Override public void cancel() { success.add(Boolean.TRUE); } }; TimerFactoryBean timerFactoryBean = new TimerFactoryBean() { + @Override protected Timer createTimer(String name, boolean daemon) { return timer; } @@ -104,6 +109,7 @@ public class TimerSupportTests extends TestCase { private int counter = 0; + @Override public void run() { counter++; } @@ -114,6 +120,7 @@ public class TimerSupportTests extends TestCase { private int counter = 0; + @Override public void run() { counter++; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java index 0655210a429..4632e4852c7 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java @@ -96,6 +96,7 @@ public final class TimerTaskExecutorTests { TimerTaskExecutor executor = new TimerTaskExecutor() { + @Override protected Timer createTimer() { return timer; } @@ -129,6 +130,7 @@ public final class TimerTaskExecutorTests { return this.createTimerWasCalled; } + @Override protected Timer createTimer() { this.createTimerWasCalled = true; return super.createTimer(); @@ -146,6 +148,7 @@ public final class TimerTaskExecutorTests { } + @Override public void cancel() { this.cancelWasCalled = true; super.cancel(); @@ -166,6 +169,7 @@ public final class TimerTaskExecutorTests { } + @Override public void run() { this.runWasCalled = true; synchronized (monitor) { @@ -176,6 +180,7 @@ public final class TimerTaskExecutorTests { private static final class NoOpRunnable implements Runnable { + @Override public void run() { // explicit no-op } diff --git a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java index 4a542c0c6e4..f00e5148039 100644 --- a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java +++ b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java @@ -21,14 +21,17 @@ package org.springframework.scripting.config; */ public class OtherTestBean implements ITestBean { + @Override public ITestBean getOtherBean() { return null; } + @Override public boolean isInitialized() { return false; } + @Override public boolean isDestroyed() { return false; } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java index 6aab4f5df39..4f55dc01f8a 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java @@ -26,10 +26,12 @@ public class ConcreteMessenger implements ConfigurableMessenger { private String message; + @Override public String getMessage() { return message; } + @Override public void setMessage(String message) { this.message = message; } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index 763827a05a0..f142c6bcc18 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -478,8 +478,10 @@ public class GroovyScriptFactoryTests { public static class TestCustomizer implements GroovyObjectCustomizer { + @Override public void customize(GroovyObject goo) { DelegatingMetaClass dmc = new DelegatingMetaClass(goo.getMetaClass()) { + @Override public Object invokeMethod(Object arg0, String mName, Object[] arg2) { if (mName.indexOf("Missing") != -1) { throw new IllegalStateException("Gotcha"); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java index a7066c828c0..28330777f3f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java @@ -11,6 +11,7 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice { private int countThrows = 0; + @Override public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; System.out.println("Method:"+method.getName()); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java index 749fc42fdef..ed90507212d 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java @@ -2,6 +2,7 @@ package org.springframework.scripting.groovy; @Log public class TestServiceImpl implements TestService{ + @Override public String sayHello() { throw new TestException("TestServiceImpl"); } diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java index cc7e1ce392f..f2899f520e8 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java @@ -278,6 +278,7 @@ public class JRubyScriptFactoryTests extends TestCase { public int count; + @Override public String getContent() { this.count++; return "Hello World!"; diff --git a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java index 3a4ffb70436..d67f8d47b75 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java @@ -25,10 +25,12 @@ public final class StubMessenger implements ConfigurableMessenger { private String message = "I used to be smart... now I'm just stupid."; + @Override public void setMessage(String message) { this.message = message; } + @Override public String getMessage() { return message; } diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index 336fe78e678..30835d1dff6 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -278,6 +278,7 @@ public final class ModelMapTests { getClass().getClassLoader(), new Class[] {Map.class}, new InvocationHandler() { + @Override public Object invoke(Object proxy, Method method, Object[] args) { return "proxy"; } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java index b1ba9804d28..7d00f311843 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java @@ -115,9 +115,11 @@ public class DataBinderFieldAccessTests extends TestCase { DataBinder binder = new DataBinder(rod, "person"); binder.initDirectFieldAccess(); binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 0)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index e85cf9a6234..ac5b020c9d7 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -254,17 +254,21 @@ public class DataBinderTests extends TestCase { TestBean rod = new TestBean(); DataBinder binder = new DataBinder(rod, "person"); binder.registerCustomEditor(String.class, "touchy", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix_" + text); } + @Override public String getAsText() { return getValue().toString().substring(7); } }); binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 0)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -381,9 +385,11 @@ public class DataBinderTests extends TestCase { FormattingConversionService conversionService = new FormattingConversionService(); DefaultConversionService.addDefaultConverters(conversionService); conversionService.addFormatterForFieldType(String.class, new Formatter() { + @Override public String parse(String text, Locale locale) throws ParseException { throw new ParseException(text, 0); } + @Override public String print(String object, Locale locale) { return object; } @@ -669,6 +675,7 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } @@ -689,9 +696,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(6); } @@ -725,9 +734,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(int.class, "age", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new Integer(99)); } + @Override public String getAsText() { return "argh"; } @@ -746,9 +757,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(6); } @@ -775,6 +788,7 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (getValue() == null || !text.equalsIgnoreCase(getValue().toString())) { setValue(text); @@ -1053,6 +1067,7 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(Set.class, new CustomCollectionEditor(TreeSet.class) { + @Override protected Object convertElement(Object element) { return new Integer(element.toString()); } @@ -1091,6 +1106,7 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } @@ -1130,6 +1146,7 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } @@ -1166,9 +1183,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1189,9 +1208,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array[0].nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1212,9 +1233,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1233,11 +1256,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1283,11 +1308,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "map[key0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1311,11 +1338,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1339,11 +1368,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1370,6 +1401,7 @@ public class DataBinderTests extends TestCase { TestBean tb = new TestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String[].class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(StringUtils.delimitedListToStringArray(text, "-")); } @@ -1387,6 +1419,7 @@ public class DataBinderTests extends TestCase { TestBean tb = new TestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("X" + text); } @@ -1647,10 +1680,12 @@ public class DataBinderTests extends TestCase { private static class TestBeanValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb.getAge() < 32) { @@ -1674,10 +1709,12 @@ public class DataBinderTests extends TestCase { private static class SpouseValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb == null || "XXX".equals(tb.getName())) { @@ -1703,6 +1740,7 @@ public class DataBinderTests extends TestCase { return list; } + @Override public E get(int index) { if (index >= list.size()) { for (int i = list.size(); i < index; i++) { @@ -1716,50 +1754,62 @@ public class DataBinderTests extends TestCase { } } + @Override public int size() { return list.size(); } + @Override public boolean add(E o) { return list.add(o); } + @Override public void add(int index, E element) { list.add(index, element); } + @Override public boolean addAll(int index, Collection c) { return list.addAll(index, c); } + @Override public void clear() { list.clear(); } + @Override public int indexOf(Object o) { return list.indexOf(o); } + @Override public Iterator iterator() { return list.iterator(); } + @Override public int lastIndexOf(Object o) { return list.lastIndexOf(o); } + @Override public ListIterator listIterator() { return list.listIterator(); } + @Override public ListIterator listIterator(int index) { return list.listIterator(index); } + @Override public E remove(int index) { return list.remove(index); } + @Override public E set(int index, E element) { return list.set(index, element); } diff --git a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java index db86c2384d0..d5e094a2e1f 100644 --- a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java @@ -146,6 +146,7 @@ public class DefaultMessageCodesResolverTests { @Test public void shouldSupportCustomFormat() throws Exception { resolver.setMessageCodeFormatter(new MessageCodeFormatter() { + @Override public String format(String errorCode, String objectName, String field) { return DefaultMessageCodesResolver.Format.toDelimitedString( "CUSTOM-" + errorCode, objectName, field); diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java index 4ab4f448f4c..48a9b9bfe9b 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java @@ -161,10 +161,12 @@ public class ValidationUtilsTests { private static class EmptyValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { ValidationUtils.rejectIfEmpty(errors, "name", "EMPTY", "You must enter a name!"); } @@ -173,10 +175,12 @@ public class ValidationUtilsTests { private static class EmptyOrWhitespaceValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "EMPTY_OR_WHITESPACE", "You must enter a name!"); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java index ce29597e0c7..43ac003895e 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java @@ -84,6 +84,7 @@ public class MethodValidationTests { @MyStereotype public static class MyValidBean implements MyValidInterface { + @Override public Object myValidMethod(String arg1, int arg2) { return (arg2 == 0 ? null : "value"); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java index 41f500d93ef..5c2dad22a4b 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java @@ -273,9 +273,11 @@ public class ValidatorFactoryTests { public static class NameAddressValidator implements ConstraintValidator { + @Override public void initialize(NameAddressValid constraintAnnotation) { } + @Override public boolean isValid(ValidPerson value, ConstraintValidatorContext constraintValidatorContext) { return (value.name == null || !value.address.street.contains(value.name)); } diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java index 2e9aaa5a15b..fe373ecc7e8 100644 --- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice; @SuppressWarnings("serial") public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice { + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java index 3dc49faf24f..89fc45aeb5e 100644 --- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java index 47fb82e40bc..b3d562e65fa 100644 --- a/spring-context/src/test/java/test/aspect/PerTargetAspect.java +++ b/spring-context/src/test/java/test/aspect/PerTargetAspect.java @@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java index b047ae29c0c..2f63f3cbfe5 100644 --- a/spring-context/src/test/java/test/beans/CustomScope.java +++ b/spring-context/src/test/java/test/beans/CustomScope.java @@ -33,6 +33,7 @@ public class CustomScope implements Scope { private Map beans = new HashMap(); + @Override public Object get(String name, ObjectFactory objectFactory) { if (createNewScope) { beans.clear(); @@ -50,18 +51,22 @@ public class CustomScope implements Scope { return beans.get(name); } + @Override public String getConversationId() { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { // do nothing } + @Override public Object remove(String name) { return beans.remove(name); } + @Override public Object resolveContextualObject(String key) { return null; } diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java index 2a37c6b8c1c..70736e816e7 100644 --- a/spring-context/src/test/java/test/beans/NestedTestBean.java +++ b/spring-context/src/test/java/test/beans/NestedTestBean.java @@ -36,6 +36,7 @@ public class NestedTestBean implements INestedTestBean { this.company = ((company != null) ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java index c528573e4df..4e6489e168c 100644 --- a/spring-context/src/test/java/test/beans/TestBean.java +++ b/spring-context/src/test/java/test/beans/TestBean.java @@ -120,6 +120,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -128,6 +129,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -144,10 +146,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -160,10 +164,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.sex = sex; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -176,10 +182,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return spouse; } + @Override public void setSpouse(ITestBean spouse) { this.spouse = spouse; } @@ -280,10 +288,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -320,6 +330,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -347,12 +358,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } @@ -360,6 +373,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -367,9 +381,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -401,6 +417,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if ((this.name != null) && (other instanceof TestBean)) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java index 79158e74ea4..ccda8189944 100644 --- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java @@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java index 3b8350e4c83..cec29e27498 100644 --- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; } diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java index 83761c2d3c2..038d1cc6af1 100644 --- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java @@ -37,6 +37,7 @@ public class TimestampIntroductionInterceptor extends DelegatingIntroductionInte this.ts = ts; } + @Override public long getTimeStamp() { return ts; } diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java index 2510395bf6c..ec739f29eed 100644 --- a/spring-context/src/test/java/test/mixin/DefaultLockable.java +++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java @@ -26,14 +26,17 @@ public class DefaultLockable implements Lockable { private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } + @Override public boolean locked() { return this.locked; } diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java index b038bff1fdc..5894f97a9be 100644 --- a/spring-context/src/test/java/test/mixin/LockMixin.java +++ b/spring-context/src/test/java/test/mixin/LockMixin.java @@ -34,10 +34,12 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock /** This field demonstrates additional state in the mixin */ private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } @@ -45,6 +47,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock /** * @see test.mixin.AopProxyTests.Lockable#locked() */ + @Override public boolean locked() { return this.locked; } @@ -56,6 +59,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock * Lockable(this) then target behaviour. * @see org.aopalliance.MethodInterceptor#invoke(org.aopalliance.MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (locked() && invocation.getMethod().getName().indexOf("set") == 0) throw new LockedException(); diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java index c4681d4f4ca..497400a7afd 100644 --- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -48,12 +48,14 @@ public class DerivedTestBean extends TestBean implements Serializable { } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -72,10 +74,12 @@ public class DerivedTestBean extends TestBean implements Serializable { } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java index 2e08e2c034d..3fef4caba0f 100644 --- a/spring-core/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/TestBean.java @@ -148,10 +148,12 @@ public class TestBean implements ITestBean, IOther, Comparable { return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -167,10 +169,12 @@ public class TestBean implements ITestBean, IOther, Comparable { } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -183,14 +187,17 @@ public class TestBean implements ITestBean, IOther, Comparable { this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -217,10 +224,12 @@ public class TestBean implements ITestBean, IOther, Comparable { this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -289,6 +298,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -297,6 +307,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -329,6 +340,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -357,18 +369,21 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -376,9 +391,11 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -408,6 +425,7 @@ public class TestBean implements ITestBean, IOther, Comparable { return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java index 03a192119d0..e14e03181e5 100644 --- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java +++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java @@ -32,6 +32,7 @@ public class AttributeAccessorSupportTests extends TestCase { private AttributeAccessor attributeAccessor; + @Override @SuppressWarnings("serial") protected void setUp() throws Exception { this.attributeAccessor = new AttributeAccessorSupport() { @@ -64,6 +65,7 @@ public class AttributeAccessorSupportTests extends TestCase { assertTrue(Arrays.binarySearch(attributeNames, NAME) > -1); assertTrue(Arrays.binarySearch(attributeNames, "abc") > -1); } + @Override protected void tearDown() throws Exception { this.attributeAccessor.removeAttribute(NAME); } diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 98c4a543148..d1f09e0576f 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -356,9 +356,11 @@ public class BridgeMethodResolverTests { public void someMethod(Integer theArg, Object otherArg) { } + @Override public void someMethod(String theArg, Object otherArg) { } + @Override public void someVarargMethod(String theArg, Object... otherArgs) { } } @@ -383,6 +385,7 @@ public class BridgeMethodResolverTests { public static class MyBar extends InterBar { + @Override public void someMethod(String theArg, Object otherArg) { } @@ -399,6 +402,7 @@ public class BridgeMethodResolverTests { public abstract class AbstractDateAdder implements Adder { + @Override public abstract void add(Date date); } @@ -430,6 +434,7 @@ public class BridgeMethodResolverTests { public class ExtendsReallyDeepNow extends ReallyDeepNow { + @Override void someMethod(Integer s, String t, Long r) { throw new UnsupportedOperationException(); } @@ -448,10 +453,12 @@ public class BridgeMethodResolverTests { public class MyBoo implements Boo { + @Override public void foo(String e) { throw new UnsupportedOperationException(); } + @Override public void foo(Integer t) { throw new UnsupportedOperationException(); } @@ -478,12 +485,14 @@ public class BridgeMethodResolverTests { public interface SettingsDao extends Dao { + @Override T load(); } public interface ConcreteSettingsDao extends SettingsDao { + @Override String loadFromParent(); } @@ -500,6 +509,7 @@ public class BridgeMethodResolverTests { } //@Transactional(readOnly = true) + @Override public S loadFromParent() { return otherObject; } @@ -513,6 +523,7 @@ public class BridgeMethodResolverTests { } //@Transactional(readOnly = true) + @Override public ConcreteSettings load() { return super.object; } @@ -527,6 +538,7 @@ public class BridgeMethodResolverTests { private static class AbstractBounded implements Bounded { + @Override public boolean boundedOperation(E myE) { return true; } @@ -535,6 +547,7 @@ public class BridgeMethodResolverTests { private static class SerializableBounded extends AbstractBounded { + @Override public boolean boundedOperation(E myE) { return false; } @@ -549,6 +562,7 @@ public class BridgeMethodResolverTests { private static class StringGenericParameter implements GenericParameter { + @Override public String getFor(Class cls) { return "foo"; } @@ -561,94 +575,117 @@ public class BridgeMethodResolverTests { private static class StringList implements List { + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { throw new UnsupportedOperationException(); } + @Override public boolean contains(Object o) { throw new UnsupportedOperationException(); } + @Override public Iterator iterator() { throw new UnsupportedOperationException(); } + @Override public Object[] toArray() { throw new UnsupportedOperationException(); } + @Override public T[] toArray(T[] a) { throw new UnsupportedOperationException(); } + @Override public boolean add(String o) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); } + @Override public boolean containsAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(int index, Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public String get(int index) { throw new UnsupportedOperationException(); } + @Override public String set(int index, String element) { throw new UnsupportedOperationException(); } + @Override public void add(int index, String element) { throw new UnsupportedOperationException(); } + @Override public String remove(int index) { throw new UnsupportedOperationException(); } + @Override public int indexOf(Object o) { throw new UnsupportedOperationException(); } + @Override public int lastIndexOf(Object o) { throw new UnsupportedOperationException(); } + @Override public ListIterator listIterator() { throw new UnsupportedOperationException(); } + @Override public ListIterator listIterator(int index) { throw new UnsupportedOperationException(); } + @Override public List subList(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); } @@ -665,6 +702,7 @@ public class BridgeMethodResolverTests { private int priority; + @Override public int getPriority() { return priority; } @@ -743,6 +781,7 @@ public class BridgeMethodResolverTests { */ public abstract Receiver getInstance(); + @Override public void setChannel(Channel channel) { this.channel = channel; } @@ -753,10 +792,12 @@ public class BridgeMethodResolverTests { this.beanName = name; } + @Override public void subscribe() { } + @Override public void unsubscribe() { } @@ -800,6 +841,7 @@ public class BridgeMethodResolverTests { super(NewMessageEvent.class); } + @Override public void receive(MessageEvent event) { throw new UnsupportedOperationException("should not be called, use subclassed events"); } @@ -861,6 +903,7 @@ public class BridgeMethodResolverTests { public void setRepos(R... reps) { } + @Override public SimpleGenericRepository getFor(Class entityType) { return null; } @@ -896,40 +939,50 @@ public class BridgeMethodResolverTests { public void setPersistentClass(Class c) { } + @Override public Class getPersistentClass() { return null; } + @Override public T findById(ID id, boolean lock) { return null; } + @Override public List findAll() { return null; } + @Override public List findByExample(T exampleInstance) { return null; } + @Override public List findByQuery() { return null; } + @Override public T saveOrUpdate(T entity) { return null; } + @Override public void delete(T entity) { } + @Override public T refresh(T entity) { return null; } + @Override public void delete(ID id) { } + @Override public void delete(Collection entities) { } } @@ -937,9 +990,11 @@ public class BridgeMethodResolverTests { public class HibernateRepositoryRegistry extends SettableRepositoryRegistry> { + @Override public void injectInto(GenericHibernateRepository rep) { } + @Override public GenericHibernateRepository getFor(Class entityType) { return null; } @@ -958,6 +1013,7 @@ public class BridgeMethodResolverTests { public class MyHomer, L extends T> implements Homer { + @Override public void foo(L t) { throw new UnsupportedOperationException(); } @@ -966,6 +1022,7 @@ public class BridgeMethodResolverTests { public class YourHomer, L extends T> extends MyHomer { + @Override public void foo(L t) { throw new UnsupportedOperationException(); } @@ -984,6 +1041,7 @@ public class BridgeMethodResolverTests { public class GenericSqlMapDao implements ConvenienceGenericDao { + @Override public void saveOrUpdate(T t) { throw new UnsupportedOperationException(); } @@ -992,6 +1050,7 @@ public class BridgeMethodResolverTests { public class GenericSqlMapIntegerDao extends GenericSqlMapDao { + @Override public void saveOrUpdate(T t) { } } @@ -1027,9 +1086,11 @@ public class BridgeMethodResolverTests { public class UserDaoImpl extends AbstractDao implements UserDao { + @Override public void save(Permission perm) { } + @Override public void saveVararg(User user, Object... args) { } } @@ -1053,9 +1114,11 @@ public class BridgeMethodResolverTests { public class BusinessDao extends BusinessGenericDao, Long> { + @Override public void save(Business business) { } + @Override public Business get(Long id) { return null; } @@ -1110,6 +1173,7 @@ public class BridgeMethodResolverTests { throw new UnsupportedOperationException(); } + @Override public void receive(MegaMessageEvent event) { throw new UnsupportedOperationException(); } @@ -1136,6 +1200,7 @@ public class BridgeMethodResolverTests { private static abstract class AbstractImplementsInterface implements IGenericInterface { + @Override public void doSomething(D domainObject, T value) { } @@ -1175,10 +1240,12 @@ public class BridgeMethodResolverTests { private static class DomainObject extends AbstractDomainObject { + @Override public byte[] method1(ParameterType p) { return super.method1(p); } + @Override public void method2(ParameterType p, byte[] r) { super.method2(p, r); } @@ -1215,6 +1282,7 @@ public class BridgeMethodResolverTests { public static class ExternalMessageProvider> implements IExternalMessageProvider { + @Override public Collection findBy(T conditions) { return null; } @@ -1235,6 +1303,7 @@ public class BridgeMethodResolverTests { public static class TestEmailProvider extends EmailMessageProvider { + @Override public Collection findBy(EmailSearchConditions conditions) { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java index ea011aa984d..8f354e82530 100644 --- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java @@ -30,6 +30,7 @@ public class DefaultControlFlowTests extends AbstractControlFlowTests { public void testThisClassPlease() { } + @Override protected ControlFlow createControlFlow() { return ControlFlowFactory.createControlFlow(); } diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java index d86ed5ebb65..1d0b3f75105 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java @@ -36,6 +36,7 @@ import org.springframework.core.io.Resource; */ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests { + @Override protected void setUp() throws Exception { this.targetClass = Foo.class; this.methods = new String[] {"a", "b", "b2", "b3", "c", "d", "d2", "d3", "e", "e2", "e3"}; @@ -44,6 +45,7 @@ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests { Integer.class, Integer.class, Integer.class, Integer.class, Integer.class}; } + @Override protected Type getType(Method method) { return GenericCollectionTypeResolver.getMapValueReturnType(method); } diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java index 281141361ea..8acc0645d35 100644 --- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java @@ -30,6 +30,7 @@ public class Jdk14ControlFlowTests extends AbstractControlFlowTests { public void testThisClassPlease() { } + @Override protected ControlFlow createControlFlow() { return ControlFlowFactory.createControlFlow(); } diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java index 9c9d515bab6..602000ac7ce 100644 --- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java @@ -30,6 +30,7 @@ public final class OrderComparatorTests extends TestCase { private Comparator comparator; + @Override protected void setUp() throws Exception { this.comparator = new OrderComparator(); } @@ -64,6 +65,7 @@ public final class OrderComparatorTests extends TestCase { this.order = order; } + @Override public int getOrder() { return this.order; } diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java index b5480482e4b..3cf0875625a 100644 --- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java @@ -31,18 +31,22 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase { private static final String[] SOMETHING_ELSE = new String[] { "something", "else" }; ParameterNameDiscoverer returnsFooBar = new ParameterNameDiscoverer() { + @Override public String[] getParameterNames(Method m) { return FOO_BAR; } + @Override public String[] getParameterNames(Constructor ctor) { return FOO_BAR; } }; ParameterNameDiscoverer returnsSomethingElse = new ParameterNameDiscoverer() { + @Override public String[] getParameterNames(Method m) { return SOMETHING_ELSE; } + @Override public String[] getParameterNames(Constructor ctor) { return SOMETHING_ELSE; } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java index b02c6c3aaa1..0c5d88f3343 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java @@ -258,6 +258,7 @@ public class AnnotationUtilsTests { } + @Override public void fromInterfaceImplementedByRoot() { } @@ -290,6 +291,7 @@ public class AnnotationUtilsTests { public static class SimpleFoo extends Foo { + @Override @Transactional public void something(final String arg) { @@ -339,12 +341,14 @@ public class AnnotationUtilsTests { public static class ImplementsInterfaceWithAnnotatedMethod implements InterfaceWithAnnotatedMethod { + @Override public void foo() { } } public static class SubOfImplementsInterfaceWithAnnotatedMethod extends ImplementsInterfaceWithAnnotatedMethod { + @Override public void foo() { } } @@ -354,6 +358,7 @@ public class AnnotationUtilsTests { public static class SubOfAbstractImplementsInterfaceWithAnnotatedMethod extends AbstractDoesNotImplementInterfaceWithAnnotatedMethod { + @Override public void foo() { } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java index 21d87d9b15e..90e2bf893b6 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java @@ -255,34 +255,42 @@ public class TypeDescriptorTests { public class IntegerType implements GenericType { + @Override public Integer getProperty() { return null; } + @Override public void setProperty(Integer t) { } + @Override public List getListProperty() { return null; } + @Override public void setListProperty(List t) { } } public class NumberType implements GenericType { + @Override public Integer getProperty() { return null; } + @Override public void setProperty(Number t) { } + @Override public List getListProperty() { return null; } + @Override public void setListProperty(List t) { } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java index 500fd9c0e51..4cadfe7406f 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java @@ -120,6 +120,7 @@ public class ConvertingComparatorTests { private static class StringToInteger implements Converter { + @Override public Integer convert(String source) { return new Integer(source); } @@ -131,6 +132,7 @@ public class ConvertingComparatorTests { private boolean called; + @Override public int compare(Integer o1, Integer o2) { assertThat(o1, instanceOf(Integer.class)); assertThat(o2, instanceOf(Integer.class)); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 6c16ee75a35..96f3fc71df9 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -223,50 +223,62 @@ public class CollectionToCollectionConverterTests { public static abstract class BaseResource implements Resource { + @Override public InputStream getInputStream() throws IOException { return null; } + @Override public boolean exists() { return false; } + @Override public boolean isReadable() { return false; } + @Override public boolean isOpen() { return false; } + @Override public URL getURL() throws IOException { return null; } + @Override public URI getURI() throws IOException { return null; } + @Override public File getFile() throws IOException { return null; } + @Override public long contentLength() throws IOException { return 0; } + @Override public long lastModified() throws IOException { return 0; } + @Override public Resource createRelative(String relativePath) throws IOException { return null; } + @Override public String getFilename() { return null; } + @Override public String getDescription() { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index c0495b52137..38f3c835e50 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -307,6 +307,7 @@ public class DefaultConversionTests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index b5ede248edf..41333498ba9 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -143,6 +143,7 @@ public class GenericConversionServiceTests { public void addConverterNoSourceTargetClassInfoAvailable() { try { conversionService.addConverter(new Converter() { + @Override public Object convert(Object source) { return source; } @@ -201,6 +202,7 @@ public class GenericConversionServiceTests { @Test public void convertSuperSourceType() { conversionService.addConverter(new Converter() { + @Override public Integer convert(CharSequence source) { return Integer.valueOf(source.toString()); } @@ -218,6 +220,7 @@ public class GenericConversionServiceTests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } @@ -503,6 +506,7 @@ public class GenericConversionServiceTests { private static class MyBaseInterfaceConverter implements Converter { + @Override public String convert(MyBaseInterface source) { return "RESULT"; } @@ -511,6 +515,7 @@ public class GenericConversionServiceTests { private static class MyStringArrayToResourceArrayConverter implements Converter { + @Override public Resource[] convert(String[] source) { Resource[] result = new Resource[source.length]; for (int i = 0; i < source.length; i++) { @@ -523,6 +528,7 @@ public class GenericConversionServiceTests { private static class MyStringArrayToIntegerArrayConverter implements Converter { + @Override public Integer[] convert(String[] source) { Integer[] result = new Integer[source.length]; for (int i = 0; i < source.length; i++) { @@ -535,6 +541,7 @@ public class GenericConversionServiceTests { private static class MyStringToIntegerArrayConverter implements Converter { + @Override public Integer[] convert(String source) { String[] srcArray = StringUtils.commaDelimitedListToStringArray(source); Integer[] result = new Integer[srcArray.length]; @@ -673,10 +680,12 @@ public class GenericConversionServiceTests { GenericConversionService conversionService = new GenericConversionService(); GenericConverter converter = new GenericConverter() { + @Override public Set getConvertibleTypes() { return null; } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return null; @@ -716,6 +725,7 @@ public class GenericConversionServiceTests { public void convertCannotOptimizeArray() throws Exception { GenericConversionService conversionService = new GenericConversionService(); conversionService.addConverter(new Converter() { + @Override public Byte convert(Byte source) { return (byte) (source + 1); } @@ -764,11 +774,13 @@ public class GenericConversionServiceTests { private int matchAttempts = 0; + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { matchAttempts++; return false; } + @Override public Color convert(String source) { throw new IllegalStateException(); } @@ -783,15 +795,18 @@ public class GenericConversionServiceTests { private List sourceTypes = new ArrayList(); + @Override public Set getConvertibleTypes() { return null; } + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { sourceTypes.add(sourceType); return false; } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return null; @@ -809,11 +824,13 @@ public class GenericConversionServiceTests { private int matchAttempts = 0; + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { matchAttempts++; return true; } + @Override @SuppressWarnings("unchecked") public Converter getConverter(Class targetType) { return (Converter) converter; @@ -834,6 +851,7 @@ public class GenericConversionServiceTests { public static enum MyEnum implements MyEnumInterface { A { + @Override public String getCode() { return "1"; } @@ -842,6 +860,7 @@ public class GenericConversionServiceTests { private static class MyEnumInterfaceToStringConverter implements Converter { + @Override public String convert(T source) { return source.getCode(); } diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java index f3d6258fbb7..c9f0eae2a50 100644 --- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java +++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java @@ -136,6 +136,7 @@ public class LabeledEnumTests extends TestCase { public static final Dog GOLDEN_RETRIEVER = new Dog(11, null) { + @Override public String getLabel() { return "Golden Retriever"; } @@ -143,6 +144,7 @@ public class LabeledEnumTests extends TestCase { // Overriding getType() is no longer necessary as of Spring 2.5; // however, this is left here to provide valid testing for // backwards compatibility. + @Override public Class getType() { return Dog.class; } @@ -165,12 +167,14 @@ public class LabeledEnumTests extends TestCase { private static abstract class ValuedEnum extends StaticLabeledEnum { public static final ValuedEnum ONE = new ValuedEnum(1, "one") { + @Override public int getValue() { return 1; } }; public static final ValuedEnum TWO = new ValuedEnum(2, "two") { + @Override public int getValue() { return 2; } diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java index 469795437cb..2da1da51647 100644 --- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java @@ -186,9 +186,11 @@ public class ResourceTests { final String name = "test-resource"; Resource resource = new AbstractResource() { + @Override public String getDescription() { return name; } + @Override public InputStream getInputStream() { return null; } @@ -222,9 +224,11 @@ public class ResourceTests { @Test public void testContentLength() throws IOException { AbstractResource resource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' }); } + @Override public String getDescription() { return null; } @@ -235,9 +239,11 @@ public class ResourceTests { @Test(expected=IllegalStateException.class) public void testContentLength_withNullInputStream() throws IOException { AbstractResource resource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { return null; } + @Override public String getDescription() { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java index d1b6fa034df..11dd7ebf486 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java @@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order; @Order(1) public class MyDummyFactory1 implements DummyFactory { + @Override public String getString() { return "Foo"; } diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java index 4872d0053ee..5105c6b47ea 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java @@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order; @Order(2) public class MyDummyFactory2 implements DummyFactory { + @Override public String getString() { return "Bar"; } diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java index f8db4e7fd9e..576ab738149 100644 --- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java @@ -33,6 +33,7 @@ public class ToStringCreatorTests extends TestCase { private SomeObject s1, s2, s3; + @Override protected void setUp() throws Exception { s1 = new SomeObject() { public String toString() { diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java index 78ced2402f0..b7a6d5c3819 100644 --- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java +++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java @@ -56,6 +56,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { public void testThreadFactoryOverridesDefaults() throws Exception { final Object monitor = new Object(); SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { return new Thread(r, "test"); } @@ -88,6 +89,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { private static final class NoOpRunnable implements Runnable { + @Override public void run() { // no-op } @@ -102,6 +104,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { this.monitor = monitor; } + @Override public final void run() { synchronized (this.monitor) { try { @@ -129,6 +132,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { return this.threadName; } + @Override protected void doRun() { this.threadName = Thread.currentThread().getName(); } diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index d7bdd36e41b..b82a952c267 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -85,6 +85,7 @@ public class AutoPopulatingListTests extends TestCase { private static class MockElementFactory implements AutoPopulatingList.ElementFactory { + @Override public Object createElement(int index) { TestBean bean = new TestBean(); bean.setAge(index); diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java index 57a2998e0bb..fe70ac344d5 100644 --- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java +++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java @@ -99,6 +99,7 @@ public class CachingMapDecoratorTests extends TestCase { private boolean createCalled; + @Override protected String create(String key) { createCalled = true; return (key != null ? "expensive value to cache" : null); diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 8b7fdff79ae..96146d31a84 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -41,6 +41,7 @@ import org.springframework.beans.TestBean; */ public class ClassUtilsTests extends TestCase { + @Override public void setUp() { InnerClass.noArgCalled = false; InnerClass.argCalled = false; diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java index 5d35e6c0599..f9a6d1070ef 100644 --- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java @@ -490,6 +490,7 @@ public class ConcurrentReferenceHashMapTests { StopWatch mapTime = timeMultiThreaded("SynchronizedMap", synchronizedMap, new ValueFactory>() { + @Override public WeakReference newValue(int v) { return new WeakReference(String.valueOf(v)); } @@ -500,6 +501,7 @@ public class ConcurrentReferenceHashMapTests { StopWatch cacheTime = timeMultiThreaded("WeakConcurrentCache", this.map, new ValueFactory() { + @Override public String newValue(int v) { return String.valueOf(v); } @@ -650,18 +652,22 @@ public class ConcurrentReferenceHashMapTests { this.queue = queue; } + @Override public Entry get() { return this.entry; } + @Override public int getHash() { return this.hash; } + @Override public Reference getNext() { return this.next; } + @Override public void release() { this.queue.add(this); this.entry = null; diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java index 5eaa203ef5a..94e790d97ed 100644 --- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java @@ -73,6 +73,7 @@ public class FileSystemUtilsTests extends TestCase { assertTrue(!src.exists()); } + @Override protected void tearDown() throws Exception { File tmp = new File("./tmp"); if (tmp.exists()) { diff --git a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java index bb9e5700fee..356fad6b53e 100644 --- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java +++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java @@ -227,6 +227,7 @@ public class MethodInvokerTests extends TestCase { private static class Purchaser implements Greetable { + @Override public String getGreeting() { return "hello"; } @@ -235,6 +236,7 @@ public class MethodInvokerTests extends TestCase { private static class Shopper extends Purchaser implements Person { + @Override public String getGreeting() { return "may I help you?"; } @@ -243,6 +245,7 @@ public class MethodInvokerTests extends TestCase { private static class Salesman implements Person { + @Override public String getGreeting() { return "how are sales?"; } @@ -251,6 +254,7 @@ public class MethodInvokerTests extends TestCase { private static class Customer extends Shopper { + @Override public String getGreeting() { return "good day"; } @@ -265,6 +269,7 @@ public class MethodInvokerTests extends TestCase { this.name = name; } + @Override public String getGreeting() { return "welcome back " + name ; } @@ -277,6 +282,7 @@ public class MethodInvokerTests extends TestCase { super(name); } + @Override public String getGreeting() { return "whassup dude?"; } diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java index 13e662d381d..be48ab08ff9 100644 --- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java +++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java @@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent) */ + @Override protected void append(LoggingEvent evt) { //System.out.println("Adding " + evt.getMessage()); loggingStrings.add(evt.getMessage()); @@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#close() */ + @Override public void close() { closeCalled = true; } @@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#requiresLayout() */ + @Override public boolean requiresLayout() { return false; } diff --git a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java index d353cb9e0a9..20bb969c6e2 100644 --- a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java +++ b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java @@ -82,6 +82,7 @@ public class PropertyPlaceholderHelperTests { assertEquals("foo=bar", this.helper.replacePlaceholders(text, new PropertyPlaceholderHelper.PlaceholderResolver() { + @Override public String resolvePlaceholder(String placeholderName) { if ("foo".equals(placeholderName)) { return "bar"; diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java index 20d69e05b41..512b9af9930 100644 --- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java @@ -212,6 +212,7 @@ public class ReflectionUtilsTests { public void doWithProtectedMethods() { ListSavingMethodCallback mc = new ListSavingMethodCallback(); ReflectionUtils.doWithMethods(TestBean.class, mc, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method m) { return Modifier.isProtected(m.getModifiers()); } @@ -353,6 +354,7 @@ public class ReflectionUtilsTests { private List methods = new LinkedList(); + @Override public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException { this.methodNames.add(m.getName()); this.methods.add(m); diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java index 923c9fe5acb..7e47d99f5b2 100644 --- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java @@ -63,6 +63,7 @@ public class ResourceUtilsTests extends TestCase { */ private static class DummyURLStreamHandler extends URLStreamHandler { + @Override protected URLConnection openConnection(URL url) throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index bbf14c12272..516e7ce66ea 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -173,6 +173,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { static class DummyConstructorResolver implements ConstructorResolver { + @Override public ConstructorExecutor resolve(EvaluationContext context, String typeName, List argumentTypes) throws AccessException { throw new UnsupportedOperationException("Auto-generated method stub"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 56e26f30da5..aeb991ab553 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -608,6 +608,7 @@ public class EvaluationTests extends ExpressionTestCase { static class CustomMethodResolver implements MethodResolver { + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List argumentTypes) throws AccessException { @@ -617,6 +618,7 @@ public class EvaluationTests extends ExpressionTestCase { static class CustomMethodFilter implements MethodFilter { + @Override public List filter(List methods) { return null; } @@ -1373,6 +1375,7 @@ public class EvaluationTests extends ExpressionTestCase { static class MyBeanResolver implements BeanResolver { + @Override public Object resolve(EvaluationContext context, String beanName) throws AccessException { if (beanName.equals("foo") || beanName.equals("bar")) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java index b225aa66df2..ca8a5db5191 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java @@ -256,22 +256,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase { /** * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it */ + @Override public Class[] getSpecificTargetClasses() { return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return propertyMap.containsKey(name); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(propertyMap.get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } @@ -295,22 +300,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase { /** * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it */ + @Override public Class[] getSpecificTargetClasses() { return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return propertyMap.containsKey(name); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(propertyMap.get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java index 9f4d22b363c..a9b24b1b382 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java @@ -182,10 +182,12 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas private final ConversionService service = new DefaultConversionService(); + @Override public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) { return this.service.canConvert(sourceType, targetType); } + @Override public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) throws EvaluationException { return this.service.convert(value, sourceType, targetType); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java index f94503828b6..aebe1584683 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java @@ -62,24 +62,29 @@ public class IndexingTests { public static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] { Map.class }; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java index 215e7036718..d95227dffb6 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java @@ -149,24 +149,29 @@ public class MapAccessTests extends ExpressionTestCase { public static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] { Map.class }; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 56555b209d9..682dfe525ec 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -274,6 +274,7 @@ public class MethodInvocationTests extends ExpressionTestCase { return false; } + @Override public List filter(List methods) { filterCalled = true; List forRemoval = new ArrayList(); @@ -329,6 +330,7 @@ public class MethodInvocationTests extends ExpressionTestCase { static class DummyMethodResolver implements MethodResolver { + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List argumentTypes) throws AccessException { throw new UnsupportedOperationException("Auto-generated method stub"); @@ -379,6 +381,7 @@ public class MethodInvocationTests extends ExpressionTestCase { byte[] bytes = new byte[100]; StandardEvaluationContext context = new StandardEvaluationContext(bytes); context.setBeanResolver(new BeanResolver() { + @Override public Object resolve(EvaluationContext context, String beanName) throws AccessException { if ("service".equals(beanName)) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java index 66aa85fb892..604016eb991 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java @@ -34,6 +34,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase { static class StringAndBooleanAddition implements OperatorOverloader { + @Override public Object operate(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException { if (operation==Operation.ADD) { return ((String)leftOperand)+((Boolean)rightOperand).toString(); @@ -42,6 +43,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase { } } + @Override public boolean overridesOperation(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException { if (leftOperand instanceof String && rightOperand instanceof Boolean) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java index 3cb81de5e92..104000d8780 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java @@ -170,28 +170,33 @@ public class PropertyAccessTests extends ExpressionTestCase { int flibbles = 7; + @Override public Class[] getSpecificTargetClasses() { return new Class[] { String.class }; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { if (!(target instanceof String)) throw new RuntimeException("Assertion Failed! target should be String"); return (name.equals("flibbles")); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { if (!(target instanceof String)) throw new RuntimeException("Assertion Failed! target should be String"); return (name.equals("flibbles")); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { if (!name.equals("flibbles")) throw new RuntimeException("Assertion Failed! name should be flibbles"); return new TypedValue(flibbles); } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { if (!name.equals("flibbles")) diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java index 5bc84c9d380..214af39187d 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java @@ -187,6 +187,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"MANAGER"};} } @@ -197,6 +198,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"TELLER"};} } @@ -207,6 +209,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"SUPERVISOR"};} } @@ -217,22 +220,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { public String name = "Andy"; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return name.equals("principal"); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(new Principal()); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } + @Override public Class[] getSpecificTargetClasses() { return null; } @@ -247,22 +255,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { void setPerson(Person p) { this.activePerson = p; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return name.equals("p"); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(activePerson); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } + @Override public Class[] getSpecificTargetClasses() { return null; } @@ -280,6 +293,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { this.tc = typeConverter; } + @Override public TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException { try { @@ -303,6 +317,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { } } + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List arguments) throws AccessException { if (name.equals("hasRole")) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 6876afb0e10..0216f5c7afb 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -487,14 +487,17 @@ public class SpelDocumentationTests extends ExpressionTestCase { static class TemplatedParserContext implements ParserContext { + @Override public String getExpressionPrefix() { return "${"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index dad8d43bea7..e1122ab04f9 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -122,6 +122,7 @@ public class SpelReproTests extends ExpressionTestCase { static class MyTypeLocator extends StandardTypeLocator { + @Override public Class findType(String typename) throws EvaluationException { if (typename.equals("Spr5899Class")) { return Spr5899Class.class; @@ -240,23 +241,28 @@ public class SpelReproTests extends ExpressionTestCase { static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] {Map.class}; } @@ -546,12 +552,15 @@ public class SpelReproTests extends ExpressionTestCase { } private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "$["; } + @Override public String getExpressionSuffix() { return "]"; } + @Override public boolean isTemplate() { return true; } @@ -626,6 +635,7 @@ public class SpelReproTests extends ExpressionTestCase { } static class MyBeanResolver implements BeanResolver { + @Override public Object resolve(EvaluationContext context, String beanname) throws AccessException { if (beanname.equals("foo")) { return "custard"; @@ -1100,21 +1110,26 @@ public class SpelReproTests extends ExpressionTestCase { } return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return getMap(target).containsKey(name); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return getMap(target).containsKey(name); } + @Override public Class[] getSpecificTargetClasses() { return new Class[]{ContextObject.class}; } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(getMap(target).get(name)); } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { getMap(target).put(name, (String) newValue); @@ -1701,6 +1716,7 @@ public class SpelReproTests extends ExpressionTestCase { private static class GenericImplementation implements GenericInterface { + @Override public Integer getProperty() { return null; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java index 201944098d2..ab4e0dcd846 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java @@ -36,24 +36,30 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; public class TemplateExpressionParsingTests extends ExpressionTestCase { public static final ParserContext DEFAULT_TEMPLATE_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "${"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } }; public static final ParserContext HASH_DELIMITED_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "#{"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java index b156b565c0d..cbcb5ced3eb 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java @@ -199,6 +199,7 @@ public class OpPlusTests { GenericConversionService conversionService = new GenericConversionService(); conversionService.addConverter(new Converter() { + @Override public String convert(Time source) { return format.format(source); } diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java index ded9cd0bf71..8cf9e5fdaf1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java @@ -45,6 +45,7 @@ public abstract class AbstractJdbcTests extends TestCase { */ private boolean shouldVerify; + @Override protected void setUp() throws Exception { this.shouldVerify = false; super.setUp(); @@ -68,6 +69,7 @@ public abstract class AbstractJdbcTests extends TestCase { this.shouldVerify = true; } + @Override protected void tearDown() throws Exception { super.tearDown(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java index 4d722fb2c81..daa891016e5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java @@ -124,6 +124,7 @@ public class InitializeDatabaseIntegrationTests { return cache; } + @Override public void afterPropertiesSet() throws Exception { cache = jdbcTemplate.queryForList("SELECT * FROM T_TEST"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index 6f672cf1ea4..ed87fd3edc1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -74,6 +74,7 @@ public abstract class AbstractRowMapperTests extends TestCase { protected Statement stmt3; protected JdbcTemplate jdbcTemplate3; + @Override protected void setUp() throws SQLException { conControl = MockControl.createControl(Connection.class); con = (Connection) conControl.getMock(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index de75c0d0f2e..c681fc1ed66 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -49,6 +49,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { private MockControl ctrlResultSetMetaData; private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); @@ -62,6 +63,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); } + @Override protected void replay() { super.replay(); ctrlStatement.replay(); @@ -70,6 +72,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { ctrlResultSetMetaData.replay(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -349,6 +352,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object o = template.queryForObject(sql, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -852,6 +856,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 62d3c66cf4e..ba9b97dcae1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -159,6 +159,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithStaticSql() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, rch); } @@ -167,6 +168,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, rch); } @@ -175,6 +177,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithEmptyPreparedStatementSetter() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, (PreparedStatementSetter) null, rch); } @@ -184,8 +187,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithPreparedStatementSetter() throws Exception { final Integer argument = new Integer(99); doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setObject(1, argument); } @@ -196,6 +201,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithEmptyPreparedStatementArgs() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, (Object[]) null, rch); } @@ -205,6 +211,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithPreparedStatementArgs() throws Exception { final Integer argument = new Integer(99); doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, new Object[] {argument}, rch); } @@ -221,6 +228,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { class StringHandler implements RowCallbackHandler { private List list = new LinkedList(); + @Override public void processRow(ResultSet rs) throws SQLException { list.add(rs.getString(1)); } @@ -365,6 +373,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor()); Object result = template.execute(new ConnectionCallback() { + @Override public Object doInConnection(Connection con) { assertSame(mockConnection, con); return "test"; @@ -389,6 +398,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object result = template.execute(new ConnectionCallback() { + @Override public Object doInConnection(Connection con) throws SQLException { PreparedStatement ps = con.prepareStatement("some SQL"); ps.close(); @@ -471,6 +481,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) { throw rex; } @@ -790,10 +801,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -854,14 +867,17 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new InterruptibleBatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); } } + @Override public int getBatchSize() { return 1000; } + @Override public boolean isBatchExhausted(int i) { return (i >= ids.length); } @@ -922,6 +938,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { + @Override protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); @@ -986,6 +1003,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { + @Override protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); @@ -1039,9 +1057,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -1099,9 +1119,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -1242,6 +1264,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, Integer argument) throws SQLException { ps.setInt(1, argument.intValue()); } @@ -1470,6 +1493,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); PreparedStatementSetter pss = new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, name); } @@ -1506,6 +1530,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); PreparedStatementSetter pss = new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, name); } @@ -1591,6 +1616,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { t.setIgnoreWarnings(false); try { t.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { rs.getByte(1); } @@ -1643,6 +1669,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setIgnoreWarnings(true); template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws java.sql.SQLException { rs.getByte(1); @@ -1689,6 +1716,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; } @@ -1736,6 +1764,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { template.afterPropertiesSet(); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; } @@ -1805,6 +1834,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { template.afterPropertiesSet(); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; @@ -1901,39 +1931,49 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setNativeJdbcExtractor(new NativeJdbcExtractor() { + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return false; } + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return false; } + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return false; } + @Override public Connection getNativeConnection(Connection con) { return con; } + @Override public Connection getNativeConnectionFromStatement(Statement stmt) throws SQLException { return stmt.getConnection(); } + @Override public Statement getNativeStatement(Statement stmt) { assertTrue(stmt == mockStatement); return mockStatement2; } + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) { assertTrue(ps == mockPreparedStatement); return mockPreparedStatement2; } + @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) { assertTrue(cs == mockCallableStatement); return mockCallableStatement2; } + @Override public ResultSet getNativeResultSet(ResultSet rs) { return rs; } }); template.query("my query", new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { assertEquals(mockResultSet, rs2); return null; @@ -1941,10 +1981,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests { }); template.query(new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection conn) { return mockPreparedStatement; } }, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { assertEquals(mockResultSet, rs2); return null; @@ -1952,6 +1994,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { }); template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection con) { return mockCallableStatement; } @@ -2015,6 +2058,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { try { template.query("my query", new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs) { throw new InvalidDataAccessApiUsageException(""); } @@ -2027,6 +2071,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { try { template.query(new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection con) throws SQLException { return con.prepareStatement("my query"); } @@ -2034,6 +2079,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { return null; } }, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { throw new InvalidDataAccessApiUsageException(""); } @@ -2084,6 +2130,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { List params = new ArrayList(); params.add(new SqlReturnResultSet("", new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) { throw new InvalidDataAccessApiUsageException(""); } @@ -2093,6 +2140,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection conn) throws SQLException { return conn.prepareCall("my query"); } @@ -2143,6 +2191,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { params.add(new SqlOutParameter("a", 12)); Map out = template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection conn) throws SQLException { return conn.prepareCall("my query"); } @@ -2157,6 +2206,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter { + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { return con; } @@ -2179,12 +2229,14 @@ public class JdbcTemplateTests extends AbstractJdbcTests { this.sql = sql; } + @Override public PreparedStatement createPreparedStatement(Connection conn) throws SQLException { PreparedStatement ps = conn.prepareStatement(sql); ps.setInt(1, id); return ps; } + @Override public String getSql() { return sql; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index bd992919cb2..5760ebfe34f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -47,6 +47,7 @@ public class RowMapperTests extends TestCase { private JdbcTemplate jdbcTemplate; private List result; + @Override protected void setUp() throws SQLException { conControl = MockControl.createControl(Connection.class); con = (Connection) conControl.getMock(); @@ -121,6 +122,7 @@ public class RowMapperTests extends TestCase { result = jdbcTemplate.query( new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection con) throws SQLException { return ps; } @@ -153,6 +155,7 @@ public class RowMapperTests extends TestCase { result = jdbcTemplate.query( "some SQL", new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, "test"); } @@ -240,6 +243,7 @@ public class RowMapperTests extends TestCase { private static class TestRowMapper implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new TestBean(rs.getString(1), rs.getInt(2)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java index ae4d9737026..3ed281abfce 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java @@ -31,6 +31,7 @@ public class SimpleRowCountCallbackHandler implements RowCallbackHandler { private int count; + @Override public void processRow(ResultSet rs) throws SQLException { count++; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java index 17292869391..15ce2e9504e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java @@ -35,11 +35,13 @@ public class StatementCreatorUtilsTests extends TestCase { private MockControl psControl; private PreparedStatement ps; + @Override protected void setUp() { psControl = MockControl.createControl(PreparedStatement.class); ps = (PreparedStatement) psControl.getMock(); } + @Override protected void tearDown() { psControl.verify(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index 4716527a36d..e18b28a19fa 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -71,6 +71,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { private MockControl ctrlResultSet; private ResultSet mockResultSet; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -79,6 +80,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { mockResultSet = (ResultSet) ctrlResultSet.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -87,6 +89,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -132,6 +135,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("perfId", new Integer(1)); params.put("priceId", new Integer(1)); assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { + @Override public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { assertEquals(mockPreparedStatement, ps); ps.executeUpdate(); @@ -164,6 +168,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1))); assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { + @Override public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { assertEquals(mockPreparedStatement, ps); ps.executeUpdate(); @@ -259,6 +264,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs) throws SQLException, DataAccessException { rs.next(); Customer cust = new Customer(); @@ -307,6 +313,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("country", "UK"); final List customers = new LinkedList(); jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -355,6 +362,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -403,6 +411,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java index 92166a19bb7..5abcb764ed0 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java @@ -44,6 +44,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { private MockControl ctrlResultSetMetaData; private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -54,6 +55,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -61,6 +63,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { ctrlResultSetMetaData.replay(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (false && shouldVerify()) { @@ -317,6 +320,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { parms.addValue("id", new Integer(3)); Object o = template.queryForObject(sql, parms, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index 6ca38bd21f0..3340c760d72 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -31,6 +31,7 @@ public class CallMetaDataContextTests extends TestCase { private CallMetaDataContext context = new CallMetaDataContext(); + @Override protected void setUp() throws Exception { super.setUp(); @@ -51,6 +52,7 @@ public class CallMetaDataContextTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java index 64bca82610d..7ed70e88e1e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java @@ -31,6 +31,7 @@ public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTe private SimpleJdbcTemplate simpleJdbcTemplate; + @Override protected void setUp() throws SQLException { super.setUp(); simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index 3f69a453194..1f664107a65 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -49,6 +49,7 @@ public class SimpleJdbcCallTests extends TestCase { private MockControl ctrlCallable; private CallableStatement mockCallable; + @Override protected void setUp() throws Exception { ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); @@ -69,6 +70,7 @@ public class SimpleJdbcCallTests extends TestCase { mockCallable = (CallableStatement) ctrlCallable.getMock(); } + @Override protected void tearDown() throws Exception { ctrlDatabaseMetaData.verify(); ctrlDataSource.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java index b6ffa6f70f2..088e48f98a2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java @@ -40,6 +40,7 @@ public class SimpleJdbcInsertTests extends TestCase { private MockControl ctrlDatabaseMetaData; private DatabaseMetaData mockDatabaseMetaData; + @Override protected void setUp() throws Exception { super.setUp(); @@ -60,6 +61,7 @@ public class SimpleJdbcInsertTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java index a80ebbe4d46..8bfe278c63b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java @@ -254,6 +254,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Date expectedResult = new Date(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } @@ -279,6 +280,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Object arg3 = new Object(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } @@ -305,6 +307,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Object arg3 = new Object(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index d42a5810dd5..f9eb8828733 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -30,6 +30,7 @@ public class TableMetaDataContextTests extends TestCase { private TableMetaDataContext context = new TableMetaDataContext(); + @Override protected void setUp() throws Exception { super.setUp(); @@ -50,6 +51,7 @@ public class TableMetaDataContextTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java index 69d03b371d3..76034050ef3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java @@ -37,6 +37,7 @@ public class JdbcDaoSupportTests extends TestCase { DataSource ds = (DataSource) dsControl.getMock(); final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -52,6 +53,7 @@ public class JdbcDaoSupportTests extends TestCase { JdbcTemplate template = new JdbcTemplate(); final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java index b63387c48c1..02cafbb1989 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java @@ -69,6 +69,7 @@ public class LobSupportTests extends TestCase { AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback(handler) { + @Override protected void setValues(PreparedStatement ps, LobCreator lobCreator) throws SQLException, DataAccessException { svc.b = true; @@ -155,6 +156,7 @@ public class LobSupportTests extends TestCase { private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) { AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() { + @Override protected void streamData(ResultSet rs) throws SQLException, IOException { if (ex) { throw new IOException(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index f2345bbc730..65e5b3f9a83 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -57,6 +57,7 @@ public class SqlLobValueTests extends TestCase { private MockControl lobCreatorControl; private LobCreator creator; + @Override public void setUp() { // create preparedstatement psControl = MockControl.createControl(PreparedStatement.class); @@ -97,11 +98,13 @@ public class SqlLobValueTests extends TestCase { creator.setBlobAsBytes(ps, 1, testString.getBytes()); // set a matcher to match the byte array! lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[2]; byte[] two = (byte[]) arg1[2]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } @@ -149,10 +152,12 @@ public class SqlLobValueTests extends TestCase { ByteArrayInputStream bais = new ByteArrayInputStream(testContent); creator.setClobAsAsciiStream(ps, 1, bais, 3); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { // for now, match always return true; } + @Override public String toString(Object[] arg0) { return null; } @@ -172,10 +177,12 @@ public class SqlLobValueTests extends TestCase { InputStreamReader reader = new InputStreamReader(bais); creator.setClobAsCharacterStream(ps, 1, reader, 3); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { // for now, match always return true; } + @Override public String toString(Object[] arg0) { return null; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index 8acf5aa045a..4fe8a5b43fd 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -96,6 +96,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -223,6 +224,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -246,6 +248,7 @@ public class DataSourceJtaTransactionTests extends TestCase { for (int i = 0; i < 5; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -418,6 +421,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -429,6 +433,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt2.setPropagationBehavior(requiresNew ? TransactionDefinition.PROPAGATION_REQUIRES_NEW : TransactionDefinition.PROPAGATION_REQUIRED); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -547,6 +552,7 @@ public class DataSourceJtaTransactionTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -569,6 +575,7 @@ public class DataSourceJtaTransactionTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -653,9 +660,11 @@ public class DataSourceJtaTransactionTests extends TestCase { @SuppressWarnings("serial") JtaTransactionManager ptm = new JtaTransactionManager(ut) { + @Override protected void doRegisterAfterCompletionWithJtaTransaction( JtaTransactionObject txObject, final List synchronizations) { Thread async = new Thread() { + @Override public void run() { invokeAfterCompletion(synchronizations, TransactionSynchronization.STATUS_COMMITTED); } @@ -691,6 +700,7 @@ public class DataSourceJtaTransactionTests extends TestCase { final boolean releaseCon = (i != 1); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Is existing transaction", !status.isNewTransaction()); @@ -769,6 +779,7 @@ public class DataSourceJtaTransactionTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -780,6 +791,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ); tt.setReadOnly(true); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -865,6 +877,7 @@ public class DataSourceJtaTransactionTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -875,6 +888,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -890,6 +904,7 @@ public class DataSourceJtaTransactionTests extends TestCase { utControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index cf3cf2cb452..28eb6b3c04e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -134,6 +134,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -242,6 +243,7 @@ public class DataSourceTransactionManagerTests extends TestCase { final RuntimeException ex = new RuntimeException("Application exception"); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -291,6 +293,7 @@ public class DataSourceTransactionManagerTests extends TestCase { final RuntimeException ex = new RuntimeException("Application exception"); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); @@ -359,10 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is existing transaction", !status.isNewTransaction()); assertFalse("Is not rollback-only", status.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -433,9 +438,11 @@ public class DataSourceTransactionManagerTests extends TestCase { tt2.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertFalse("Is not rollback-only", status.isRollbackOnly()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -489,9 +496,11 @@ public class DataSourceTransactionManagerTests extends TestCase { tt2.setReadOnly(false); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertFalse("Is not rollback-only", status.isRollbackOnly()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -539,9 +548,11 @@ public class DataSourceTransactionManagerTests extends TestCase { final TestTransactionSynchronization synch = new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) { + @Override public void afterCompletion(int status) { super.afterCompletion(status); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { } }); @@ -549,6 +560,7 @@ public class DataSourceTransactionManagerTests extends TestCase { }; tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { TransactionSynchronizationManager.registerSynchronization(synch); } @@ -599,10 +611,12 @@ public class DataSourceTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm2); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is existing transaction", !status.isNewTransaction()); assertFalse("Is not rollback-only", status.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -661,12 +675,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -737,12 +753,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -807,12 +825,14 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -858,12 +878,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -911,10 +933,12 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { fail("Should have thrown IllegalTransactionStateException"); } @@ -959,11 +983,13 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); TransactionTemplate tt2 = new TransactionTemplate(tm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1015,6 +1041,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertSame(con1, DataSourceUtils.getConnection(ds)); @@ -1022,6 +1049,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(tm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1079,6 +1107,7 @@ public class DataSourceTransactionManagerTests extends TestCase { tt.setReadOnly(true); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -1142,6 +1171,7 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { try { Thread.sleep(1500); @@ -1207,6 +1237,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1260,6 +1291,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1275,6 +1307,7 @@ public class DataSourceTransactionManagerTests extends TestCase { } tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1338,6 +1371,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1354,6 +1388,7 @@ public class DataSourceTransactionManagerTests extends TestCase { } tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1406,6 +1441,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1443,6 +1479,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1483,6 +1520,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1525,6 +1563,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -1550,6 +1589,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1573,6 +1613,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1594,6 +1635,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1655,11 +1697,13 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Isn't nested transaction", !status.hasSavepoint()); for (int i = 0; i < count; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1721,10 +1765,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Isn't nested transaction", !status.hasSavepoint()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1786,6 +1832,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); Object savepoint = status.createSavepoint(); @@ -1842,6 +1889,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); Object savepoint = status.createSavepoint(); @@ -1883,6 +1931,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); } @@ -1919,6 +1968,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); status.setRollbackOnly(); @@ -1930,6 +1980,7 @@ public class DataSourceTransactionManagerTests extends TestCase { dsControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -1953,15 +2004,19 @@ public class DataSourceTransactionManagerTests extends TestCase { this.status = status; } + @Override public void suspend() { } + @Override public void resume() { } + @Override public void flush() { } + @Override public void beforeCommit(boolean readOnly) { if (this.status != TransactionSynchronization.STATUS_COMMITTED) { fail("Should never be called"); @@ -1970,11 +2025,13 @@ public class DataSourceTransactionManagerTests extends TestCase { this.beforeCommitCalled = true; } + @Override public void beforeCompletion() { assertFalse(this.beforeCompletionCalled); this.beforeCompletionCalled = true; } + @Override public void afterCommit() { if (this.status != TransactionSynchronization.STATUS_COMMITTED) { fail("Should never be called"); @@ -1983,6 +2040,7 @@ public class DataSourceTransactionManagerTests extends TestCase { this.afterCommitCalled = true; } + @Override public void afterCompletion(int status) { assertFalse(this.afterCompletionCalled); this.afterCompletionCalled = true; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index 8696edf257d..28b30408888 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -38,6 +38,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals(uname, props.getProperty("user")); @@ -77,6 +78,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals("uname", props.getProperty("user")); @@ -117,6 +119,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals(uname, props.getProperty("user")); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java index a8c3a79b79b..5e5b5afd6ec 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java @@ -12,10 +12,12 @@ public class TestDataSourceWrapper extends AbstractDataSource { this.target = target; } + @Override public Connection getConnection() throws SQLException { return target.getConnection(); } + @Override public Connection getConnection(String username, String password) throws SQLException { return target.getConnection(username, password); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java index 3a9f6b94ecb..77970dbe087 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java @@ -24,6 +24,7 @@ public class EmbeddedDatabaseFactoryTests { private boolean populateCalled; + @Override public void populate(Connection connection) { this.populateCalled = true; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java index 4534d493ed6..48174456d94 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java @@ -35,6 +35,7 @@ public final class JndiDataSourceLookupTests { public void testSunnyDay() throws Exception { final DataSource expectedDataSource = new StubDataSource(); JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @Override @SuppressWarnings("unchecked") protected Object lookup(String jndiName, Class requiredType) { assertEquals(DATA_SOURCE_NAME, jndiName); @@ -49,6 +50,7 @@ public final class JndiDataSourceLookupTests { @Test(expected=DataSourceLookupFailureException.class) public void testNoDataSourceAtJndiLocation() throws Exception { JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @Override @SuppressWarnings("unchecked") protected Object lookup(String jndiName, Class requiredType) throws NamingException { assertEquals(DATA_SOURCE_NAME, jndiName); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java index a8521e70ba7..17276e3aeb8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java @@ -30,10 +30,12 @@ import org.springframework.jdbc.datasource.AbstractDataSource; */ class StubDataSource extends AbstractDataSource { + @Override public Connection getConnection() throws SQLException { throw new UnsupportedOperationException(); } + @Override public Connection getConnection(String username, String password) throws SQLException { throw new UnsupportedOperationException(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java index a497dca34e5..9a1e61d9bb7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java @@ -10,6 +10,7 @@ public class CustomerMapper implements RowMapper { private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; + @Override public Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java index 4bf0f2eed40..5c00e0bf75a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java @@ -61,6 +61,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { private BeanFactory bf; + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -72,6 +73,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { testDataSource.setTarget(mockDataSource); } + @Override @After public void tearDown() throws Exception { super.tearDown(); @@ -81,6 +83,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); EasyMock.replay(mockPreparedStatement); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java index fd96db3e39a..9c1ff6069e7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java @@ -52,6 +52,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { private BeanFactory bf; + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -62,6 +63,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { testDataSource.setTarget(mockDataSource); } + @Override @After public void tearDown() throws Exception { super.tearDown(); @@ -70,6 +72,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); EasyMock.replay(mockCallable); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java index 8feb57fc975..189c59a1a08 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java @@ -213,6 +213,7 @@ public class RdbmsOperationTests extends TestCase { private static class TestRdbmsOperation extends RdbmsOperation { + @Override protected void compileInternal() { } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 08b71e6fcb2..478328af8cc 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -82,6 +82,7 @@ public class SqlQueryTests extends AbstractJdbcTests { private ResultSet mockResultSet; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -90,6 +91,7 @@ public class SqlQueryTests extends AbstractJdbcTests { mockResultSet = (ResultSet) ctrlResultSet.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -98,6 +100,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -130,6 +133,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); SqlQuery query = new MappingSqlQueryWithParameters() { + @Override protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException { assertTrue("params were null", params == null); assertTrue("context was null", context == null); @@ -154,6 +158,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); MappingSqlQuery query = new MappingSqlQuery() { + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -180,6 +185,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); MappingSqlQuery query = new MappingSqlQuery() { + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -374,6 +380,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -431,6 +438,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -522,6 +530,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -587,6 +596,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -654,6 +664,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -712,6 +723,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -767,6 +779,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -797,6 +810,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -876,6 +890,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -943,6 +958,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1016,6 +1032,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1057,6 +1074,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1128,6 +1146,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException { rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0])))); return null; @@ -1148,6 +1167,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return rs.getString(1); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 867f1891ac4..011fe1624b1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -66,12 +66,14 @@ public class SqlUpdateTests extends AbstractJdbcTests { private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -79,6 +81,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index 48ec7f2b12c..3dae9479306 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -62,6 +62,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { private MockControl ctrlCallable; private CallableStatement mockCallable; + @Override protected void setUp() throws Exception { super.setUp(); @@ -69,6 +70,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { mockCallable = (CallableStatement) ctrlCallable.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -76,6 +78,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlCallable.replay(); @@ -255,6 +258,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { class TestJdbcTemplate extends JdbcTemplate { int calls; + @Override public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException { calls++; return super.call(csc, declaredParameters); @@ -934,6 +938,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } private static class RowMapperImpl implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getString(2); } @@ -964,6 +969,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { private TestParameterMapper() { } + @Override public Map createMap(Connection conn) throws SQLException { Map inParms = new HashMap(); String testValue = conn.toString(); @@ -989,6 +995,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { public Map executeTest(final int[] inValue) { Map in = new HashMap(1); in.put("in", new AbstractSqlTypeValue() { + @Override public Object createTypeValue(Connection con, int type, String typeName) { //assertEquals(Connection.class, con.getClass()); //assertEquals(Types.ARRAY, type); @@ -1030,6 +1037,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { setDataSource(ds); setSql(SQL); getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() { + @Override public DataAccessException translate( String task, String sql, diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java index 467f03f2e81..5fb13c22338 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java @@ -27,6 +27,7 @@ import java.sql.SQLException; * @author Thomas Risberg */ public class CustomSqlExceptionTranslator implements SQLExceptionTranslator { + @Override public DataAccessException translate(String task, String sql, SQLException ex) { if (ex.getErrorCode() == 2) { return new TransientDataAccessResourceException("Custom", ex); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java index 565e7d1cce4..039a938a76f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java @@ -35,6 +35,7 @@ import junit.framework.TestCase; public class KeyHolderTests extends TestCase { private KeyHolder kh; + @Override public void setUp() { kh = new GeneratedKeyHolder(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java index 2a016ef6e6d..6695bb35aff 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java @@ -110,6 +110,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase { SQLException intVioEx = new SQLException("", "", 6); SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator() { + @Override protected DataAccessException customTranslate(String task, String sql, SQLException sqlex) { assertEquals(TASK, task); assertEquals(SQL, sql); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index 67e9cdc47f1..d44b0d1a25a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -122,6 +122,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { public void testLookupOrder() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { private int lookups = 0; + @Override protected Resource loadResource(String path) { ++lookups; if (lookups == 1) { @@ -148,6 +149,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testFindUserDefinedCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("test-error-codes.xml", SQLErrorCodesFactoryTests.class); @@ -166,6 +168,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { public void testInvalidUserDefinedCodeFormat() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { // Guaranteed to be on the classpath, but most certainly NOT XML @@ -186,6 +189,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testFindCustomCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("custom-error-codes.xml", SQLErrorCodesFactoryTests.class); @@ -318,6 +322,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testWildCardNameRecognized() throws Exception { class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("wildcard-error-codes.xml", SQLErrorCodesFactoryTests.class); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java index 4c72a08876c..1b415ea8fbb 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java @@ -39,6 +39,7 @@ public class ResultSetWrappingRowSetTests extends TestCase { private ResultSet rset; private ResultSetWrappingSqlRowSet rowset; + @Override public void setUp() throws Exception { rsetControl = MockControl.createControl(ResultSet.class); rset = (ResultSet) rsetControl.getMock(); diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java index ef4aef309ea..7815bf1af34 100644 --- a/spring-jms/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java index 5270aff4d36..ccf756b53eb 100644 --- a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java +++ b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java @@ -21,6 +21,7 @@ package org.springframework.core.task; */ public class StubTaskExecutor implements TaskExecutor { + @Override public void execute(Runnable task) { } diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java index 9f38822a4e7..4aa339db763 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java @@ -26,13 +26,16 @@ import javax.resource.spi.ResourceAdapter; */ public class StubActivationSpec implements ActivationSpec { + @Override public void validate() throws InvalidPropertyException { } + @Override public ResourceAdapter getResourceAdapter() { return null; } + @Override public void setResourceAdapter(ResourceAdapter resourceAdapter) throws ResourceException { } diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java index 65dcd8b0172..0c70d70dd79 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java @@ -29,18 +29,23 @@ import javax.transaction.xa.XAResource; */ public class StubResourceAdapter implements ResourceAdapter { + @Override public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException { } + @Override public void stop() { } + @Override public void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws ResourceException { } + @Override public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) { } + @Override public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java index 3d7b35490ce..650c51aa342 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java @@ -27,10 +27,12 @@ import javax.jms.JMSException; */ public class StubConnectionFactory implements ConnectionFactory { + @Override public Connection createConnection() throws JMSException { return null; } + @Override public Connection createConnection(String username, String password) throws JMSException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java index 20586ae9522..eca20ea2b4e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java @@ -39,6 +39,7 @@ public class StubQueue implements Queue { } + @Override public String getQueueName() { return this.queueName; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java index 022ecdfbdb7..e3b0f1eca64 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java @@ -39,6 +39,7 @@ public class StubTopic implements Topic { } + @Override public String getTopicName() { return this.topicName; } diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java index 4f51d133a07..b62e9e41bbc 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java @@ -58,10 +58,12 @@ public class JmsNamespaceHandlerTests extends TestCase { private ToolingTestApplicationContext context; + @Override protected void setUp() throws Exception { this.context = new ToolingTestApplicationContext("jmsNamespaceHandlerTests.xml", getClass()); } + @Override protected void tearDown() throws Exception { this.context.close(); } @@ -211,6 +213,7 @@ public class JmsNamespaceHandlerTests extends TestCase { public Message message; + @Override public void onMessage(Message message) { this.message = message; } @@ -229,6 +232,7 @@ public class JmsNamespaceHandlerTests extends TestCase { super(path, clazz); } + @Override protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) { this.registeredComponents = new HashSet(); beanDefinitionReader.setEventListener(new StoringReaderEventListener(this.registeredComponents)); @@ -268,6 +272,7 @@ public class JmsNamespaceHandlerTests extends TestCase { this.registeredComponents = registeredComponents; } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.registeredComponents.add(componentDefinition); } @@ -276,6 +281,7 @@ public class JmsNamespaceHandlerTests extends TestCase { static class TestErrorHandler implements ErrorHandler { + @Override public void handleError(Throwable t) { } } diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java index 24211c5fd5c..4e5a4afc030 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java @@ -79,6 +79,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -118,6 +119,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -157,6 +159,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -164,8 +167,10 @@ public class JmsTransactionManagerTests extends TestCase { }); TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -207,6 +212,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -214,8 +220,10 @@ public class JmsTransactionManagerTests extends TestCase { }); TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -270,6 +278,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -278,8 +287,10 @@ public class JmsTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess != session); return null; @@ -288,6 +299,7 @@ public class JmsTransactionManagerTests extends TestCase { } }); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -335,6 +347,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -343,8 +356,10 @@ public class JmsTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess != session); return null; @@ -353,6 +368,7 @@ public class JmsTransactionManagerTests extends TestCase { } }); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -407,6 +423,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.send(dest, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return message; } @@ -446,6 +463,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate102(cf, false); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -485,6 +503,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate102(cf, true); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -497,6 +516,7 @@ public class JmsTransactionManagerTests extends TestCase { cfControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java index e37dd2e5dcd..b1cd2e2b02a 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java @@ -38,44 +38,55 @@ public class TestConnection implements Connection { private int closeCount; + @Override public Session createSession(boolean b, int i) throws JMSException { return null; } + @Override public String getClientID() throws JMSException { return null; } + @Override public void setClientID(String paramName) throws JMSException { } + @Override public ConnectionMetaData getMetaData() throws JMSException { return null; } + @Override public ExceptionListener getExceptionListener() throws JMSException { return exceptionListener; } + @Override public void setExceptionListener(ExceptionListener exceptionListener) throws JMSException { this.exceptionListener = exceptionListener; } + @Override public void start() throws JMSException { this.startCount++; } + @Override public void stop() throws JMSException { } + @Override public void close() throws JMSException { this.closeCount++; } + @Override public ConnectionConsumer createConnectionConsumer(Destination destination, String paramName, ServerSessionPool serverSessionPool, int i) throws JMSException { return null; } + @Override public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String paramName, String paramName1, ServerSessionPool serverSessionPool, int i) throws JMSException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java index e3f489f8a84..16a20d342e2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java @@ -26,6 +26,7 @@ public class TestExceptionListener implements ExceptionListener { private int count = 0; + @Override public void onException(JMSException ex) { this.count++; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java index 8918069e1bf..41c15ccf2b9 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplate102JtaTests extends JmsTemplate102Tests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return false; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java index b37037c4440..aa03485dc55 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java @@ -102,6 +102,7 @@ public class JmsTemplate102Tests extends TestCase { /** * Create the mock objects for testing. */ + @Override protected void setUp() throws Exception { mockJndiControl = MockControl.createControl(Context.class); mockJndiContext = (Context) this.mockJndiControl.getMock(); @@ -169,6 +170,7 @@ public class JmsTemplate102Tests extends TestCase { JmsTemplate102 template = new JmsTemplate102(); JndiDestinationResolver destMan = new JndiDestinationResolver(); destMan.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockJndiContext; } @@ -203,6 +205,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -244,6 +247,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -292,6 +296,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -324,6 +329,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -365,6 +371,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); @@ -411,6 +418,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -611,6 +619,7 @@ public class JmsTemplate102Tests extends TestCase { if (useDefaultDestination) { template.send(new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -619,6 +628,7 @@ public class JmsTemplate102Tests extends TestCase { else { if (explicitQueue) { template.send(mockQueue, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -626,6 +636,7 @@ public class JmsTemplate102Tests extends TestCase { } else { template.send("testQueue", new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); @@ -689,6 +700,7 @@ public class JmsTemplate102Tests extends TestCase { if (explicitTopic) { template.send(mockTopic, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); @@ -697,6 +709,7 @@ public class JmsTemplate102Tests extends TestCase { } else { template.send("testTopic", new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java index 20e5b3ed2bb..de630545c5f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplate102TransactedTests extends JmsTemplate102Tests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return true; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java index f13a7ccd562..0fea92f9564 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplateJtaTests extends JmsTemplateTests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return false; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index bcf880eaaec..7ede7b3a22c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -91,6 +91,7 @@ public class JmsTemplateTests extends TestCase { /** * Create the mock objects for testing. */ + @Override protected void setUp() throws Exception { mockJndiControl = MockControl.createControl(Context.class); mockJndiContext = (Context) this.mockJndiControl.getMock(); @@ -131,6 +132,7 @@ public class JmsTemplateTests extends TestCase { JmsTemplate template = new JmsTemplate(); JndiDestinationResolver destMan = new JndiDestinationResolver(); destMan.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockJndiContext; } @@ -186,6 +188,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -229,6 +232,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -258,6 +262,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -296,12 +301,14 @@ public class JmsTemplateTests extends TestCase { TransactionSynchronizationManager.initSynchronization(); try { template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; } }); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -472,6 +479,7 @@ public class JmsTemplateTests extends TestCase { if (useDefaultDestination) { template.send(new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -480,6 +488,7 @@ public class JmsTemplateTests extends TestCase { else { if (explicitDestination) { template.send(mockQueue, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -487,6 +496,7 @@ public class JmsTemplateTests extends TestCase { } else { template.send(destinationName, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java index a3874798cc6..bfa36dcb5d0 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplateTransactedTests extends JmsTemplateTests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return true; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java index dbc3663fa01..2072342bd62 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java @@ -37,6 +37,7 @@ public class JmsGatewaySupportTests extends TestCase { connectionFactoryControl.replay(); final List test = new ArrayList(); JmsGatewaySupport gateway = new JmsGatewaySupport() { + @Override protected void initGateway() { test.add("test"); } @@ -53,6 +54,7 @@ public class JmsGatewaySupportTests extends TestCase { JmsTemplate template = new JmsTemplate(); final List test = new ArrayList(); JmsGatewaySupport gateway = new JmsGatewaySupport() { + @Override protected void initGateway() { test.add("test"); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java index 18e47584a48..388fbe86c8c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java @@ -63,6 +63,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container = (SimpleMessageListenerContainer) getContainer(); } + @Override protected AbstractMessageListenerContainer getContainer() { return new SimpleMessageListenerContainer(); } @@ -234,6 +235,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session sess) { try { // Check correct Session passed into SessionAwareMessageListener. @@ -301,6 +303,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(listener); this.container.setTaskExecutor(new TaskExecutor() { + @Override public void execute(Runnable task) { listener.executorInvoked = true; assertFalse(listener.listenerInvoked); @@ -364,6 +367,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session session) throws JMSException { throw theException; } @@ -430,6 +434,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session session) throws JMSException { throw theException; } @@ -491,6 +496,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { throw new UnsupportedOperationException(); } @@ -555,6 +561,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { throw new UnsupportedOperationException(); } @@ -644,6 +651,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener public boolean listenerInvoked = false; + @Override public void onMessage(Message message) { this.listenerInvoked = true; } @@ -658,30 +666,37 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.messageListener.onMessage(message); } + @Override public String getMessageSelector() throws JMSException { throw new UnsupportedOperationException(); } + @Override public MessageListener getMessageListener() throws JMSException { return this.messageListener; } + @Override public void setMessageListener(MessageListener messageListener) throws JMSException { this.messageListener = messageListener; } + @Override public Message receive() throws JMSException { throw new UnsupportedOperationException(); } + @Override public Message receive(long l) throws JMSException { throw new UnsupportedOperationException(); } + @Override public Message receiveNoWait() throws JMSException { throw new UnsupportedOperationException(); } + @Override public void close() throws JMSException { throw new UnsupportedOperationException(); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java index 56c56a8e653..d34c5597d66 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java @@ -169,6 +169,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -230,6 +231,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -291,6 +293,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -337,6 +340,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -399,6 +403,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -434,6 +439,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index 2afee39fefc..6a296262081 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -216,6 +216,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected void handleListenerException(Throwable ex) { assertNotNull("The Throwable passed to the handleListenerException(..) method must never be null.", ex); assertTrue("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].", @@ -320,6 +321,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -382,6 +384,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -427,6 +430,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -488,6 +492,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -522,6 +527,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -546,6 +552,7 @@ public class MessageListenerAdapterTests { mockMessage.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter() { + @Override protected void handleListenerException(Throwable ex) { assertTrue(ex instanceof IllegalStateException); } @@ -566,9 +573,11 @@ public class MessageListenerAdapterTests { mockMessage.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter() { + @Override protected void handleListenerException(Throwable ex) { assertTrue(ex instanceof javax.jms.IllegalStateException); } + @Override protected String getListenerMethodName(Message originalMessage, Object extractedMessage) { return null; } @@ -596,6 +605,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -654,6 +664,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java index 4973cda8ce5..218ec707e12 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java @@ -35,6 +35,7 @@ public class StubMessageListenerAdapter extends MessageListenerAdapter { this.wasCalled = true; } + @Override protected void handleListenerException(Throwable ex) { System.out.println(ex); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java index 20ea0c40bb6..324c7bf817e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java @@ -35,6 +35,7 @@ public class StubMessageListenerAdapter102 extends MessageListenerAdapter102 { this.wasCalled = true; } + @Override protected void handleListenerException(Throwable ex) { System.out.println(ex); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java index 3b7e23a91f6..880e535f92b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java @@ -34,6 +34,7 @@ public class DefaultJmsActivationSpecFactoryTests extends TestCase { private JmsActivationSpecConfig activationSpecConfig; + @Override protected void setUp() throws Exception { activationSpecConfig = new JmsActivationSpecConfig(); activationSpecConfig.setMaxConcurrency(5); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java index 1be6176bd69..cf433e3352e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java @@ -26,6 +26,7 @@ import org.springframework.jca.StubActivationSpec; */ public class StubJmsActivationSpecFactory implements JmsActivationSpecFactory { + @Override public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) { return new StubActivationSpec(); } diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java index 97c33f03077..49b1f47f6ca 100644 --- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java @@ -56,6 +56,7 @@ public class JmsInvokerTests extends TestCase { private Queue mockQueue; + @Override protected void setUp() throws Exception { connectionFactoryControl = MockControl.createControl(QueueConnectionFactory.class); mockConnectionFactory = (QueueConnectionFactory) connectionFactoryControl.getMock(); @@ -107,6 +108,7 @@ public class JmsInvokerTests extends TestCase { exporter.afterPropertiesSet(); JmsInvokerProxyFactoryBean pfb = new JmsInvokerProxyFactoryBean() { + @Override protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException { MockControl exporterSessionControl = MockControl.createControl(Session.class); Session mockExporterSession = (Session) exporterSessionControl.getMock(); @@ -167,59 +169,75 @@ public class JmsInvokerTests extends TestCase { public boolean closed = false; + @Override public void setDisableMessageID(boolean b) throws JMSException { } + @Override public boolean getDisableMessageID() throws JMSException { return false; } + @Override public void setDisableMessageTimestamp(boolean b) throws JMSException { } + @Override public boolean getDisableMessageTimestamp() throws JMSException { return false; } + @Override public void setDeliveryMode(int i) throws JMSException { } + @Override public int getDeliveryMode() throws JMSException { return 0; } + @Override public void setPriority(int i) throws JMSException { } + @Override public int getPriority() throws JMSException { return 0; } + @Override public void setTimeToLive(long l) throws JMSException { } + @Override public long getTimeToLive() throws JMSException { return 0; } + @Override public Destination getDestination() throws JMSException { return null; } + @Override public void close() throws JMSException { this.closed = true; } + @Override public void send(Message message) throws JMSException { this.response = message; } + @Override public void send(Message message, int i, int i1, long l) throws JMSException { } + @Override public void send(Destination destination, Message message) throws JMSException { } + @Override public void send(Destination destination, Message message, int i, int i1, long l) throws JMSException { } } @@ -235,169 +253,216 @@ public class JmsInvokerTests extends TestCase { this.serializable = serializable; } + @Override public void setObject(Serializable serializable) throws JMSException { this.serializable = serializable; } + @Override public Serializable getObject() throws JMSException { return serializable; } + @Override public String getJMSMessageID() throws JMSException { return null; } + @Override public void setJMSMessageID(String string) throws JMSException { } + @Override public long getJMSTimestamp() throws JMSException { return 0; } + @Override public void setJMSTimestamp(long l) throws JMSException { } + @Override public byte[] getJMSCorrelationIDAsBytes() throws JMSException { return new byte[0]; } + @Override public void setJMSCorrelationIDAsBytes(byte[] bytes) throws JMSException { } + @Override public void setJMSCorrelationID(String string) throws JMSException { } + @Override public String getJMSCorrelationID() throws JMSException { return null; } + @Override public Destination getJMSReplyTo() throws JMSException { return replyTo; } + @Override public void setJMSReplyTo(Destination destination) throws JMSException { this.replyTo = destination; } + @Override public Destination getJMSDestination() throws JMSException { return null; } + @Override public void setJMSDestination(Destination destination) throws JMSException { } + @Override public int getJMSDeliveryMode() throws JMSException { return 0; } + @Override public void setJMSDeliveryMode(int i) throws JMSException { } + @Override public boolean getJMSRedelivered() throws JMSException { return false; } + @Override public void setJMSRedelivered(boolean b) throws JMSException { } + @Override public String getJMSType() throws JMSException { return null; } + @Override public void setJMSType(String string) throws JMSException { } + @Override public long getJMSExpiration() throws JMSException { return 0; } + @Override public void setJMSExpiration(long l) throws JMSException { } + @Override public int getJMSPriority() throws JMSException { return 0; } + @Override public void setJMSPriority(int i) throws JMSException { } + @Override public void clearProperties() throws JMSException { } + @Override public boolean propertyExists(String string) throws JMSException { return false; } + @Override public boolean getBooleanProperty(String string) throws JMSException { return false; } + @Override public byte getByteProperty(String string) throws JMSException { return 0; } + @Override public short getShortProperty(String string) throws JMSException { return 0; } + @Override public int getIntProperty(String string) throws JMSException { return 0; } + @Override public long getLongProperty(String string) throws JMSException { return 0; } + @Override public float getFloatProperty(String string) throws JMSException { return 0; } + @Override public double getDoubleProperty(String string) throws JMSException { return 0; } + @Override public String getStringProperty(String string) throws JMSException { return null; } + @Override public Object getObjectProperty(String string) throws JMSException { return null; } + @Override public Enumeration getPropertyNames() throws JMSException { return null; } + @Override public void setBooleanProperty(String string, boolean b) throws JMSException { } + @Override public void setByteProperty(String string, byte b) throws JMSException { } + @Override public void setShortProperty(String string, short i) throws JMSException { } + @Override public void setIntProperty(String string, int i) throws JMSException { } + @Override public void setLongProperty(String string, long l) throws JMSException { } + @Override public void setFloatProperty(String string, float v) throws JMSException { } + @Override public void setDoubleProperty(String string, double v) throws JMSException { } + @Override public void setStringProperty(String string, String string1) throws JMSException { } + @Override public void setObjectProperty(String string, Object object) throws JMSException { } + @Override public void acknowledge() throws JMSException { } + @Override public void clearBody() throws JMSException { } } @@ -405,6 +470,7 @@ public class JmsInvokerTests extends TestCase { private static class MockSimpleMessageConverter extends SimpleMessageConverter { + @Override public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException { return new MockObjectMessage((Serializable) object); } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java index 450c0889a52..861ff0a52b2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java @@ -49,12 +49,14 @@ public final class SimpleMessageConverter102Tests extends TestCase { messageControl.setVoidCallable(1); message.readBytes(new byte[SimpleMessageConverter102.BUFFER_SIZE]); messageControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[0]; byte[] two = (byte[]) arg1[0]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index 7085c1669b4..6546fd869d5 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -87,12 +87,14 @@ public final class SimpleMessageConverterTests { messageControl.setReturnValue(content.length, 1); message.readBytes(new byte[content.length]); messageControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[0]; byte[] two = (byte[]) arg1[0]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java index 739dbe3d3c2..531ff04c4cf 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java @@ -88,6 +88,7 @@ public class JndiDestinationResolverTests { mockDestinationResolver.replay(); JndiDestinationResolver resolver = new JndiDestinationResolver() { + @Override protected Object lookup(String jndiName, Class requiredClass) throws NamingException { throw new NamingException(); } @@ -114,6 +115,7 @@ public class JndiDestinationResolverTests { mockDestinationResolver.replay(); final JndiDestinationResolver resolver = new JndiDestinationResolver() { + @Override protected Object lookup(String jndiName, Class requiredClass) throws NamingException { throw new NamingException(); } @@ -134,6 +136,7 @@ public class JndiDestinationResolverTests { private boolean called; + @Override protected Object lookup(String jndiName, Class requiredType) throws NamingException { if (called) { fail("Must not be delegating to lookup(..), must be resolving from cache."); @@ -152,6 +155,7 @@ public class JndiDestinationResolverTests { return this.callCount; } + @Override protected Object lookup(String jndiName, Class requiredType) throws NamingException { ++this.callCount; return DESTINATION; diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 0c0b3cb81cf..02996e490f8 100644 --- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java index 66ce8a2b076..573e70e2e99 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java @@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream { } + @Override public int read() throws IOException { return this.sourceStream.read(); } + @Override public void close() throws IOException { super.close(); this.sourceStream.close(); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index 784e160483a..c4d9b9ebb3d 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java index 3f5d5106c36..bb1fa0ee839 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java @@ -116,6 +116,7 @@ public class MockFilterChain implements FilterChain { * Invoke registered {@link javax.servlet.Filter}s and/or {@link javax.servlet.Servlet} also saving the * request and response. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -159,15 +160,18 @@ public class MockFilterChain implements FilterChain { this.delegateServlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.delegateServlet.service(request, response); } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java index 34cafd55fc1..2de79f09c27 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java @@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig { } + @Override public String getFilterName() { return filterName; } + @Override public ServletContext getServletContext() { return servletContext; } @@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java index 7df22ffaf83..8d0b813d481 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -282,20 +282,24 @@ public class MockHttpServletRequest implements HttpServletRequest { // ServletRequest interface // --------------------------------------------------------------------- + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; updateContentTypeHeader(); @@ -315,6 +319,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.content = content; } + @Override public int getContentLength() { return (this.content != null ? this.content.length : -1); } @@ -331,10 +336,12 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getContentType() { return this.contentType; } + @Override public ServletInputStream getInputStream() { if (this.content != null) { return new DelegatingServletInputStream(new ByteArrayInputStream(this.content)); @@ -455,21 +462,25 @@ public class MockHttpServletRequest implements HttpServletRequest { this.parameters.clear(); } + @Override public String getParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -478,6 +489,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.protocol = protocol; } + @Override public String getProtocol() { return this.protocol; } @@ -486,6 +498,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -494,6 +507,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -502,10 +516,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -522,6 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteAddr = remoteAddr; } + @Override public String getRemoteAddr() { return this.remoteAddr; } @@ -530,10 +547,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteHost = remoteHost; } + @Override public String getRemoteHost() { return this.remoteHost; } + @Override public void setAttribute(String name, Object value) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -545,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -579,10 +599,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.locales.addAll(locales); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -591,14 +613,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } @@ -607,6 +632,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remotePort = remotePort; } + @Override public int getRemotePort() { return this.remotePort; } @@ -615,6 +641,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localName = localName; } + @Override public String getLocalName() { return this.localName; } @@ -623,6 +650,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localAddr = localAddr; } + @Override public String getLocalAddr() { return this.localAddr; } @@ -631,6 +659,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localPort = localPort; } + @Override public int getLocalPort() { return this.localPort; } @@ -643,6 +672,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -651,6 +681,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } @@ -699,6 +730,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public long getDateHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -717,20 +749,24 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getStringValue() : null); } + @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList()); } + @Override public Enumeration getHeaderNames() { return Collections.enumeration(this.headers.keySet()); } + @Override public int getIntHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -752,6 +788,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.method = method; } + @Override public String getMethod() { return this.method; } @@ -760,10 +797,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.pathInfo = pathInfo; } + @Override public String getPathInfo() { return this.pathInfo; } + @Override public String getPathTranslated() { return (this.pathInfo != null ? getRealPath(this.pathInfo) : null); } @@ -772,6 +811,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -780,6 +820,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.queryString = queryString; } + @Override public String getQueryString() { return this.queryString; } @@ -788,6 +829,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -796,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains( role))); @@ -805,6 +848,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -813,6 +857,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionId = requestedSessionId; } + @Override public String getRequestedSessionId() { return this.requestedSessionId; } @@ -821,10 +866,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestURI = requestURI; } + @Override public String getRequestURI() { return this.requestURI; } + @Override public StringBuffer getRequestURL() { StringBuffer url = new StringBuffer(this.scheme); url.append("://").append(this.serverName).append(':').append(this.serverPort); @@ -836,6 +883,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.servletPath = servletPath; } + @Override public String getServletPath() { return this.servletPath; } @@ -848,6 +896,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public HttpSession getSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -861,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest { return this.session; } + @Override public HttpSession getSession() { return getSession(true); } @@ -869,6 +919,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -877,6 +928,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromCookie = requestedSessionIdFromCookie; } + @Override public boolean isRequestedSessionIdFromCookie() { return this.requestedSessionIdFromCookie; } @@ -885,10 +937,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromURL = requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromURL() { return this.requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromUrl() { return isRequestedSessionIdFromURL(); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java index c86e95a93a7..5a2b7fd1aa8 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; @@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java index c5096572d02..f7b086c9872 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java index 9ce5f8d5c0b..46924b0893e 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java index c62ec1520d0..d8e8abdf5ef 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java @@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig { } + @Override public String getServletName() { return this.servletName; } + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java index 7851a77e497..70ae2b53ce3 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java @@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return new Vector(this.attributes.keySet()).elements(); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java index b3484a0a83a..1a98d4c6572 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java @@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain { /** * Pass the call on to the Filter/Servlet. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (this.filter != null) { this.filter.doFilter(request, response, this.nextFilterChain); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java index 65cf39acaf5..26bdd97e292 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java @@ -128,6 +128,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -186,6 +187,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); throw new RuntimeException("application exception"); @@ -239,6 +241,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -299,8 +302,10 @@ public class HibernateTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); session.flush(); @@ -348,8 +353,10 @@ public class HibernateTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { throw new RuntimeException("application exception"); } @@ -400,8 +407,10 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { status.setRollbackOnly(); return null; @@ -471,12 +480,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); assertTrue("Not enclosing session", session != holder.getSession()); @@ -538,6 +549,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); @@ -545,6 +557,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -596,6 +609,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -668,6 +682,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -676,6 +691,7 @@ public class HibernateTransactionManagerTests extends TestCase { Session session = sfProxy.openSession(); assertSame(session1, session); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -752,6 +768,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -817,6 +834,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); return l; @@ -890,6 +908,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -970,12 +989,14 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertEquals(tx1, sessionHolder.getTransaction()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -996,6 +1017,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1066,9 +1088,11 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -1086,6 +1110,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -1176,6 +1201,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1185,6 +1211,7 @@ public class HibernateTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1233,6 +1260,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1275,6 +1303,7 @@ public class HibernateTransactionManagerTests extends TestCase { TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session)); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1327,6 +1356,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1370,6 +1400,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1385,6 +1416,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-orm/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index b149254bfd7..cd4a7ef25f4 100644 --- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable { } + @Override public Object get(String name, ObjectFactory objectFactory) { synchronized (this.map) { Object scopedObject = this.map.get(name); @@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public Object remove(String name) { synchronized (this.map) { return this.map.remove(name); } } + @Override public void registerDestructionCallback(String name, Runnable callback) { this.callbacks.add(callback); } + @Override public Object resolveContextualObject(String key) { return null; } @@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public String getConversationId() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java index e957562d6dd..db0b7901baf 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java @@ -528,6 +528,7 @@ public class HibernateInterceptorTests extends TestCase { sessionControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -542,6 +543,7 @@ public class HibernateInterceptorTests extends TestCase { this.sessionFactory = sessionFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.sessionFactory)) { throw new IllegalStateException("Session not bound"); @@ -561,10 +563,12 @@ public class HibernateInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } @@ -573,6 +577,7 @@ public class HibernateInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -584,6 +589,7 @@ public class HibernateInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java index 5b84f9a6f00..7d6a94844bc 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java @@ -136,6 +136,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -145,6 +146,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -154,6 +156,7 @@ public class HibernateJtaTransactionTests { ht = new HibernateTemplate(sf); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); return sess.createQuery("some query string").list(); @@ -246,6 +249,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -255,6 +259,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -265,6 +270,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -338,6 +344,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -347,6 +354,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -357,6 +365,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -442,6 +451,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -449,6 +459,7 @@ public class HibernateJtaTransactionTests { HibernateTemplate ht = new HibernateTemplate(sf); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -578,6 +589,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -589,6 +601,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -679,9 +692,11 @@ public class HibernateJtaTransactionTests { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); try { @@ -693,6 +708,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); @@ -829,6 +845,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -837,6 +854,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session2, innerSession); @@ -844,6 +862,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session innerSession) { if (rollback) { throw new HibernateException(""); @@ -949,6 +968,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -956,6 +976,7 @@ public class HibernateJtaTransactionTests { assertTrue("Has thread session", holder != null); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return null; } @@ -1074,6 +1095,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -1082,6 +1104,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session2, innerSession); @@ -1089,6 +1112,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session innerSession) { if (rollback) { throw new HibernateException(""); @@ -1172,6 +1196,7 @@ public class HibernateJtaTransactionTests { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1181,6 +1206,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -1239,6 +1265,7 @@ public class HibernateJtaTransactionTests { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1248,6 +1275,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -1255,11 +1283,13 @@ public class HibernateJtaTransactionTests { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); // assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -1315,6 +1345,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1368,6 +1399,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1424,6 +1456,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1436,6 +1469,7 @@ public class HibernateJtaTransactionTests { assertTrue("JTA synchronization registered", synchronization != null); Thread thread = new Thread() { + @Override public void run() { synchronization.afterCompletion(Status.STATUS_ROLLEDBACK); } @@ -1451,11 +1485,13 @@ public class HibernateJtaTransactionTests { tt.setReadOnly(true); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1513,6 +1549,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1587,6 +1624,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session1, sess); @@ -1595,6 +1633,7 @@ public class HibernateJtaTransactionTests { }); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session2, sess); @@ -1662,6 +1701,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1725,6 +1765,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 2; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1736,10 +1777,12 @@ public class HibernateJtaTransactionTests { TransactionTemplate tt = new TransactionTemplate(new JtaTransactionManager(ut)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { for (int i = 2; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1813,6 +1856,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1900,6 +1944,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1917,6 +1962,7 @@ public class HibernateJtaTransactionTests { // coordinator. Thread synch = new Thread() { + @Override public void run() { synchronization.beforeCompletion(); synchronization.afterCompletion(Status.STATUS_COMMITTED); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java index 9dcb05b7f66..37539cc0a58 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java @@ -75,6 +75,7 @@ public class HibernateTemplateTests extends TestCase { private MockControl sessionControl; private Session session; + @Override protected void setUp() { sfControl = MockControl.createControl(SessionFactory.class); sf = (SessionFactory) sfControl.getMock(); @@ -100,6 +101,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -124,6 +126,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -150,6 +153,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -178,6 +182,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -195,6 +200,7 @@ public class HibernateTemplateTests extends TestCase { ht.setAllowCreate(false); try { ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return null; } @@ -217,6 +223,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -244,6 +251,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -275,6 +283,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -310,6 +319,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -407,6 +417,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -448,6 +459,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -479,6 +491,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -523,6 +536,7 @@ public class HibernateTemplateTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setCacheQueries(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertNotSame(session, sess); assertTrue(Proxy.isProxyClass(sess.getClass())); @@ -584,6 +598,7 @@ public class HibernateTemplateTests extends TestCase { ht.setCacheQueries(true); ht.setQueryCacheRegion("myRegion"); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertNotSame(session, sess); assertTrue(Proxy.isProxyClass(sess.getClass())); @@ -634,6 +649,7 @@ public class HibernateTemplateTests extends TestCase { ht.setCacheQueries(true); ht.setQueryCacheRegion("myRegion"); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertSame(session, sess); sess.createQuery("some query"); @@ -692,6 +708,7 @@ public class HibernateTemplateTests extends TestCase { ht.setFetchSize(10); ht.setMaxResults(20); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { sess.createQuery("some query"); sess.getNamedQuery("some query name"); @@ -2273,6 +2290,7 @@ public class HibernateTemplateTests extends TestCase { final JDBCConnectionException jcex = new JDBCConnectionException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw jcex; } @@ -2288,6 +2306,7 @@ public class HibernateTemplateTests extends TestCase { final SQLGrammarException sgex = new SQLGrammarException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw sgex; } @@ -2303,6 +2322,7 @@ public class HibernateTemplateTests extends TestCase { final LockAcquisitionException laex = new LockAcquisitionException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw laex; } @@ -2318,6 +2338,7 @@ public class HibernateTemplateTests extends TestCase { final ConstraintViolationException cvex = new ConstraintViolationException("mymsg", sqlEx, "myconstraint"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw cvex; } @@ -2333,6 +2354,7 @@ public class HibernateTemplateTests extends TestCase { final DataException dex = new DataException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw dex; } @@ -2348,6 +2370,7 @@ public class HibernateTemplateTests extends TestCase { final JDBCException jdex = new JDBCException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw jdex; } @@ -2363,6 +2386,7 @@ public class HibernateTemplateTests extends TestCase { final PropertyValueException pvex = new PropertyValueException("mymsg", "myentity", "myproperty"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw pvex; } @@ -2377,6 +2401,7 @@ public class HibernateTemplateTests extends TestCase { try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw new PersistentObjectException(""); } @@ -2389,6 +2414,7 @@ public class HibernateTemplateTests extends TestCase { try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw new TransientObjectException(""); } @@ -2402,6 +2428,7 @@ public class HibernateTemplateTests extends TestCase { final ObjectDeletedException odex = new ObjectDeletedException("msg", "id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw odex; } @@ -2417,6 +2444,7 @@ public class HibernateTemplateTests extends TestCase { qex.setQueryString("query"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw qex; } @@ -2432,6 +2460,7 @@ public class HibernateTemplateTests extends TestCase { final UnresolvableObjectException uoex = new UnresolvableObjectException("id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw uoex; } @@ -2448,6 +2477,7 @@ public class HibernateTemplateTests extends TestCase { final ObjectNotFoundException onfe = new ObjectNotFoundException("id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw onfe; } @@ -2464,6 +2494,7 @@ public class HibernateTemplateTests extends TestCase { final WrongClassException wcex = new WrongClassException("msg", "id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw wcex; } @@ -2480,6 +2511,7 @@ public class HibernateTemplateTests extends TestCase { final NonUniqueResultException nuex = new NonUniqueResultException(2); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw nuex; } @@ -2495,6 +2527,7 @@ public class HibernateTemplateTests extends TestCase { final StaleObjectStateException sosex = new StaleObjectStateException(TestBean.class.getName(), "id"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw sosex; } @@ -2511,6 +2544,7 @@ public class HibernateTemplateTests extends TestCase { final StaleStateException ssex = new StaleStateException("msg"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw ssex; } @@ -2527,6 +2561,7 @@ public class HibernateTemplateTests extends TestCase { final HibernateException hex = new HibernateException("msg"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw hex; } @@ -2545,6 +2580,7 @@ public class HibernateTemplateTests extends TestCase { final GenericJDBCException gjex = new GenericJDBCException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw gjex; } @@ -2572,6 +2608,7 @@ public class HibernateTemplateTests extends TestCase { return new HibernateTemplate(sf); } + @Override protected void tearDown() { try { sfControl.verify(); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java index 4e7e29d6d70..3eff114c3f3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java @@ -117,6 +117,7 @@ public class HibernateTransactionManagerTests extends TestCase { queryControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -136,6 +137,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -196,10 +198,12 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { throw new RuntimeException("application exception"); } @@ -258,11 +262,13 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -339,6 +345,7 @@ public class HibernateTransactionManagerTests extends TestCase { queryControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -359,6 +366,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -416,6 +424,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -429,12 +438,15 @@ public class HibernateTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sfProxy); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -486,12 +498,15 @@ public class HibernateTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { throw new RuntimeException("application exception"); } @@ -548,11 +563,14 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -631,16 +649,19 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertTrue("Not enclosing session", session != holder.getSession()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -710,6 +731,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); @@ -717,6 +739,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -724,6 +747,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -770,6 +794,7 @@ public class HibernateTransactionManagerTests extends TestCase { sessionControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -783,6 +808,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -791,6 +817,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sfProxy); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -854,6 +881,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -873,12 +901,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertSame(session1, session); return null; @@ -886,8 +916,10 @@ public class HibernateTransactionManagerTests extends TestCase { }); assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -955,10 +987,12 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -1036,10 +1070,12 @@ public class HibernateTransactionManagerTests extends TestCase { for (int i = 0; i < 2; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return null; } @@ -1113,6 +1149,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1195,10 +1232,12 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -1279,6 +1318,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1287,6 +1327,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return l; @@ -1370,17 +1411,20 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertEquals(tx1, sessionHolder.getTransaction()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1402,6 +1446,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1410,6 +1455,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1485,15 +1531,18 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); HibernateTemplate ht = new HibernateTemplate(sf); ht.setAllowCreate(false); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1512,12 +1561,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.setAllowCreate(false); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1612,6 +1663,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1621,6 +1673,7 @@ public class HibernateTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1670,6 +1723,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1713,6 +1767,7 @@ public class HibernateTransactionManagerTests extends TestCase { TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session)); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1766,6 +1821,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1809,6 +1865,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1824,6 +1881,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java index 95fb2af9309..0ba20000bf8 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java @@ -67,8 +67,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -80,6 +82,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -99,8 +102,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final RegionFactory regionFactory = new NoCachingRegionFactory(null); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -112,6 +117,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalRegionFactoryProxy.class.getName(), config.getProperty(Environment.CACHE_REGION_FACTORY)); @@ -131,8 +137,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final CacheProvider cacheProvider = new NoCacheProvider(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -145,6 +153,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalCacheProviderProxy.class.getName(), config.getProperty(Environment.CACHE_PROVIDER)); @@ -164,8 +173,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -178,6 +189,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(TransactionAwareDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -200,8 +212,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final TransactionManager tm = (TransactionManager) tmControl.getMock(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -214,6 +228,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalJtaDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -242,8 +257,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addJar(File file) { invocations.add("addResource " + file.getPath()); return this; @@ -251,6 +268,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -274,8 +292,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -288,6 +308,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -313,6 +334,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithValidProperties() throws Exception { final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(UserSuppliedConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -362,6 +384,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { factoryControl.setVoidCallable(1); factoryControl.replay(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) { return sessionFactory; } @@ -378,8 +401,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setInterceptor(Interceptor interceptor) { throw new IllegalArgumentException(interceptor.toString()); } @@ -405,8 +430,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setNamingStrategy(NamingStrategy namingStrategy) { throw new IllegalArgumentException(namingStrategy.toString()); } @@ -431,18 +458,22 @@ public class LocalSessionFactoryBeanTests extends TestCase { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy) { registeredClassCache.setProperty(clazz, concurrencyStrategy); return this; } + @Override public Configuration setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) { registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy); return this; } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -467,17 +498,21 @@ public class LocalSessionFactoryBeanTests extends TestCase { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { // changed from return type 'void' to 'Configuration' in Hibernate 3.6 + @Override public void setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String regionName) { registeredClassCache.setProperty(clazz, concurrencyStrategy + "," + regionName); } + @Override public void setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy, String regionName) { registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy + "," + regionName); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -501,13 +536,16 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithEventListeners() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public void setListener(String type, Object listener) { registeredListeners.put(type, listener); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -526,14 +564,17 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public void setListeners(String type, Object[] listeners) { assertTrue(listeners instanceof MergeEventListener[]); registeredListeners.put(type, new HashSet(Arrays.asList(listeners))); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -594,14 +635,17 @@ public class LocalSessionFactoryBeanTests extends TestCase { public List registeredFilterDefinitions = new LinkedList(); + @Override protected Configuration newConfiguration() throws HibernateException { return new Configuration() { + @Override public void addFilterDefinition(FilterDefinition definition) { registeredFilterDefinitions.add(definition); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -612,6 +656,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { public Mappings mappings; + @Override protected SessionFactory newSessionFactory(Configuration config) { this.mappings = config.createMappings(); return null; @@ -622,9 +667,11 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public static class DummyMergeEventListener implements MergeEventListener { + @Override public void onMerge(MergeEvent event) throws HibernateException { } + @Override public void onMerge(MergeEvent event, Map copiedAlready) throws HibernateException { } } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java index b0d96c7d328..50b8d0631eb 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java @@ -37,6 +37,7 @@ public class HibernateDaoSupportTests extends TestCase { sfControl.replay(); final List test = new ArrayList(); HibernateDaoSupport dao = new HibernateDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -53,6 +54,7 @@ public class HibernateDaoSupportTests extends TestCase { HibernateTemplate template = new HibernateTemplate(); final List test = new ArrayList(); HibernateDaoSupport dao = new HibernateDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java index 3be8ba5f858..dc90981e931 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java @@ -60,6 +60,7 @@ public class LobTypeTests extends TestCase { private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class); private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock(); + @Override protected void setUp() throws SQLException { lobHandler.getLobCreator(); lobHandlerControl.setReturnValue(lobCreator); @@ -613,6 +614,7 @@ public class LobTypeTests extends TestCase { } } + @Override protected void tearDown() { try { rsControl.verify(); 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 e0273f10742..41058bb7c4a 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 @@ -182,6 +182,7 @@ public class OpenSessionInViewTests { asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -422,6 +423,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -429,6 +431,7 @@ public class OpenSessionInViewTests { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(sf2)); @@ -480,6 +483,7 @@ public class OpenSessionInViewTests { filter.init(filterConfig); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); count.incrementAndGet(); @@ -498,6 +502,7 @@ public class OpenSessionInViewTests { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -568,6 +573,7 @@ public class OpenSessionInViewTests { filter.init(filterConfig); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -639,6 +645,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { HibernateTransactionManager tm = new HibernateTransactionManager(sf); TransactionStatus ts = tm.getTransaction( @@ -658,6 +665,7 @@ public class OpenSessionInViewTests { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { @@ -738,6 +746,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { HibernateTransactionManager tm = new HibernateTransactionManager(sf); TransactionStatus ts = tm.getTransaction( @@ -760,6 +769,7 @@ public class OpenSessionInViewTests { }; FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { filter.doFilter(servletRequest, servletResponse, filterChain); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java index c884a39fa4b..c6931097ce5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java @@ -31,9 +31,11 @@ public class ScopedBeanInterceptorTests extends TestCase { final Object realObject = new Object(); ScopedObject scoped = new ScopedObject() { + @Override public Object getTargetObject() { return realObject; } + @Override public void removeFromScope() { // do nothing } @@ -53,9 +55,11 @@ public class ScopedBeanInterceptorTests extends TestCase { final Object proxy = proxyFactory.getProxy(); ScopedObject scoped = new ScopedObject() { + @Override public Object getTargetObject() { return proxy; } + @Override public void removeFromScope() { // do nothing } diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java index c2f9c63ff93..4e4068ce507 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java @@ -88,6 +88,7 @@ public class SqlMapClientTests extends TestCase { template.setSqlMapClient(client); template.afterPropertiesSet(); Object result = template.execute(new SqlMapClientCallback() { + @Override public Object doInSqlMapClient(SqlMapExecutor executor) { assertTrue(executor == session); return "done"; @@ -124,6 +125,7 @@ public class SqlMapClientTests extends TestCase { template.setSqlMapClient(client); template.afterPropertiesSet(); Object result = template.execute(new SqlMapClientCallback() { + @Override public Object doInSqlMapClient(SqlMapExecutor executor) { assertTrue(executor == session); return "done"; @@ -420,6 +422,7 @@ public class SqlMapClientTests extends TestCase { public MockControl executorControl = MockControl.createControl(SqlMapExecutor.class); public SqlMapExecutor executor = (SqlMapExecutor) executorControl.getMock(); + @Override public Object execute(SqlMapClientCallback action) throws DataAccessException { try { return action.doInSqlMapClient(executor); @@ -433,6 +436,7 @@ public class SqlMapClientTests extends TestCase { private static class TestRowHandler implements RowHandler { + @Override public void handleRow(Object row) { } } diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java index 6732ddcd548..c0b9717a22a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java @@ -55,6 +55,7 @@ public class LobTypeHandlerTests extends TestCase { private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class); private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock(); + @Override protected void setUp() throws SQLException { rs.findColumn("column"); rsControl.setReturnValue(1); @@ -170,9 +171,11 @@ public class LobTypeHandlerTests extends TestCase { lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()), 1); lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray()); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] o1, Object[] o2) { return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]); } + @Override public String toString(Object[] objects) { return null; } @@ -224,6 +227,7 @@ public class LobTypeHandlerTests extends TestCase { } } + @Override protected void tearDown() { try { rsControl.verify(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java index a07a672b09f..b7a1a64631d 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java @@ -94,6 +94,7 @@ public class JdoInterceptorTests extends TestCase { this.persistenceManagerFactory = persistenceManagerFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.persistenceManagerFactory)) { throw new IllegalStateException("PersistenceManager not bound"); @@ -101,6 +102,7 @@ public class JdoInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -117,10 +119,12 @@ public class JdoInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return getMethod(); } @@ -136,6 +140,7 @@ public class JdoInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java index 5ac6d360421..890fdb1f8c6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java @@ -50,6 +50,7 @@ public class JdoTemplateTests extends TestCase { private MockControl pmControl; private PersistenceManager pm; + @Override protected void setUp() { pmfControl = MockControl.createControl(PersistenceManagerFactory.class); pmf = (PersistenceManagerFactory) pmfControl.getMock(); @@ -59,6 +60,7 @@ public class JdoTemplateTests extends TestCase { pmfControl.setReturnValue(null, 1); } + @Override protected void tearDown() { try { pmfControl.verify(); @@ -75,6 +77,7 @@ public class JdoTemplateTests extends TestCase { jt.setAllowCreate(false); try { jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return null; } @@ -96,6 +99,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -116,6 +120,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -136,6 +141,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -620,6 +626,7 @@ public class JdoTemplateTests extends TestCase { public void testTemplateExceptions() { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOObjectNotFoundException(); } @@ -632,6 +639,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOOptimisticVerificationException(); } @@ -644,6 +652,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDODataStoreException(); } @@ -656,6 +665,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOFatalDataStoreException(); } @@ -668,6 +678,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOUserException(); } @@ -680,6 +691,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOFatalUserException(); } @@ -692,6 +704,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOException(); } @@ -714,6 +727,7 @@ public class JdoTemplateTests extends TestCase { JdoTemplate template = createTemplate(); template.setJdoDialect(dialect); template.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw ex; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java index 204d4e1b31d..a7ab5fa9e69 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java @@ -67,6 +67,7 @@ public class JdoTransactionManagerTests extends TestCase { private Transaction tx; + @Override protected void setUp() { pmfControl = MockControl.createControl(PersistenceManagerFactory.class); pmf = (PersistenceManagerFactory) pmfControl.getMock(); @@ -78,6 +79,7 @@ public class JdoTransactionManagerTests extends TestCase { pmfControl.setReturnValue(null, 1); } + @Override protected void tearDown() { try { pmfControl.verify(); @@ -123,6 +125,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); @@ -149,6 +152,7 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -188,10 +192,12 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -232,10 +238,12 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -278,10 +286,12 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return null; @@ -318,6 +328,7 @@ public class JdoTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -329,9 +340,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -365,6 +378,7 @@ public class JdoTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -376,9 +390,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -418,6 +434,7 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -433,9 +450,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -478,6 +497,7 @@ public class JdoTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -492,9 +512,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -534,6 +556,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -549,15 +572,18 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { return null; } }); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -604,11 +630,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); pm2.flush(); @@ -616,6 +644,7 @@ public class JdoTransactionManagerTests extends TestCase { } }); Object result = jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); pm2.flush(); @@ -667,6 +696,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { utControl.verify(); @@ -692,15 +722,18 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { return null; } }); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -737,11 +770,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Is not new transaction", !status.isNewTransaction()); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -770,6 +805,7 @@ public class JdoTransactionManagerTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -806,10 +842,12 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -868,11 +906,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -938,11 +978,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -1004,6 +1046,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Hasn't thread con", !TransactionSynchronizationManager.hasResource(ds)); @@ -1011,6 +1054,7 @@ public class JdoTransactionManagerTests extends TestCase { jt.setPersistenceManagerFactory(pmf); jt.setJdoDialect(dialect); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -1104,6 +1148,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); @@ -1113,6 +1158,7 @@ public class JdoTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1122,6 +1168,7 @@ public class JdoTransactionManagerTests extends TestCase { } JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -1193,6 +1240,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); @@ -1201,6 +1249,7 @@ public class JdoTransactionManagerTests extends TestCase { jt.setExposeNativePersistenceManager(true); } return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { if (exposeNativePm) { assertSame(pm, pm2); @@ -1249,6 +1298,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); status.flush(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java index 5ad9c14d397..c5a20a83b15 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java @@ -37,6 +37,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class); final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock(); LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { return pmf; } @@ -73,6 +74,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithInvalidProperty() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { throw new IllegalArgumentException((String) props.get("myKey")); } @@ -92,6 +94,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithFile() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { throw new IllegalArgumentException((String) props.get("myKey")); } @@ -109,6 +112,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithName() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(String name) { throw new IllegalArgumentException(name); } @@ -126,6 +130,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithNameAndProperties() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(String name) { throw new IllegalArgumentException(name); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java index 99a55063d45..cfbd52a4164 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java @@ -40,6 +40,7 @@ public class JdoDaoSupportTests extends TestCase { pmfControl.replay(); final List test = new ArrayList(); JdoDaoSupport dao = new JdoDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -56,6 +57,7 @@ public class JdoDaoSupportTests extends TestCase { JdoTemplate template = new JdoTemplate(); final List test = new ArrayList(); JdoDaoSupport dao = new JdoDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java index c01d831d8a4..7a5784ac93c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java @@ -146,6 +146,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(pmf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -153,6 +154,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(pmf2)); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index 177734aee69..225289d63a6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -80,10 +80,12 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase { return emf; } + @Override public PersistenceUnitInfo getPersistenceUnitInfo() { throw new UnsupportedOperationException(); } + @Override public String getPersistenceUnitName() { return "test"; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java index e453aad9b53..15148f29c65 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java @@ -65,6 +65,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests extends Abstr return null; } + @Override protected String[] getConfigLocations() { Provider provider = getProvider(); switch (provider) { diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java index 8bea2144035..d145444a7b9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java @@ -35,10 +35,12 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; public class DefaultJpaDialectTests extends TestCase { JpaDialect dialect; + @Override protected void setUp() throws Exception { dialect = new DefaultJpaDialect(); } + @Override protected void tearDown() throws Exception { dialect = null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java index a94be01f20a..f2f545dcf94 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java @@ -242,6 +242,7 @@ public class JpaInterceptorTests extends TestCase { this.entityManagerFactory = entityManagerFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.entityManagerFactory)) { throw new IllegalStateException("Session not bound"); @@ -261,10 +262,12 @@ public class JpaInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } @@ -273,6 +276,7 @@ public class JpaInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -284,6 +288,7 @@ public class JpaInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java index c78959f5cc9..41bb0352694 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java @@ -44,6 +44,7 @@ public class JpaTemplateTests extends TestCase { private EntityManagerFactory factory; + @Override protected void setUp() throws Exception { template = new JpaTemplate(); @@ -57,6 +58,7 @@ public class JpaTemplateTests extends TestCase { } + @Override protected void tearDown() throws Exception { template = null; factoryControl = null; @@ -95,6 +97,7 @@ public class JpaTemplateTests extends TestCase { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; @@ -104,6 +107,7 @@ public class JpaTemplateTests extends TestCase { template.setExposeNativeEntityManager(false); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertNotSame(em, manager); return null; @@ -128,6 +132,7 @@ public class JpaTemplateTests extends TestCase { try { template.executeFind(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return new Object(); @@ -161,6 +166,7 @@ public class JpaTemplateTests extends TestCase { factoryControl.replay(); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; @@ -183,6 +189,7 @@ public class JpaTemplateTests extends TestCase { try { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java index 722f25adfee..e9ba8b86851 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java @@ -60,6 +60,7 @@ public class JpaTransactionManagerTests extends TestCase { private TransactionTemplate tt; + @Override protected void setUp() throws Exception { factoryControl = MockControl.createControl(EntityManagerFactory.class); factory = (EntityManagerFactory) factoryControl.getMock(); @@ -80,6 +81,7 @@ public class JpaTransactionManagerTests extends TestCase { manager.close(); } + @Override protected void tearDown() throws Exception { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -106,9 +108,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -146,9 +150,11 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -188,9 +194,11 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("some exception"); } @@ -229,9 +237,11 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("some exception"); } @@ -269,10 +279,12 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); Object res = template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -307,6 +319,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.getRollbackOnly(), false); @@ -316,9 +329,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -351,6 +366,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.isActive(), true, 2); @@ -360,8 +376,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("exception"); } @@ -400,6 +418,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.isActive(), true); @@ -412,9 +431,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -462,6 +483,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -476,8 +498,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -517,6 +541,7 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -531,6 +556,7 @@ public class JpaTransactionManagerTests extends TestCase { JpaTemplate template2 = new JpaTemplate(factory); template2.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { return null; } @@ -538,8 +564,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -582,13 +610,16 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.hasResource(factory)); TransactionTemplate tt2 = new TransactionTemplate(transactionManager); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); return tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -630,9 +661,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JpaTemplate template2 = new JpaTemplate(factory); template2.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { return null; } @@ -642,8 +675,10 @@ public class JpaTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(transactionManager); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); return tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -694,18 +729,23 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return null; } }); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return null; @@ -750,11 +790,13 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(!TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -790,11 +832,13 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(!TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return null; @@ -836,10 +880,12 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { return l; } @@ -881,10 +927,12 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { return null; } @@ -929,11 +977,13 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -976,11 +1026,13 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return null; @@ -1026,10 +1078,12 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -1063,6 +1117,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -1092,6 +1147,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); status.flush(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java index 89c41cdc24c..a0ebba76b67 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java @@ -366,12 +366,14 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM private static class DummyContainerPersistenceProvider implements PersistenceProvider { + @Override public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) { actualPui = pui; actualProps = map; return mockEmf; } + @Override public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) { throw new UnsupportedOperationException(); } @@ -380,23 +382,29 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM private static class NoOpEntityTransaction implements EntityTransaction { + @Override public void begin() { } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { throw new UnsupportedOperationException(); } + @Override public boolean getRollbackOnly() { return false; } + @Override public boolean isActive() { return false; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java index ad68b90a6f9..8371e18766b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java @@ -80,10 +80,12 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac protected static class DummyPersistenceProvider implements PersistenceProvider { + @Override public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) { throw new UnsupportedOperationException(); } + @Override public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) { actualName = emfName; actualProps = properties; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index 4e092f7ffc3..67f586adb06 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo; */ public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return ECLIPSELINK_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java index e7a439080a1..8759b3710b9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java @@ -45,6 +45,7 @@ public class HibernateEntityManagerFactoryIntegrationTests extends this.sessionFactory = sessionFactory; } + @Override protected String[] getConfigLocations() { return HIBERNATE_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java index 65147c04d14..8e66b709713 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java @@ -40,6 +40,7 @@ public class HibernateMultiEntityManagerFactoryIntegrationTests extends this.entityManagerFactory2 = entityManagerFactory2; } + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml", diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java index fbdb0eda301..68e82f5f800 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java @@ -39,6 +39,7 @@ import org.springframework.transaction.support.TransactionTemplate; */ public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return OPENJPA_CONFIG_LOCATIONS; } @@ -62,6 +63,7 @@ public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContain TransactionTemplate tt = new TransactionTemplate(transactionManager); tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { Person tony = new Person(); tony.setFirstName("Tony"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java index 3b1f71ba3c9..20d9e5f029b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java @@ -32,6 +32,7 @@ import org.junit.Ignore; @Ignore("this test causes gradle to hang") public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml", diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java index ec65890b884..28b03587ab9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java @@ -38,6 +38,7 @@ public class JpaDaoSupportTests extends TestCase { mockControl.replay(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -56,6 +57,7 @@ public class JpaDaoSupportTests extends TestCase { mockControl.replay(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -73,6 +75,7 @@ public class JpaDaoSupportTests extends TestCase { JpaTemplate template = new JpaTemplate(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index 06fdf973115..3431e4a4216 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -163,6 +163,7 @@ public class OpenEntityManagerInViewTests extends TestCase { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -257,6 +258,7 @@ public class OpenEntityManagerInViewTests extends TestCase { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -264,6 +266,7 @@ public class OpenEntityManagerInViewTests extends TestCase { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); @@ -323,6 +326,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final AtomicInteger count = new AtomicInteger(0); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -333,6 +337,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final AtomicInteger count2 = new AtomicInteger(0); final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); @@ -355,6 +360,7 @@ public class OpenEntityManagerInViewTests extends TestCase { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index f8af85a5845..4675422aab0 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -734,14 +734,17 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @PersistenceContext private EntityManager em; + @Override public Object getObject() throws Exception { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } @@ -785,6 +788,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @SuppressWarnings("serial") public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter { + @Override @PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED) public void setEntityManager(EntityManager em) { super.setEntityManager(em); @@ -880,6 +884,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public static boolean closed; + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if ("isOpen".equals(method.getName())) { return true; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java index d69241996e2..64e43ed7d4f 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java @@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo; */ public class TopLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return TOPLINK_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java index c3350e0e255..78e8f86af5b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java @@ -44,6 +44,7 @@ public class TopLinkMultiEntityManagerFactoryIntegrationTests extends this.entityManagerFactory2 = entityManagerFactory2; } + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml", diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java index 5da624d1cb7..8cb7fd87440 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java @@ -172,6 +172,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst * message will be written to the log. * @see #injectDependencies() */ + @Override protected void prepareTestInstance() throws Exception { if (getApplicationContext() == null) { if (this.logger.isInfoEnabled()) { diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java index e1365de448f..b99e20d03fc 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java @@ -95,6 +95,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * This implementation is final. Override {@code onSetUp} for custom behavior. * @see #onSetUp() */ + @Override protected final void setUp() throws Exception { // lazy load, in case getApplicationContext() has not yet been called. if (this.applicationContext == null) { @@ -136,6 +137,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * custom behavior. * @see #onTearDown() */ + @Override protected final void tearDown() throws Exception { onTearDown(); } @@ -168,6 +170,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * {@code contextKey()} returns. * @see #getConfigLocations() */ + @Override protected ConfigurableApplicationContext loadContext(Object key) throws Exception { return loadContextLocations((String[]) key); } diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java index f159866bc06..1f0b6123dbd 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java @@ -120,6 +120,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests * cleared, as a defensive measure against accidental permanent wiping of a database. * @see org.springframework.test.AbstractTransactionalSpringContextTests#setComplete() */ + @Override protected final void setComplete() { if (this.zappedTables) { throw new IllegalStateException("Cannot set complete after deleting tables"); diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java index b0030de7835..e45774e1c9e 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java @@ -187,6 +187,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe * @throws Exception simply let any exception propagate * @see #onTearDown() */ + @Override protected void onSetUp() throws Exception { this.complete = !this.isRollback(); @@ -250,6 +251,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe * @throws Exception simply let any exception propagate * @see #onSetUp() */ + @Override protected void onTearDown() throws Exception { // Call onTearDownInTransaction and end transaction if the transaction // is still active. diff --git a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java index 9fd31193154..8c9dc686d94 100644 --- a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java +++ b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java @@ -66,6 +66,7 @@ public abstract class ConditionalTestCase extends TestCase { super(name); } + @Override public void runBare() throws Throwable { // getName will return the name of the method being run if (isDisabledInThisEnvironment(getName())) { diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index 93b25efcc51..fa6dd008a0a 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -173,6 +173,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends // Let JUnit handle execution. We're just changing the state of the test class first. runTestTimed(new TestExecutionCallback() { + @Override public void run() throws Throwable { try { AbstractAnnotationAwareTransactionalTests.super.runBare(); diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java index f806acc1ff6..7bd17b9bd5c 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java @@ -50,6 +50,7 @@ public class SystemProfileValueSource implements ProfileValueSource { * system properties. * @see System#getProperty(String) */ + @Override public String get(String key) { Assert.hasText(key, "'key' must not be empty"); return System.getProperty(key); diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java index f351a00dfa7..b4cb804032a 100644 --- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -331,6 +331,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio this.ltw = ltw; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof LocalContainerEntityManagerFactoryBean) { ((LocalContainerEntityManagerFactoryBean) bean).setLoadTimeWeaver(this.ltw); @@ -352,6 +353,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio this.shadowingClassLoader = shadowingClassLoader; } + @Override public void addTransformer(ClassFileTransformer transformer) { try { Method addClassFileTransformer = @@ -364,10 +366,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio } } + @Override public ClassLoader getInstrumentableClassLoader() { return this.shadowingClassLoader; } + @Override public ClassLoader getThrowawayClassLoader() { // Be sure to copy the same resource overrides and same class file transformers: // We want the throwaway class loader to behave like the instrumentable class loader. diff --git a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java index c9c8709c48b..de79edcd747 100644 --- a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction { private Synchronization synchronization; + @Override public int getStatus() { return Status.STATUS_ACTIVE; } + @Override public void registerSynchronization(Synchronization synchronization) { this.synchronization = synchronization; } @@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction { return synchronization; } + @Override public boolean enlistResource(XAResource xaResource) { return false; } + @Override public boolean delistResource(XAResource xaResource, int i) { return false; } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { } 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 a550a4daedb..9255438766b 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 @@ -206,6 +206,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { private void testSupportsPrimitives() { final Primitives primitives = new Primitives(); ReflectionUtils.doWithMethods(Primitives.class, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Type returnType = method.getGenericReturnType(); assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(9) + ">", @@ -220,6 +221,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { } } }, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method method) { return method.getName().startsWith("primitive"); } @@ -229,6 +231,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { private void testSupportsStandardClasses() throws Exception { final StandardClasses standardClasses = new StandardClasses(); ReflectionUtils.doWithMethods(StandardClasses.class, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Type returnType = method.getGenericReturnType(); assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(13) + ">", @@ -243,6 +246,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { } } }, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method method) { return method.getName().startsWith("standardClass"); } diff --git a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java index 68dda908f51..e89fe77b455 100644 --- a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java +++ b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java @@ -34,6 +34,7 @@ public class TestAction extends Action implements BeanNameAware { private String beanName; + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java index 66e5e064ef0..56d4c5b40dd 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java @@ -120,10 +120,12 @@ public class DefaultMvcResultTests { this.asyncStarted = asyncStarted; } + @Override public boolean isAsyncStarted() { return this.asyncStarted; } + @Override public AsyncContext getAsyncContext() { return asyncContext; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java index c86e2901371..60426d8075c 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java @@ -60,30 +60,37 @@ public class StubMvcResult implements MvcResult { this.response = response; } + @Override public MockHttpServletRequest getRequest() { return request; } + @Override public Object getHandler() { return handler; } + @Override public HandlerInterceptor[] getInterceptors() { return interceptors; } + @Override public Exception getResolvedException() { return resolvedException; } + @Override public ModelAndView getModelAndView() { return mav; } + @Override public FlashMap getFlashMap() { return flashMap; } + @Override public MockHttpServletResponse getResponse() { return response; } @@ -120,10 +127,12 @@ public class StubMvcResult implements MvcResult { this.response = response; } + @Override public Object getAsyncResult() { return null; } + @Override public Object getAsyncResult(long timeout) { return null; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java index 926942869af..9320acd338b 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java @@ -392,6 +392,7 @@ public class MockHttpServletRequestBuilderTests { private final class User implements Principal { + @Override public String getName() { return "Foo"; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index 0eea8533762..5902cb5e94f 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -63,6 +63,7 @@ public class PrintingResultHandlerTests { public void setup() { this.handler = new TestPrintingResultHandler(); this.request = new MockHttpServletRequest("GET", "/") { + @Override public boolean isAsyncStarted() { return false; } @@ -228,11 +229,13 @@ public class PrintingResultHandlerTests { private Map> printedValues = new HashMap>(); + @Override public void printHeading(String heading) { this.printedHeading = heading; this.printedValues.put(heading, new HashMap()); } + @Override public void printValue(String label, Object value) { Assert.notNull(this.printedHeading, "Heading not printed before label " + label + " with value " + value); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java index 0a22f71ac09..f021e1355a2 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java @@ -97,6 +97,7 @@ public class AsyncTests { @ResponseBody public Callable getCallable(final Model model) { return new Callable() { + @Override public Person call() throws Exception { return new Person("Joe"); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java index 56539b99218..de8760c8792 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java @@ -151,6 +151,7 @@ public class FilterTests { @Override public Principal getUserPrincipal() { return new Principal() { + @Override public String getName() { return PRINCIPAL_NAME; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java index b62a0e3dedc..b36043a7e43 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java @@ -82,6 +82,7 @@ public class RequestBuilderTests { return this; } + @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { for (String headerName : this.headers.keySet()) { request.addHeader(headerName, this.headers.get(headerName)); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java index 9282d4885a9..eaf01a5782a 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java @@ -253,10 +253,12 @@ public class ConditionalDelegatingFilterProxyTests { private FilterChain chain; private boolean destroy; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.request = request; @@ -264,6 +266,7 @@ public class ConditionalDelegatingFilterProxyTests { this.chain = chain; } + @Override public void destroy() { this.destroy = true; } diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java index d84f85d0964..66e2624f05c 100644 --- a/spring-test/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] { spouse }; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -369,12 +383,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } @@ -382,6 +398,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -419,6 +438,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java index e627a333be2..a254398c4ed 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java @@ -143,6 +143,7 @@ public class MockFilterChainTests { this.servlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { @@ -156,9 +157,11 @@ public class MockFilterChainTests { } } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } } diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java index eb8f362d56d..f02ce343039 100644 --- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java @@ -54,6 +54,7 @@ public abstract class AbstractSpr3350SingleSpringContextTests extends AbstractDe * * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigPath() */ + @Override protected abstract String getConfigPath(); /** diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java index d0da3c8e5ad..a8908bfd8f0 100644 --- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java @@ -44,6 +44,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3 * * @see org.springframework.test.AbstractSingleSpringContextTests#createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext) */ + @Override protected final BeanDefinitionReader createBeanDefinitionReader(GenericApplicationContext context) { return new PropertiesBeanDefinitionReader(context); } @@ -52,6 +53,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3 * Returns * "PropertiesBasedSpr3350SingleSpringContextTests-context.properties". */ + @Override protected final String getConfigPath() { return "PropertiesBasedSpr3350SingleSpringContextTests-context.properties"; } diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java index ab6e42dc68c..1872385e619 100644 --- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java @@ -57,6 +57,7 @@ public class Spr3264DependencyInjectionSpringContextTests extends AbstractDepend // Assert changes to AbstractDependencyInjectionSpringContextTests: new AssertThrows(IllegalStateException.class) { + @Override public void test() throws Exception { Spr3264DependencyInjectionSpringContextTests.super.injectDependencies(); } diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java index 8143c775115..9701ab3364a 100644 --- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java @@ -38,6 +38,7 @@ public class XmlBasedSpr3350SingleSpringContextTests extends AbstractSpr3350Sing /** * Returns "XmlBasedSpr3350SingleSpringContextTests-context.xml". */ + @Override protected final String getConfigPath() { return "XmlBasedSpr3350SingleSpringContextTests-context.xml"; } diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java index 580b873b10b..1568b6fbacb 100644 --- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java +++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java @@ -138,6 +138,7 @@ public class ProfileValueAnnotationAwareTransactionalTests extends TestCase { public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java index aace2b29a41..fdfa4eb4ac8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java @@ -447,12 +447,14 @@ public class ContextLoaderUtilsTests { private static class FooInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } private static class BarInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericWebApplicationContext applicationContext) { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java index 9bd67303ba5..35b64fa432b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java @@ -369,12 +369,14 @@ public class MergedContextConfigurationTests { private static class FooInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } private static class BarInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java index 8ae941c107e..d27e3ca50d5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java @@ -146,6 +146,7 @@ public class SpringRunnerContextCacheTests { java.util.Collections.sort(testMethods, new Comparator() { + @Override public int compare(FrameworkMethod method1, FrameworkMethod method2) { return method1.getName().compareTo(method2.getName()); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java index b1a0a4e5514..70778c7f1c4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java @@ -109,10 +109,12 @@ public class ConcreteTransactionalJUnit38SpringContextTests extends AbstractTran return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java index 39cf8624ad5..85a7c0a244c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java @@ -187,6 +187,7 @@ public class ProfileValueJUnit38SpringContextTests extends TestCase { public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(final String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java index 1c18259f1f9..a9ce65e0d3f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java @@ -42,22 +42,27 @@ public class ClassLevelDisabledSpringRunnerTests { public static class CustomTestExecutionListener implements TestExecutionListener { + @Override public void beforeTestClass(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void prepareTestInstance(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void beforeTestMethod(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void afterTestMethod(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void afterTestClass(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java index 01ec43a2fd1..59ad1be4f5f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java @@ -104,6 +104,7 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override @Resource public void setDataSource(DataSource dataSource) { super.setDataSource(dataSource); @@ -119,10 +120,12 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans this.bar = bar; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java index 8e422e1c0cd..72a98004def 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java @@ -48,6 +48,7 @@ public class HardCodedProfileValueSourceSpringRunnerTests extends EnabledAndIgno public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(final String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java index 22f0c6ebe81..c41eb332386 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java @@ -53,6 +53,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e countRowsInPersonTable(simpleJdbcTemplate)); } + @Override @Before public void verifyInitialTestData() { clearPersonTable(simpleJdbcTemplate); @@ -61,6 +62,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e countRowsInPersonTable(simpleJdbcTemplate)); } + @Override @Test @Transactional @Rollback(false) diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java index 85af698bd33..c65ab7c9394 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java @@ -136,14 +136,17 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa // ------------------------------------------------------------------------| + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public final void setApplicationContext(final ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java index 64d8cf2e483..f5424607d56 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java @@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext; */ public class DevProfileInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles("dev"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java index 0f0858c4baa..1259b82d83d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java @@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext; */ public class FooBarAliasInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.registerAlias("foo", "bar"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java index 3c0b074a812..5d1459c4ce7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java @@ -53,6 +53,7 @@ public class InitializerWithoutConfigFilesOrClassesTest { static class EntireAppInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { new AnnotatedBeanDefinitionReader(applicationContext).register(GlobalConfig.class); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java index 30fe35276fc..0bc08e1c458 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java @@ -34,6 +34,7 @@ import org.springframework.test.context.junit4.aci.DevProfileInitializer; @ContextConfiguration(initializers = DevProfileInitializer.class) public class MergedInitializersAnnotationConfigTests extends SingleInitializerAnnotationConfigTests { + @Override @Test public void activeBeans() { assertEquals("foo", foo); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java index d3fcf1dd820..2eac43320f4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java @@ -125,10 +125,12 @@ public class OrderedInitializersAnnotationConfigTests { static class OrderedOneInitializer implements ApplicationContextInitializer, Ordered { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles(PROFILE_ONE); } + @Override public int getOrder() { return 1; } @@ -137,6 +139,7 @@ public class OrderedInitializersAnnotationConfigTests { @Order(2) static class OrderedTwoInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles(PROFILE_TWO); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java index 994b886b30e..bb90b212fdf 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java @@ -39,11 +39,13 @@ public class HibernatePersonRepository implements PersonRepository { this.sessionFactory = sessionFactory; } + @Override public Person save(Person person) { this.sessionFactory.getCurrentSession().save(person); return person; } + @Override public Person findByName(String name) { return (Person) this.sessionFactory.getCurrentSession().createQuery( "from Person person where person.name = :name").setString("name", name).uniqueResult(); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java index 039faa6894f..b6247e4a7e1 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java @@ -41,10 +41,12 @@ public class StandardPersonService implements PersonService { this.personRepository = personRepository; } + @Override public Person findByName(String name) { return this.personRepository.findByName(name); } + @Override @Transactional(readOnly = false) public Person save(Person person) { return this.personRepository.save(person); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java index de9e21b2e35..cd20e40f3f5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java @@ -50,6 +50,7 @@ public class LookUpTxMgrViaTransactionManagementConfigurerTests { @Configuration static class Config implements TransactionManagementConfigurer { + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager1(); } diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java index 27a08c054c2..f395a90a66e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java @@ -90,10 +90,12 @@ public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTrans return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override public void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java index 66318987d00..09d76fb8832 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java @@ -123,27 +123,34 @@ public class FailingBeforeAndAfterMethodsTests { int failedConfigurationsCount = 0; + @Override public void onFinish(ITestContext testContext) { this.failedConfigurationsCount += testContext.getFailedConfigurations().size(); } + @Override public void onStart(ITestContext testContext) { } + @Override public void onTestFailedButWithinSuccessPercentage(ITestResult testResult) { } + @Override public void onTestFailure(ITestResult testResult) { this.testFailureCount++; } + @Override public void onTestSkipped(ITestResult testResult) { } + @Override public void onTestStart(ITestResult testResult) { this.testStartCount++; } + @Override public void onTestSuccess(ITestResult testResult) { this.testSuccessCount++; } diff --git a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java index 5a1a8421dda..334983d8076 100644 --- a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java @@ -66,6 +66,7 @@ public abstract class AbstractBasicWacTests implements ServletContextAware { protected String foo; + @Override public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; } diff --git a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java index 8713dbe5ee6..13f3b5d360d 100644 --- a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java +++ b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java @@ -34,21 +34,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java index 5b64657360d..7e10a054531 100644 --- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java @@ -86,6 +86,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "id", null, long.class); } @@ -94,6 +95,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "age", null, int.class); } @@ -102,6 +104,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "likesPets", null, boolean.class); } @@ -187,6 +190,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "id", null, long.class); } @@ -195,6 +199,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "age", null, int.class); } @@ -203,6 +208,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "likesPets", null, boolean.class); } diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index e2bfda3f1d6..c1be3a57455 100644 --- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java index 8099156006c..9142a73b5bc 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java @@ -167,12 +167,14 @@ public class PersistenceExceptionTranslationAdvisorTests extends TestCase { this.runtimeException = rex; } + @Override public void noThrowsClause() { if (runtimeException != null) { throw runtimeException; } } + @Override public void throwsPersistenceException() throws PersistenceException { if (runtimeException != null) { throw runtimeException; diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java index 3b759466a57..2bd949d3ad1 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java @@ -114,6 +114,7 @@ public class PersistenceExceptionTranslationPostProcessorTests extends TestCase public static class RepositoryWithoutInterfaceAndOtherwiseAdvised extends StereotypedRepositoryInterfaceImpl implements Additional { + @Override public void additionalMethod() { } } diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java index e0a4523bfb2..bdab740fbaa 100644 --- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java @@ -270,6 +270,7 @@ public class DataAccessUtilsTests extends TestCase { this.translations.put(in, out); } + @Override public DataAccessException translateExceptionIfPossible(RuntimeException ex) { return (DataAccessException) translations.get(ex); } diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java index 16f1012a75e..ce88bbf03d0 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java @@ -81,6 +81,7 @@ public class CciLocalTransactionTests { TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory)); CciTemplate ct = new CciTemplate(connectionFactory); @@ -131,6 +132,7 @@ public class CciLocalTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory)); CciTemplate ct = new CciTemplate(connectionFactory); diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java index 50bdd4c2de7..f8a72506215 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java @@ -153,6 +153,7 @@ public class CciTemplateTests { CciTemplate ct = new CciTemplate(connectionFactory); ct.setOutputRecordCreator(new RecordCreator() { + @Override public Record createRecord(RecordFactory recordFactory) { assertTrue(recordFactory instanceof NotSupportedRecordFactory); return outputRecord; diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java index bd8f7fb5d00..a7e40c6bf4b 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java @@ -233,10 +233,12 @@ public class EisOperationTests { this.callDetector = callDetector; } + @Override protected Record createInputRecord(RecordFactory recordFactory, Object inputObject) { return this.callDetector.callCreateInputRecord(recordFactory, inputObject); } + @Override protected Object extractOutputData(Record outputRecord) throws ResourceException { return this.callDetector.callExtractOutputData(outputRecord); } diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 0c0b3cb81cf..02996e490f8 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index c78fdcf43cb..ecacf398aae 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -112,6 +112,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -157,6 +158,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -206,6 +208,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -215,6 +218,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { ptm.setJndiTemplate(new ExpectedLookupTemplate("java:comp/UserTransaction", ut2)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -232,6 +236,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { * Prevent any side-effects due to this test modifying ThreadLocals that might * affect subsequent tests when all tests are run in the same JVM, as with Eclipse. */ + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java index 480b869d3aa..b2522b08a87 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java @@ -78,6 +78,7 @@ public class JtaTransactionManagerTests extends TestCase { assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -124,6 +125,7 @@ public class JtaTransactionManagerTests extends TestCase { ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -156,6 +158,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -197,6 +200,7 @@ public class JtaTransactionManagerTests extends TestCase { assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -242,6 +246,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setTimeout(10); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -277,6 +282,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -308,6 +314,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -342,6 +349,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -383,6 +391,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -421,6 +430,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -454,6 +464,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -500,6 +511,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -538,6 +550,7 @@ public class JtaTransactionManagerTests extends TestCase { ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -566,6 +579,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -598,6 +612,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -630,6 +645,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -657,6 +673,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -682,6 +699,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -713,6 +731,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -757,6 +776,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals("txName", TransactionSynchronizationManager.getCurrentTransactionName()); @@ -767,6 +787,7 @@ public class JtaTransactionManagerTests extends TestCase { tt2.setReadOnly(true); tt2.setName("txName2"); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals("txName2", TransactionSynchronizationManager.getCurrentTransactionName()); @@ -804,6 +825,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -812,6 +834,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(ptm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -854,6 +877,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -882,6 +906,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -921,6 +946,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -958,6 +984,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -980,6 +1007,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -1005,6 +1033,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1029,6 +1058,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1057,6 +1087,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1079,6 +1110,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1106,6 +1138,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1132,6 +1165,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1162,9 +1196,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK); } @@ -1218,9 +1254,11 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK); } @@ -1266,9 +1304,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1302,9 +1342,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1338,9 +1380,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1373,8 +1417,10 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1404,6 +1450,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); } @@ -1430,9 +1477,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1562,6 +1611,7 @@ public class JtaTransactionManagerTests extends TestCase { * Prevent any side-effects due to this test modifying ThreadLocals that might * affect subsequent tests when all tests are run in the same JVM, as with Eclipse. */ + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java index f810e715b9b..7c250610542 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java @@ -30,6 +30,7 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr private TransactionStatus status; + @Override public Object execute(TransactionDefinition definition, TransactionCallback callback) throws TransactionException { this.definition = definition; this.status = new SimpleTransactionStatus(); @@ -45,14 +46,17 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr } + @Override public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void commit(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java index c9c8709c48b..de79edcd747 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction { private Synchronization synchronization; + @Override public int getStatus() { return Status.STATUS_ACTIVE; } + @Override public void registerSynchronization(Synchronization synchronization) { this.synchronization = synchronization; } @@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction { return synchronization; } + @Override public boolean enlistResource(XAResource xaResource) { return false; } + @Override public boolean delistResource(XAResource xaResource, int i) { return false; } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { } diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java index 1fdd0659ebe..579e1a815f3 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java @@ -46,14 +46,17 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { setTransactionSynchronization(SYNCHRONIZATION_NEVER); } + @Override protected Object doGetTransaction() { return TRANSACTION; } + @Override protected boolean isExistingTransaction(Object transaction) { return existingTransaction; } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { if (!TRANSACTION.equals(transaction)) { throw new IllegalArgumentException("Not the same transaction object"); @@ -64,6 +67,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.begin = true; } + @Override protected void doCommit(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); @@ -71,6 +75,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.commit = true; } + @Override protected void doRollback(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); @@ -78,6 +83,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.rollback = true; } + @Override protected void doSetRollbackOnly(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java index 13646322584..e29ecca39fb 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java @@ -139,6 +139,7 @@ public class TransactionSupportTests extends TestCase { TestTransactionManager tm = new TestTransactionManager(false, true); TransactionTemplate template = new TransactionTemplate(tm); template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -152,6 +153,7 @@ public class TransactionSupportTests extends TestCase { MockCallbackPreferringTransactionManager ptm = new MockCallbackPreferringTransactionManager(); TransactionTemplate template = new TransactionTemplate(ptm); template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -165,6 +167,7 @@ public class TransactionSupportTests extends TestCase { final RuntimeException ex = new RuntimeException("Some application exception"); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw ex; } @@ -185,6 +188,7 @@ public class TransactionSupportTests extends TestCase { public void testTransactionTemplateWithRollbackException() { final TransactionSystemException tex = new TransactionSystemException("system exception"); TestTransactionManager tm = new TestTransactionManager(false, true) { + @Override protected void doRollback(DefaultTransactionStatus status) { super.doRollback(status); throw tex; @@ -194,6 +198,7 @@ public class TransactionSupportTests extends TestCase { final RuntimeException ex = new RuntimeException("Some application exception"); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw ex; } @@ -215,6 +220,7 @@ public class TransactionSupportTests extends TestCase { TransactionTemplate template = new TransactionTemplate(tm); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw new Error("Some application error"); } @@ -277,6 +283,7 @@ public class TransactionSupportTests extends TestCase { assertTrue("Correct isolation level set", template.getIsolationLevel() == TransactionDefinition.ISOLATION_REPEATABLE_READ); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java index e2a96b972ac..e76730f727c 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java @@ -36,6 +36,7 @@ public class TxNamespaceHandlerEventTests extends TestCase { private CollectingReaderEventListener eventListener = new CollectingReaderEventListener(); + @Override public void setUp() throws Exception { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.eventListener); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java index cfae77ca56b..72f1bdac10a 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java @@ -40,6 +40,7 @@ public class TxNamespaceHandlerTests extends TestCase { private Method setAgeMethod; + @Override public void setUp() throws Exception { this.context = new ClassPathXmlApplicationContext("txNamespaceHandlerTests.xml", getClass()); this.getAgeMethod = ITestBean.class.getMethod("getAge", new Class[0]); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java index 1dfd6a1bb1c..16f29f90f6d 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java @@ -311,18 +311,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -344,19 +348,23 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @Transactional(rollbackFor=Exception.class) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -377,18 +385,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -409,20 +421,24 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @Transactional(propagation=Propagation.REQUIRES_NEW, isolation=Isolation.REPEATABLE_READ, timeout=5, readOnly=true, rollbackFor=Exception.class, noRollbackFor={IOException.class}) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -444,18 +460,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -495,6 +515,7 @@ public class AnnotationTransactionAttributeSourceTests { public static class MyFoo implements Foo { + @Override @Transactional public void doSomething(String theArgument) { System.out.println(theArgument); @@ -508,20 +529,24 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override @javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS) public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @javax.ejb.TransactionAttribute public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -535,19 +560,23 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @javax.ejb.TransactionAttribute public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -574,18 +603,22 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java index 608512aefa0..a38057e1086 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java @@ -36,6 +36,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase { private TransactionInterceptor ti; + @Override public void setUp() { this.ptm = new CallCountingTransactionManager(); this.source = new AnnotationTransactionAttributeSource(); @@ -319,11 +320,13 @@ public class AnnotationTransactionInterceptorTests extends TestCase { public static class TestWithInterfaceImpl implements TestWithInterface { + @Override public void doSomething() { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); } + @Override public void doSomethingElse() { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -345,13 +348,16 @@ public class AnnotationTransactionInterceptorTests extends TestCase { public static class SomeServiceImpl implements SomeService { + @Override public void bar() { } + @Override @Transactional public void foo() { } + @Override @Transactional(readOnly = false) public void fooBar() { } @@ -367,6 +373,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase { @Transactional public static class OtherServiceImpl implements OtherService { + @Override public void foo() { } } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java index 36c076ce521..564887d4248 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java @@ -41,11 +41,13 @@ public class AnnotationTransactionNamespaceHandlerTests extends TestCase { private ConfigurableApplicationContext context; + @Override public void setUp() { this.context = new ClassPathXmlApplicationContext( "org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml"); } + @Override protected void tearDown() { this.context.close(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index fcbc5e880ab..11eff8c216a 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -127,6 +127,7 @@ public class EnableTransactionManagementTests { return new CallCountingTransactionManager(); } + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager2(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java index ec6f49fe145..5768b1bd9b7 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java @@ -87,6 +87,7 @@ public class AnnotationDrivenTests extends TestCase { @SuppressWarnings("serial") public static class TransactionCheckingInterceptor implements MethodInterceptor, Serializable { + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { if (methodInvocation.getMethod().getName().equals("setSomething")) { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java index 59947292cfd..ffad95f811f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java @@ -250,6 +250,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String spouseName = "innerName"; TestBean outer = new TestBean() { + @Override public void exceptional(Throwable t) throws Throwable { TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); assertTrue(ti.hasTransaction()); @@ -257,6 +258,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { } }; TestBean inner = new TestBean() { + @Override public String getName() { // Assert that we're in the inner proxy TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); @@ -311,6 +313,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String spouseName = "innerName"; TestBean outer = new TestBean() { + @Override public void exceptional(Throwable t) throws Throwable { TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); assertTrue(ti.hasTransaction()); @@ -319,6 +322,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { } }; TestBean inner = new TestBean() { + @Override public String getName() { // Assert that we're in the inner proxy TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); @@ -386,6 +390,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception { TransactionAttribute txatt = new DefaultTransactionAttribute() { + @Override public boolean rollbackOn(Throwable t) { assertTrue(t == ex); return shouldRollback; @@ -461,6 +466,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String name = "jenny"; TestBean tb = new TestBean() { + @Override public String getName() { TransactionStatus txStatus = TransactionInterceptor.currentTransactionStatus(); txStatus.setRollbackOnly(); @@ -504,6 +510,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { ptmControl.replay(); TestBean tb = new TestBean() { + @Override public String getName() { throw new UnsupportedOperationException( "Shouldn't have invoked target method when couldn't create transaction for transactional method"); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java index 27d72c2dc4e..593c4dd4643 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java @@ -50,6 +50,7 @@ public class BeanFactoryTransactionTests extends TestCase { private XmlBeanFactory factory; + @Override public void setUp() { this.factory = new XmlBeanFactory(new ClassPathResource("transactionalBeanFactory.xml", getClass())); } @@ -127,6 +128,7 @@ public class BeanFactoryTransactionTests extends TestCase { final TransactionStatus ts = (TransactionStatus) statusControl.getMock(); ptm = new PlatformTransactionManager() { private boolean invoked; + @Override public TransactionStatus getTransaction(TransactionDefinition def) throws TransactionException { if (invoked) { throw new IllegalStateException("getTransaction should not get invoked more than once"); @@ -138,9 +140,11 @@ public class BeanFactoryTransactionTests extends TestCase { } return ts; } + @Override public void commit(TransactionStatus status) throws TransactionException { assertTrue(status == ts); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new IllegalStateException("rollback should not get invoked"); } @@ -204,6 +208,7 @@ public class BeanFactoryTransactionTests extends TestCase { int counter = 0; + @Override public boolean matches(Method method, Class clazz) { counter++; return true; @@ -215,6 +220,7 @@ public class BeanFactoryTransactionTests extends TestCase { int counter = 0; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { counter++; return methodInvocation.proceed(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java index a260d3ef719..7c2eed8ac97 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java @@ -40,10 +40,12 @@ public class MapTransactionAttributeSource extends AbstractFallbackTransactionAt } + @Override protected TransactionAttribute findTransactionAttribute(Method method) { return this.attributeMap.get(method); } + @Override protected TransactionAttribute findTransactionAttribute(Class clazz) { return this.attributeMap.get(clazz); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java index 7aa4a1e275b..a6cc819e628 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java @@ -37,14 +37,17 @@ public class PlatformTransactionManagerFacade implements PlatformTransactionMana */ public static PlatformTransactionManager delegate; + @Override public TransactionStatus getTransaction(TransactionDefinition definition) { return delegate.getTransaction(definition); } + @Override public void commit(TransactionStatus status) { delegate.commit(status); } + @Override public void rollback(TransactionStatus status) { delegate.rollback(status); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index 5255b972ac8..a9f3775b948 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -34,6 +34,7 @@ import org.springframework.util.SerializationTestUtils; */ public class TransactionInterceptorTests extends AbstractTransactionAspectTests { + @Override protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource[] tas) throws Exception { TransactionInterceptor ti = new TransactionInterceptor(); ti.setTransactionManager(ptm); @@ -49,6 +50,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests * target object and transaction setup. * Creates a TransactionInterceptor and applies it. */ + @Override protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource tas) { TransactionInterceptor ti = new TransactionInterceptor(); ti.setTransactionManager(ptm); @@ -111,14 +113,17 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @SuppressWarnings("serial") public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable { + @Override public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void commit(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java index 94ca9025802..7eaad371bfe 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java @@ -48,6 +48,7 @@ public class MockUOWManager implements UOWManager { private final List synchronizations = new LinkedList(); + @Override public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWActionException, UOWException { this.type = type; this.joined = join; @@ -70,6 +71,7 @@ public class MockUOWManager implements UOWManager { } } + @Override public int getUOWType() { return this.type; } @@ -78,22 +80,27 @@ public class MockUOWManager implements UOWManager { return this.joined; } + @Override public long getLocalUOWId() { return 0; } + @Override public void setUOWTimeout(int uowType, int timeout) { this.timeout = timeout; } + @Override public int getUOWTimeout() { return this.timeout; } + @Override public void setRollbackOnly() { this.rollbackOnly = true; } + @Override public boolean getRollbackOnly() { return this.rollbackOnly; } @@ -102,18 +109,22 @@ public class MockUOWManager implements UOWManager { this.status = status; } + @Override public int getUOWStatus() { return this.status; } + @Override public void putResource(Object key, Object value) { this.resources.put(key, value); } + @Override public Object getResource(Object key) throws NullPointerException { return this.resources.get(key); } + @Override public void registerInterposedSynchronization(Synchronization sync) { this.synchronizations.add(sync); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java index b6dbf51348f..5f9d5ba6309 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java @@ -52,6 +52,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -87,6 +88,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { TransactionStatus ts = ptm.getTransaction(definition); ptm.commit(ts); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -105,6 +107,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -174,6 +177,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { if (synchMode == WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -257,6 +261,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { if (synchMode != WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -294,6 +299,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -315,6 +321,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { public void testNewTransactionWithCommitException() { final RollbackException rex = new RollbackException(); MockUOWManager manager = new MockUOWManager() { + @Override public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWException { throw new UOWException(rex); } @@ -328,6 +335,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -362,6 +370,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -395,6 +404,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -425,6 +435,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -452,6 +463,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -472,6 +484,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -508,11 +521,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -555,11 +570,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals(propagationBehavior == TransactionDefinition.PROPAGATION_REQUIRES_NEW, @@ -600,11 +617,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java index 282a18352d7..e553f31f5b7 100644 --- a/spring-web/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/TestBean.java @@ -143,6 +143,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -151,6 +152,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -167,10 +169,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -186,10 +190,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -202,6 +208,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } @@ -214,10 +221,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return (spouses != null ? (TestBean) spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -244,42 +253,52 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } + @Override public Integer[] getSomeIntegerArray() { return someIntegerArray; } + @Override public void setSomeIntegerArray(Integer[] someIntegerArray) { this.someIntegerArray = someIntegerArray; } + @Override public Integer[][] getNestedIntegerArray() { return nestedIntegerArray; } + @Override public void setNestedIntegerArray(Integer[][] nestedIntegerArray) { this.nestedIntegerArray = nestedIntegerArray; } + @Override public int[] getSomeIntArray() { return someIntArray; } + @Override public void setSomeIntArray(int[] someIntArray) { this.someIntArray = someIntArray; } + @Override public int[][] getNestedIntArray() { return nestedIntArray; } + @Override public void setNestedIntArray(int[][] nestedIntArray) { this.nestedIntArray = nestedIntArray; } @@ -340,6 +359,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -348,6 +368,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -380,6 +401,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -405,23 +427,28 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } + @Override public Object returnsThis() { return this; } + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -451,6 +478,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java index 42b9adbfd56..a826a9c2076 100644 --- a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java +++ b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java @@ -23,6 +23,7 @@ public class MockRunnable implements Runnable { private boolean executed = false; + @Override public void run() { this.executed = true; } diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java index 4461024f642..43dc47e3c6f 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java @@ -41,10 +41,12 @@ public class MockHttpInputMessage implements HttpInputMessage { this.body = body; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public InputStream getBody() throws IOException { return body; } diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java index 323fff1af36..75f5db49b25 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java @@ -30,10 +30,12 @@ public class MockHttpOutputMessage implements HttpOutputMessage { private final ByteArrayOutputStream body = new ByteArrayOutputStream(); + @Override public HttpHeaders getHeaders() { return headers; } + @Override public OutputStream getBody() throws IOException { return body; } diff --git a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java index 7408552ff58..4904ea31910 100644 --- a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java @@ -28,6 +28,7 @@ public class BufferedSimpleHttpRequestFactoryTests extends AbstractHttpRequestFa return new SimpleClientHttpRequestFactory(); } + @Override @Test public void httpMethods() throws Exception { try { diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java index 917e5de114b..0eabc67d937 100644 --- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java @@ -26,6 +26,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq return new HttpComponentsClientHttpRequestFactory(); } + @Override @Test public void httpMethods() throws Exception { assertHttpMethod("patch", HttpMethod.PATCH); diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java index 70f5e257d25..2df6331b8e3 100644 --- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java @@ -79,6 +79,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void noExecution() throws Exception { List interceptors = new ArrayList(); interceptors.add(new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { return responseMock; @@ -101,6 +102,7 @@ public class InterceptingClientHttpRequestFactoryTests { final String headerName = "Foo"; final String headerValue = "Bar"; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -134,6 +136,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeURI() throws Exception { final URI changedUri = new URI("http://example.com/2"); ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -166,6 +169,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeMethod() throws Exception { final HttpMethod changedMethod = HttpMethod.POST; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -198,6 +202,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeBody() throws Exception { final byte[] changedBody = "Foo".getBytes(); ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -217,6 +222,7 @@ public class InterceptingClientHttpRequestFactoryTests { private boolean invoked = false; + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { invoked = true; @@ -226,6 +232,7 @@ public class InterceptingClientHttpRequestFactoryTests { private class RequestFactoryMock implements ClientHttpRequestFactory { + @Override public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { requestMock.setURI(uri); requestMock.setMethod(httpMethod); @@ -249,6 +256,7 @@ public class InterceptingClientHttpRequestFactoryTests { private RequestMock() { } + @Override public URI getURI() { return uri; } @@ -257,6 +265,7 @@ public class InterceptingClientHttpRequestFactoryTests { this.uri = uri; } + @Override public HttpMethod getMethod() { return method; } @@ -265,14 +274,17 @@ public class InterceptingClientHttpRequestFactoryTests { this.method = method; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public OutputStream getBody() throws IOException { return body; } + @Override public ClientHttpResponse execute() throws IOException { executed = true; return responseMock; @@ -287,26 +299,32 @@ public class InterceptingClientHttpRequestFactoryTests { private HttpHeaders headers = new HttpHeaders(); + @Override public HttpStatus getStatusCode() throws IOException { return statusCode; } + @Override public int getRawStatusCode() throws IOException { return statusCode.value(); } + @Override public String getStatusText() throws IOException { return statusText; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public InputStream getBody() throws IOException { return null; } + @Override public void close() { } } diff --git a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java index 8507cdbfe83..6adeed5ecab 100644 --- a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java @@ -47,6 +47,7 @@ public class StreamingSimpleHttpRequestFactoryTests extends AbstractHttpRequestF final String headerName = "MyHeader"; final String headerValue = "MyValue"; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { request.getHeaders().add(headerName, headerValue); diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index 0771b1f4c73..7f1110d6efe 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -167,20 +167,24 @@ public class FormHttpMessageConverterTests { this.outputMessage = outputMessage; } + @Override public String getCharacterEncoding() { MediaType contentType = outputMessage.getHeaders().getContentType(); return contentType != null && contentType.getCharSet() != null ? contentType.getCharSet().name() : null; } + @Override public String getContentType() { MediaType contentType = outputMessage.getHeaders().getContentType(); return contentType != null ? contentType.toString() : null; } + @Override public int getContentLength() { return outputMessage.getBodyAsBytes().length; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(outputMessage.getBodyAsBytes()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java index d3e3ff67857..f0a259edd20 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java @@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream { } + @Override public int read() throws IOException { return this.sourceStream.read(); } + @Override public void close() throws IOException { super.close(); this.sourceStream.close(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java index 5f32208ecb6..58aa59d49da 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java index 00a632f47dc..f4ff566922c 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java @@ -56,14 +56,17 @@ public class MockAsyncContext implements AsyncContext { this.response = (HttpServletResponse) response; } + @Override public ServletRequest getRequest() { return this.request; } + @Override public ServletResponse getResponse() { return this.response; } + @Override public boolean hasOriginalRequestAndResponse() { return (this.request instanceof MockHttpServletRequest) && (this.response instanceof MockHttpServletResponse); } @@ -72,18 +75,22 @@ public class MockAsyncContext implements AsyncContext { return this.dispatchedPath; } + @Override public void dispatch() { dispatch(this.request.getRequestURI()); } + @Override public void dispatch(String path) { dispatch(null, path); } + @Override public void dispatch(ServletContext context, String path) { this.dispatchedPath = path; } + @Override public void complete() { MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(request, MockHttpServletRequest.class); if (mockRequest != null) { @@ -99,6 +106,7 @@ public class MockAsyncContext implements AsyncContext { } } + @Override public void start(Runnable runnable) { runnable.run(); } @@ -107,22 +115,27 @@ public class MockAsyncContext implements AsyncContext { return this.listeners; } + @Override public void addListener(AsyncListener listener) { this.listeners.add(listener); } + @Override public void addListener(AsyncListener listener, ServletRequest request, ServletResponse response) { this.listeners.add(listener); } + @Override public T createListener(Class clazz) throws ServletException { return BeanUtils.instantiateClass(clazz); } + @Override public long getTimeout() { return this.timeout; } + @Override public void setTimeout(long timeout) { this.timeout = timeout; } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java index 7160e641557..eb3ebe8e8b6 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java @@ -77,14 +77,17 @@ public class MockBodyContent extends BodyContent { } + @Override public Reader getReader() { return new StringReader(this.content); } + @Override public String getString() { return this.content; } + @Override public void writeOut(Writer writer) throws IOException { writer.write(this.content); } @@ -94,102 +97,127 @@ public class MockBodyContent extends BodyContent { // Delegating implementations of JspWriter's abstract methods //--------------------------------------------------------------------- + @Override public void clear() throws IOException { getEnclosingWriter().clear(); } + @Override public void clearBuffer() throws IOException { getEnclosingWriter().clearBuffer(); } + @Override public void close() throws IOException { getEnclosingWriter().close(); } + @Override public int getRemaining() { return getEnclosingWriter().getRemaining(); } + @Override public void newLine() throws IOException { getEnclosingWriter().println(); } + @Override public void write(char value[], int offset, int length) throws IOException { getEnclosingWriter().write(value, offset, length); } + @Override public void print(boolean value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(char value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(char[] value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(double value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(float value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(int value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(long value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(Object value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(String value) throws IOException { getEnclosingWriter().print(value); } + @Override public void println() throws IOException { getEnclosingWriter().println(); } + @Override public void println(boolean value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(char value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(char[] value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(double value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(float value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(int value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(long value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(Object value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(String value) throws IOException { getEnclosingWriter().println(value); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java index e13749eef11..b399bafe62a 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java @@ -53,17 +53,20 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { this.pageContext = pageContext; } + @Override public Expression parseExpression( final String expression, final Class expectedType, final FunctionMapper functionMapper) throws ELException { return new Expression() { + @Override public Object evaluate(VariableResolver variableResolver) throws ELException { return doEvaluate(expression, expectedType, functionMapper); } }; } + @Override public Object evaluate( String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) throws ELException { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java index a6fa2f6b261..5b4b68b94d7 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java @@ -117,6 +117,7 @@ public class MockFilterChain implements FilterChain { * Invoke registered {@link Filter}s and/or {@link Servlet} also saving the * request and response. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -160,15 +161,18 @@ public class MockFilterChain implements FilterChain { this.delegateServlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.delegateServlet.service(request, response); } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java index 9db10c665bd..12fbe613ec8 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java @@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig { } + @Override public String getFilterName() { return filterName; } + @Override public ServletContext getServletContext() { return servletContext; } @@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java index 4544448afaf..5694b666105 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java @@ -264,6 +264,7 @@ public class MockHttpServletRequest implements HttpServletRequest { * Return the ServletContext that this request is associated with. (Not * available in the standard HttpServletRequest interface for some reason.) */ + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -305,20 +306,24 @@ public class MockHttpServletRequest implements HttpServletRequest { // ServletRequest interface //--------------------------------------------------------------------- + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; updateContentTypeHeader(); @@ -338,6 +343,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.content = content; } + @Override public int getContentLength() { return (this.content != null ? this.content.length : -1); } @@ -354,10 +360,12 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getContentType() { return this.contentType; } + @Override public ServletInputStream getInputStream() { if (this.content != null) { return new DelegatingServletInputStream(new ByteArrayInputStream(this.content)); @@ -480,21 +488,25 @@ public class MockHttpServletRequest implements HttpServletRequest { this.parameters.clear(); } + @Override public String getParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -503,6 +515,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.protocol = protocol; } + @Override public String getProtocol() { return this.protocol; } @@ -511,6 +524,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -519,6 +533,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -527,10 +542,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -547,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteAddr = remoteAddr; } + @Override public String getRemoteAddr() { return this.remoteAddr; } @@ -555,10 +573,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteHost = remoteHost; } + @Override public String getRemoteHost() { return this.remoteHost; } + @Override public void setAttribute(String name, Object value) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -570,6 +590,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -604,10 +625,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.locales.addAll(locales); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -616,14 +639,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } @@ -632,6 +658,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remotePort = remotePort; } + @Override public int getRemotePort() { return this.remotePort; } @@ -640,6 +667,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localName = localName; } + @Override public String getLocalName() { return this.localName; } @@ -648,6 +676,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localAddr = localAddr; } + @Override public String getLocalAddr() { return this.localAddr; } @@ -656,6 +685,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localPort = localPort; } + @Override public int getLocalPort() { return this.localPort; } @@ -669,6 +699,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -677,6 +708,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } @@ -725,6 +757,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public long getDateHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -743,20 +776,24 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getValue().toString() : null); } + @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList()); } + @Override public Enumeration getHeaderNames() { return Collections.enumeration(this.headers.keySet()); } + @Override public int getIntHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -778,6 +815,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.method = method; } + @Override public String getMethod() { return this.method; } @@ -786,10 +824,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.pathInfo = pathInfo; } + @Override public String getPathInfo() { return this.pathInfo; } + @Override public String getPathTranslated() { return (this.pathInfo != null ? getRealPath(this.pathInfo) : null); } @@ -798,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -806,6 +847,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.queryString = queryString; } + @Override public String getQueryString() { return this.queryString; } @@ -814,6 +856,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -822,6 +865,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains( role))); @@ -831,6 +875,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -839,6 +884,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionId = requestedSessionId; } + @Override public String getRequestedSessionId() { return this.requestedSessionId; } @@ -847,10 +893,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestURI = requestURI; } + @Override public String getRequestURI() { return this.requestURI; } + @Override public StringBuffer getRequestURL() { StringBuffer url = new StringBuffer(this.scheme); url.append("://").append(this.serverName).append(':').append(this.serverPort); @@ -862,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.servletPath = servletPath; } + @Override public String getServletPath() { return this.servletPath; } @@ -874,6 +923,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public HttpSession getSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -887,6 +937,7 @@ public class MockHttpServletRequest implements HttpServletRequest { return this.session; } + @Override public HttpSession getSession() { return getSession(true); } @@ -895,6 +946,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -903,6 +955,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromCookie = requestedSessionIdFromCookie; } + @Override public boolean isRequestedSessionIdFromCookie() { return this.requestedSessionIdFromCookie; } @@ -911,10 +964,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromURL = requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromURL() { return this.requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromUrl() { return isRequestedSessionIdFromURL(); } @@ -924,6 +979,7 @@ public class MockHttpServletRequest implements HttpServletRequest { // Methods introduced in Servlet 3.0 //--------------------------------------------------------------------- + @Override public AsyncContext getAsyncContext() { return this.asyncContext; } @@ -932,6 +988,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncContext = asyncContext; } + @Override public DispatcherType getDispatcherType() { return this.dispatcherType; } @@ -944,14 +1001,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncSupported = asyncSupported; } + @Override public boolean isAsyncSupported() { return this.asyncSupported; } + @Override public AsyncContext startAsync() { return startAsync(this, null); } + @Override public AsyncContext startAsync(ServletRequest request, ServletResponse response) { if (!this.asyncSupported) { throw new IllegalStateException("Async not supported"); @@ -965,10 +1025,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncStarted = asyncStarted; } + @Override public boolean isAsyncStarted() { return this.asyncStarted; } + @Override public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException { throw new UnsupportedOperationException(); } @@ -977,18 +1039,22 @@ public class MockHttpServletRequest implements HttpServletRequest { parts.put(part.getName(), part); } + @Override public Part getPart(String key) throws IOException, IllegalStateException, ServletException { return parts.get(key); } + @Override public Collection getParts() throws IOException, IllegalStateException, ServletException { return parts.values(); } + @Override public void login(String arg0, String arg1) throws ServletException { throw new UnsupportedOperationException(); } + @Override public void logout() throws ServletException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java index ce6ef7fa9bc..6f52ab8e3e8 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java @@ -138,6 +138,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -154,10 +155,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -165,6 +168,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -188,6 +192,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -197,6 +202,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -210,22 +216,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -244,10 +255,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -260,10 +273,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -273,6 +288,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -292,6 +308,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -301,6 +318,7 @@ public class MockHttpServletResponse implements HttpServletResponse { *

As of Servlet 3.0, this method is also defined HttpServletResponse. * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none */ + @Override public Set getHeaderNames() { return this.headers.keySet(); } @@ -314,6 +332,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * @param name the name of the header * @return the associated header value, or {@code null} if none */ + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getStringValue() : null); @@ -327,6 +346,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * @param name the name of the header * @return the associated header values, or an empty List if none */ + @Override public List getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); if (header != null) { @@ -367,6 +387,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -379,18 +400,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -400,6 +425,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -408,6 +434,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -422,26 +449,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -489,15 +522,18 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; } + @Override public int getStatus() { return this.status; } @@ -555,12 +591,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -578,24 +616,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java index ae7d58af432..12301763b6b 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java index dc1dc5c51ce..e83ff23521f 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java @@ -82,6 +82,7 @@ public class MockJspWriter extends JspWriter { } + @Override public void clear() throws IOException { if (this.response.isCommitted()) { throw new IOException("Response already committed"); @@ -89,101 +90,126 @@ public class MockJspWriter extends JspWriter { this.response.resetBuffer(); } + @Override public void clearBuffer() throws IOException { } + @Override public void flush() throws IOException { this.response.flushBuffer(); } + @Override public void close() throws IOException { flush(); } + @Override public int getRemaining() { return Integer.MAX_VALUE; } + @Override public void newLine() throws IOException { getTargetWriter().println(); } + @Override public void write(char value[], int offset, int length) throws IOException { getTargetWriter().write(value, offset, length); } + @Override public void print(boolean value) throws IOException { getTargetWriter().print(value); } + @Override public void print(char value) throws IOException { getTargetWriter().print(value); } + @Override public void print(char[] value) throws IOException { getTargetWriter().print(value); } + @Override public void print(double value) throws IOException { getTargetWriter().print(value); } + @Override public void print(float value) throws IOException { getTargetWriter().print(value); } + @Override public void print(int value) throws IOException { getTargetWriter().print(value); } + @Override public void print(long value) throws IOException { getTargetWriter().print(value); } + @Override public void print(Object value) throws IOException { getTargetWriter().print(value); } + @Override public void print(String value) throws IOException { getTargetWriter().print(value); } + @Override public void println() throws IOException { getTargetWriter().println(); } + @Override public void println(boolean value) throws IOException { getTargetWriter().println(value); } + @Override public void println(char value) throws IOException { getTargetWriter().println(value); } + @Override public void println(char[] value) throws IOException { getTargetWriter().println(value); } + @Override public void println(double value) throws IOException { getTargetWriter().println(value); } + @Override public void println(float value) throws IOException { getTargetWriter().println(value); } + @Override public void println(int value) throws IOException { getTargetWriter().println(value); } + @Override public void println(long value) throws IOException { getTargetWriter().println(value); } + @Override public void println(Object value) throws IOException { getTargetWriter().println(value); } + @Override public void println(String value) throws IOException { getTargetWriter().println(value); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java index c9bf0742967..8cad672a2de 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java @@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile { } + @Override public String getName() { return this.name; } + @Override public String getOriginalFilename() { return this.originalFilename; } + @Override public String getContentType() { return this.contentType; } + @Override public boolean isEmpty() { return (this.content.length == 0); } + @Override public long getSize() { return this.content.length; } + @Override public byte[] getBytes() throws IOException { return this.content; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public void transferTo(File dest) throws IOException, IllegalStateException { FileCopyUtils.copy(this.content, dest); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java index dc915eec4f3..868d786bdd3 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java @@ -66,14 +66,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl this.multipartFiles.add(file.getName(), file); } + @Override public Iterator getFileNames() { return this.multipartFiles.keySet().iterator(); } + @Override public MultipartFile getFile(String name) { return this.multipartFiles.getFirst(name); } + @Override public List getFiles(String name) { List multipartFiles = this.multipartFiles.get(name); if (multipartFiles != null) { @@ -84,14 +87,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl } } + @Override public Map getFileMap() { return this.multipartFiles.toSingleValueMap(); } + @Override public MultiValueMap getMultiFileMap() { return new LinkedMultiValueMap(this.multipartFiles); } + @Override public String getMultipartContentType(String paramOrFileName) { MultipartFile file = getFile(paramOrFileName); if (file != null) { @@ -102,10 +108,12 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl } } + @Override public HttpMethod getRequestMethod() { return HttpMethod.valueOf(getMethod()); } + @Override public HttpHeaders getRequestHeaders() { HttpHeaders headers = new HttpHeaders(); Enumeration headerNames = getHeaderNames(); @@ -116,6 +124,7 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl return headers; } + @Override public HttpHeaders getMultipartHeaders(String paramOrFileName) { String contentType = getMultipartContentType(paramOrFileName); if (contentType != null) { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java index efa1319b92d..2c17aca78e0 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java @@ -125,6 +125,7 @@ public class MockPageContext extends PageContext { } + @Override public void initialize( Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) { @@ -132,9 +133,11 @@ public class MockPageContext extends PageContext { throw new UnsupportedOperationException("Use appropriate constructor"); } + @Override public void release() { } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -145,6 +148,7 @@ public class MockPageContext extends PageContext { } } + @Override public void setAttribute(String name, Object value, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -165,11 +169,13 @@ public class MockPageContext extends PageContext { } } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getAttribute(String name, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -187,6 +193,7 @@ public class MockPageContext extends PageContext { } } + @Override public Object findAttribute(String name) { Object value = getAttribute(name); if (value == null) { @@ -201,6 +208,7 @@ public class MockPageContext extends PageContext { return value; } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.removeAttribute(name, PageContext.PAGE_SCOPE); @@ -209,6 +217,7 @@ public class MockPageContext extends PageContext { this.removeAttribute(name, PageContext.APPLICATION_SCOPE); } + @Override public void removeAttribute(String name, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -229,6 +238,7 @@ public class MockPageContext extends PageContext { } } + @Override public int getAttributesScope(String name) { if (getAttribute(name) != null) { return PAGE_SCOPE; @@ -251,6 +261,7 @@ public class MockPageContext extends PageContext { return Collections.enumeration(this.attributes.keySet()); } + @Override @SuppressWarnings("unchecked") public Enumeration getAttributeNamesInScope(int scope) { switch (scope) { @@ -268,6 +279,7 @@ public class MockPageContext extends PageContext { } } + @Override public JspWriter getOut() { if (this.out == null) { this.out = new MockJspWriter(this.response); @@ -275,54 +287,67 @@ public class MockPageContext extends PageContext { return this.out; } + @Override public ExpressionEvaluator getExpressionEvaluator() { return new MockExpressionEvaluator(this); } + @Override public ELContext getELContext() { return null; } + @Override public VariableResolver getVariableResolver() { return null; } + @Override public HttpSession getSession() { return this.request.getSession(); } + @Override public Object getPage() { return this; } + @Override public ServletRequest getRequest() { return this.request; } + @Override public ServletResponse getResponse() { return this.response; } + @Override public Exception getException() { return null; } + @Override public ServletConfig getServletConfig() { return this.servletConfig; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void forward(String path) throws ServletException, IOException { this.request.getRequestDispatcher(path).forward(this.request, this.response); } + @Override public void include(String path) throws ServletException, IOException { this.request.getRequestDispatcher(path).include(this.request, this.response); } + @Override public void include(String path, boolean flush) throws ServletException, IOException { this.request.getRequestDispatcher(path).include(this.request, this.response); if (flush) { @@ -340,10 +365,12 @@ public class MockPageContext extends PageContext { return ((MockHttpServletResponse) this.response).getContentAsString(); } + @Override public void handlePageException(Exception ex) throws ServletException, IOException { throw new ServletException("Page exception", ex); } + @Override public void handlePageException(Throwable ex) throws ServletException, IOException { throw new ServletException("Page exception", ex); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java index ef594bc7577..f26dfc2b9c1 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java @@ -90,22 +90,27 @@ public class MockPart implements Part { } + @Override public String getName() { return this.name; } + @Override public String getContentType() { return this.contentType; } + @Override public long getSize() { return this.content.length; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public String getHeader(String name) { if (CONTENT_TYPE.equalsIgnoreCase(name)) { return this.contentType; @@ -115,6 +120,7 @@ public class MockPart implements Part { } } + @Override public Collection getHeaders(String name) { if (CONTENT_TYPE.equalsIgnoreCase(name)) { return Collections.singleton(this.contentType); @@ -124,14 +130,17 @@ public class MockPart implements Part { } } + @Override public Collection getHeaderNames() { return Collections.singleton(CONTENT_TYPE); } + @Override public void write(String fileName) throws IOException { throw new UnsupportedOperationException(); } + @Override public void delete() throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java index d2766fcb0f0..b8679b80209 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java index 9447b10d7e2..d7738c95273 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java @@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig { } + @Override public String getServletName() { return this.servletName; } + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java index 3a0e23e2932..d18678dc4a4 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java @@ -205,6 +205,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -213,6 +214,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -224,6 +226,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -232,6 +235,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -240,6 +244,7 @@ public class MockServletContext implements ServletContext { this.effectiveMajorVersion = effectiveMajorVersion; } + @Override public int getEffectiveMajorVersion() { return this.effectiveMajorVersion; } @@ -248,14 +253,17 @@ public class MockServletContext implements ServletContext { this.effectiveMinorVersion = effectiveMinorVersion; } + @Override public int getEffectiveMinorVersion() { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -281,6 +289,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -298,6 +307,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -312,6 +322,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -319,6 +330,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -376,30 +388,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -411,19 +430,23 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } + @Override public boolean setInitParameter(String name, String value) { Assert.notNull(name, "Parameter name must not be null"); if (this.initParameters.containsKey(name)) { @@ -438,15 +461,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -457,6 +483,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -466,14 +493,17 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } + @Override public ClassLoader getClassLoader() { return ClassUtils.getDefaultClassLoader(); } + @Override public void declareRoles(String... roleNames) { Assert.notNull(roleNames, "Role names array must not be null"); for (String roleName : roleNames) { @@ -503,90 +533,111 @@ public class MockServletContext implements ServletContext { // Methods introduced in Servlet 3.0 //--------------------------------------------------------------------- + @Override public FilterRegistration.Dynamic addFilter(String filterName, String className) { throw new UnsupportedOperationException(); } + @Override public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { throw new UnsupportedOperationException(); } + @Override public FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { throw new UnsupportedOperationException(); } + @Override public void addListener(Class listenerClass) { throw new UnsupportedOperationException(); } + @Override public void addListener(String className) { throw new UnsupportedOperationException(); } + @Override public void addListener(T t) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, String className) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { throw new UnsupportedOperationException(); } + @Override public T createFilter(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public T createListener(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public T createServlet(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public Set getDefaultSessionTrackingModes() { throw new UnsupportedOperationException(); } + @Override public Set getEffectiveSessionTrackingModes() { throw new UnsupportedOperationException(); } + @Override public FilterRegistration getFilterRegistration(String filterName) { throw new UnsupportedOperationException(); } + @Override public Map getFilterRegistrations() { throw new UnsupportedOperationException(); } + @Override public JspConfigDescriptor getJspConfigDescriptor() { throw new UnsupportedOperationException(); } + @Override public ServletRegistration getServletRegistration(String servletName) { throw new UnsupportedOperationException(); } + @Override public Map getServletRegistrations() { throw new UnsupportedOperationException(); } + @Override public SessionCookieConfig getSessionCookieConfig() { throw new UnsupportedOperationException(); } + @Override public void setSessionTrackingModes(Set sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { throw new UnsupportedOperationException(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java index 3e3b09b1595..505aa3f6bcd 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java @@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain { /** * Pass the call on to the Filter/Servlet. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (this.filter != null) { this.filter.doFilter(request, response, this.nextFilterChain); diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java index b2ca68eb7f6..17369efaa5d 100644 --- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java @@ -219,14 +219,17 @@ public class CauchoRemotingTests extends TestCase { private String password; private boolean overloadEnabled; + @Override public void setUser(String user) { this.user = user; } + @Override public void setPassword(String password) { this.password = password; } + @Override public void setOverloadEnabled(boolean overloadEnabled) { this.overloadEnabled = overloadEnabled; } @@ -239,14 +242,17 @@ public class CauchoRemotingTests extends TestCase { private String password; private boolean overloadEnabled; + @Override public void setUser(String user) { this.user = user; } + @Override public void setPassword(String password) { this.password = password; } + @Override public void setOverloadEnabled(boolean overloadEnabled) { this.overloadEnabled = overloadEnabled; } diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java index 56569a8e042..71c463177a5 100644 --- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java @@ -73,6 +73,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -138,6 +139,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() { + @Override public RemoteInvocationResult executeRequest( HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException { throw new IOException("argh"); @@ -160,6 +162,7 @@ public class HttpInvokerTests extends TestCase { TestBean target = new TestBean("myname", 99); final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() { + @Override protected InputStream decorateInputStream(HttpServletRequest request, InputStream is) throws IOException { if ("gzip".equals(request.getHeader("Compression"))) { return new GZIPInputStream(is); @@ -168,6 +171,7 @@ public class HttpInvokerTests extends TestCase { return is; } } + @Override protected OutputStream decorateOutputStream( HttpServletRequest request, HttpServletResponse response, OutputStream os) throws IOException { if ("gzip".equals(request.getHeader("Compression"))) { @@ -187,6 +191,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws IOException, ClassNotFoundException { @@ -204,9 +209,11 @@ public class HttpInvokerTests extends TestCase { return readRemoteInvocationResult( new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl()); } + @Override protected OutputStream decorateOutputStream(OutputStream os) throws IOException { return new GZIPOutputStream(os); } + @Override protected InputStream decorateInputStream(InputStream is) throws IOException { return new GZIPInputStream(is); } @@ -239,6 +246,7 @@ public class HttpInvokerTests extends TestCase { TestBean target = new TestBean("myname", 99); final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() { + @Override protected RemoteInvocation doReadRemoteInvocation(ObjectInputStream ois) throws IOException, ClassNotFoundException { Object obj = ois.readObject(); @@ -248,6 +256,7 @@ public class HttpInvokerTests extends TestCase { } return ((TestRemoteInvocationWrapper) obj).remoteInvocation; } + @Override protected void doWriteRemoteInvocationResult(RemoteInvocationResult result, ObjectOutputStream oos) throws IOException { oos.writeObject(new TestRemoteInvocationResultWrapper(result)); @@ -262,6 +271,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -272,9 +282,11 @@ public class HttpInvokerTests extends TestCase { return readRemoteInvocationResult( new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl()); } + @Override protected void doWriteRemoteInvocation(RemoteInvocation invocation, ObjectOutputStream oos) throws IOException { oos.writeObject(new TestRemoteInvocationWrapper(invocation)); } + @Override protected RemoteInvocationResult doReadRemoteInvocationResult(ObjectInputStream ois) throws IOException, ClassNotFoundException { Object obj = ois.readObject(); @@ -316,6 +328,7 @@ public class HttpInvokerTests extends TestCase { exporter.setServiceInterface(ITestBean.class); exporter.setService(target); exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() { + @Override public Object invoke(RemoteInvocation invocation, Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { assertNotNull(invocation.getAttributes()); @@ -331,6 +344,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceInterface(ITestBean.class); pfb.setServiceUrl("http://myurl"); pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() { + @Override public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) { RemoteInvocation invocation = new RemoteInvocation(methodInvocation); invocation.addAttribute("myKey", "myValue"); @@ -350,6 +364,7 @@ public class HttpInvokerTests extends TestCase { }); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -375,6 +390,7 @@ public class HttpInvokerTests extends TestCase { exporter.setServiceInterface(ITestBean.class); exporter.setService(target); exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() { + @Override public Object invoke(RemoteInvocation invocation, Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { assertTrue(invocation instanceof TestRemoteInvocation); @@ -389,6 +405,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceInterface(ITestBean.class); pfb.setServiceUrl("http://myurl"); pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() { + @Override public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) { RemoteInvocation invocation = new TestRemoteInvocation(methodInvocation); assertNull(invocation.getAttributes()); @@ -398,6 +415,7 @@ public class HttpInvokerTests extends TestCase { }); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -423,6 +441,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl(serviceUrl); pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() { + @Override public RemoteInvocationResult executeRequest( HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException { throw new IOException("argh"); diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java index 1f249589b51..ac50ac8d2e6 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java @@ -495,6 +495,7 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(new RemoteBean()); } + @Override public Service createService(QName qName) throws ServiceException { if (!"myNamespace".equals(qName.getNamespaceURI()) || !"myService1".equals(qName.getLocalPart())) { throw new ServiceException("not supported"); @@ -503,6 +504,7 @@ public class JaxRpcSupportTests extends TestCase { return service1; } + @Override public Service createService(URL url, QName qName) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) || @@ -516,6 +518,7 @@ public class JaxRpcSupportTests extends TestCase { return service2; } + @Override public Service loadService(URL url, QName qName, Properties props) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) || @@ -532,6 +535,7 @@ public class JaxRpcSupportTests extends TestCase { return service1; } + @Override public Service loadService(Class ifc) throws ServiceException { if (!IRemoteBean.class.equals(ifc)) { throw new ServiceException("not supported"); @@ -540,6 +544,7 @@ public class JaxRpcSupportTests extends TestCase { return service2; } + @Override public Service loadService(URL url, Class ifc, Properties props) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !IRemoteBean.class.equals(ifc)) { @@ -563,6 +568,7 @@ public class JaxRpcSupportTests extends TestCase { super(); } + @Override protected void initMocks() throws Exception { super.initMocks(); service1.getPort(new QName("myNamespace", "myPort"), IRemoteBean.class); @@ -580,6 +586,7 @@ public class JaxRpcSupportTests extends TestCase { super(); } + @Override protected void initMocks() throws Exception { initStandardCall(1); } @@ -591,9 +598,11 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(call1, count); call1.invoke(new Object[] {"myName"}); call1Control.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] objects, Object[] objects1) { return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]); } + @Override public String toString(Object[] objects) { return ObjectUtils.nullSafeToString(objects[0]); } @@ -616,6 +625,7 @@ public class JaxRpcSupportTests extends TestCase { public ExceptionCallMockServiceFactory() throws Exception { } + @Override protected void initMocks() throws Exception { initExceptionCall(); initStandardCall(2); @@ -628,9 +638,11 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(call2); call2.invoke(new Object[] {"exception"}); call2Control.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] objects, Object[] objects1) { return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]); } + @Override public String toString(Object[] objects) { return ObjectUtils.nullSafeToString(objects[0]); } @@ -646,6 +658,7 @@ public class JaxRpcSupportTests extends TestCase { public CallWithPropertiesMockServiceFactory() throws Exception { } + @Override protected void extendStandardCall() { call1.setProperty(Call.USERNAME_PROPERTY, "user"); call1Control.setVoidCallable(); @@ -682,6 +695,7 @@ public class JaxRpcSupportTests extends TestCase { properties = new HashMap(); } + @Override public void setName(String nam) throws RemoteException { if ("exception".equals(nam)) { throw new RemoteException(); @@ -689,14 +703,17 @@ public class JaxRpcSupportTests extends TestCase { name = nam; } + @Override public void _setProperty(String key, Object o) { properties.put(key, o); } + @Override public Object _getProperty(String key) { return properties.get(key); } + @Override public Iterator _getPropertyNames() { return properties.keySet().iterator(); } diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java index 6c9ba364621..4cd69cbb416 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java @@ -31,6 +31,7 @@ public class OrderServiceImpl implements OrderService { @Resource private WebServiceContext webServiceContext; + @Override public String getOrder(int id) throws OrderNotFoundException { Assert.notNull(this.webServiceContext, "WebServiceContext has not been injected"); if (id == 0) { diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index a34e3749b95..cf514b44b86 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -44,6 +44,7 @@ public class ServletRequestDataBinderTests { ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } @@ -168,6 +169,7 @@ public class ServletRequestDataBinderTests { ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index 49be202f580..3f194e9bd0f 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -46,6 +46,7 @@ public class WebRequestDataBinderTests { WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java index 55a115e2d42..6d9d28e0a7d 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java @@ -87,6 +87,7 @@ public class RequestContextListenerTests extends TestCase { // Execute requestDestroyed callback in different thread. Thread thread = new Thread() { + @Override public void run() { listener.requestDestroyed(new ServletRequestEvent(context, request)); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java index 80a3a1b80c8..3b12ab2dbaf 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java @@ -38,6 +38,7 @@ public class RequestScopeTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.beanFactory.registerScope("request", new RequestScope()); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java index cb45ad363a1..c6b0c656fae 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java @@ -40,6 +40,7 @@ public class SessionScopeTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.beanFactory.registerScope("session", new SessionScope()); @@ -162,14 +163,17 @@ public class SessionScopeTests extends TestCase { private static class CustomDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { } } @@ -179,14 +183,17 @@ public class SessionScopeTests extends TestCase { private static class CustomSerializableDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor, Serializable { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { if (bean instanceof BeanNameAware) { ((BeanNameAware) bean).setBeanName(null); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java index bcb780ae9a3..2590481d3d3 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java @@ -86,6 +86,7 @@ public class DeferredResultTests { DeferredResult result = new DeferredResult(); result.onCompletion(new Runnable() { + @Override public void run() { sb.append("completion event"); } @@ -108,6 +109,7 @@ public class DeferredResultTests { DeferredResult result = new DeferredResult(null, "timeout result"); result.setResultHandler(handler); result.onTimeout(new Runnable() { + @Override public void run() { sb.append("timeout event"); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index 50df5a3a35d..506201f5ba5 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java @@ -432,6 +432,7 @@ public class WebAsyncManagerTests { this.value = value; } + @Override public Object call() throws Exception { if (this.value instanceof Exception) { throw ((Exception) this.value); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java index 6ffbec1d7a3..936be8d79aa 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java @@ -104,6 +104,7 @@ public class WebAsyncManagerTimeoutTests { StubCallable callable = new StubCallable(); WebAsyncTask webAsyncTask = new WebAsyncTask(callable); webAsyncTask.onTimeout(new Callable() { + @Override public Object call() throws Exception { return 7; } @@ -207,6 +208,7 @@ public class WebAsyncManagerTimeoutTests { final DeferredResult deferredResult = new DeferredResult(); deferredResult.onTimeout(new Runnable() { + @Override public void run() { deferredResult.setResult(23); } @@ -228,6 +230,7 @@ public class WebAsyncManagerTimeoutTests { DeferredResult deferredResult = new DeferredResult(); DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() { + @Override public boolean handleTimeout(NativeWebRequest request, DeferredResult result) throws Exception { result.setErrorResult(23); return true; @@ -252,6 +255,7 @@ public class WebAsyncManagerTimeoutTests { final Exception exception = new Exception(); DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() { + @Override public boolean handleTimeout(NativeWebRequest request, DeferredResult result) throws Exception { throw exception; } @@ -270,6 +274,7 @@ public class WebAsyncManagerTimeoutTests { private final class StubCallable implements Callable { + @Override public Object call() throws Exception { return 21; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java index 4f7d5451d3e..d55954f32e2 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java @@ -71,14 +71,17 @@ public class CompositeFilterTests { public FilterConfig filterConfig; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { request.setAttribute("called", Boolean.TRUE); } + @Override public void destroy() { this.filterConfig = null; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java index 0d54f55d485..69df4dd5f1d 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java @@ -272,14 +272,17 @@ public class DelegatingFilterProxyTests { public FilterConfig filterConfig; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { request.setAttribute("called", Boolean.TRUE); } + @Override public void destroy() { this.filterConfig = null; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java index 13f74da0aa1..d1af1f1fcc0 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java +++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java @@ -48,6 +48,7 @@ public class HiddenHttpMethodFilterTest { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid method", "DELETE", ((HttpServletRequest) filterRequest).getMethod()); @@ -63,6 +64,7 @@ public class HiddenHttpMethodFilterTest { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid method", "POST", ((HttpServletRequest) filterRequest).getMethod()); diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java index 5eed6a55ac7..d8c4128bf44 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java @@ -54,6 +54,7 @@ public class RequestContextFilterTests extends TestCase { // Expect one invocation by the filter being tested class DummyFilterChain implements FilterChain { public int invocations = 0; + @Override public void doFilter(ServletRequest req, ServletResponse resp) throws IOException, ServletException { ++invocations; if (invocations == 1) { diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java index a05f09a2fab..15ab9998a41 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java @@ -97,6 +97,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -122,6 +123,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody.getBytes("UTF-8")); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -148,6 +150,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -182,6 +185,7 @@ public class RequestLoggingFilterTests { private static class NoopFilterChain implements FilterChain { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } } diff --git a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java index f5fdf084994..8ff31eb224a 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java @@ -58,6 +58,7 @@ public class ShallowEtagHeaderFilterTests { final byte[] responseBody = "Hello World".getBytes("UTF-8"); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); @@ -83,6 +84,7 @@ public class ShallowEtagHeaderFilterTests { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); @@ -109,6 +111,7 @@ public class ShallowEtagHeaderFilterTests { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java index e106045cf92..0138ccd067e 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java @@ -36,12 +36,14 @@ public class DelegatingPhaseListenerTests extends TestCase { private StaticListableBeanFactory beanFactory; private DelegatingPhaseListenerMulticaster delPhaseListener; + @Override @SuppressWarnings("serial") protected void setUp() { facesContext = new MockFacesContext(); beanFactory = new StaticListableBeanFactory(); delPhaseListener = new DelegatingPhaseListenerMulticaster() { + @Override protected ListableBeanFactory getBeanFactory(FacesContext facesContext) { return beanFactory; } @@ -87,14 +89,17 @@ public class DelegatingPhaseListenerTests extends TestCase { boolean beforeCalled = false; boolean afterCalled = false; + @Override public PhaseId getPhaseId() { return PhaseId.ANY_PHASE; } + @Override public void beforePhase(PhaseEvent arg0) { beforeCalled = true; } + @Override public void afterPhase(PhaseEvent arg0) { afterCalled = true; } diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java index 76e8c829b14..0eefcba0c7e 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java @@ -42,6 +42,7 @@ public class DelegatingVariableResolverTests extends TestCase { // We need to override the getWebApplicationContext method here: // FacesContext and ExternalContext are hard to mock. DelegatingVariableResolver resolver = new DelegatingVariableResolver(new OriginalVariableResolver()) { + @Override protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) { return wac; } @@ -61,6 +62,7 @@ public class DelegatingVariableResolverTests extends TestCase { // We need to override the getWebApplicationContext method here: // FacesContext and ExternalContext are hard to mock. SpringBeanVariableResolver resolver = new SpringBeanVariableResolver(new OriginalVariableResolver()) { + @Override protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) { return wac; } @@ -72,6 +74,7 @@ public class DelegatingVariableResolverTests extends TestCase { private static class OriginalVariableResolver extends VariableResolver { + @Override public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException { if ("var1".equals(name)) { return "val1"; diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java index 1e6c9d3f9ff..7faee579e7c 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java @@ -44,6 +44,7 @@ public class MockFacesContext extends FacesContext { private UIViewRoot viewRoot; + @Override public Application getApplication() { return application; } @@ -52,10 +53,12 @@ public class MockFacesContext extends FacesContext { this.application = application; } + @Override public Iterator getClientIdsWithMessages() { return null; } + @Override public ExternalContext getExternalContext() { return externalContext; } @@ -64,61 +67,77 @@ public class MockFacesContext extends FacesContext { this.externalContext = externalContext; } + @Override public Severity getMaximumSeverity() { return null; } + @Override public Iterator getMessages() { return null; } + @Override public Iterator getMessages(String arg0) { return null; } + @Override public RenderKit getRenderKit() { return null; } + @Override public boolean getRenderResponse() { return false; } + @Override public boolean getResponseComplete() { return false; } + @Override public ResponseStream getResponseStream() { return null; } + @Override public void setResponseStream(ResponseStream arg0) { } + @Override public ResponseWriter getResponseWriter() { return null; } + @Override public void setResponseWriter(ResponseWriter arg0) { } + @Override public UIViewRoot getViewRoot() { return viewRoot; } + @Override public void setViewRoot(UIViewRoot viewRoot) { this.viewRoot = viewRoot; } + @Override public void addMessage(String arg0, FacesMessage arg1) { } + @Override public void release() { } + @Override public void renderResponse() { } + @Override public void responseComplete() { } diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java index 5cda13aead9..0ab7d46b39c 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java @@ -27,19 +27,24 @@ import javax.faces.lifecycle.Lifecycle; */ public class MockLifecycle extends Lifecycle { + @Override public void addPhaseListener(PhaseListener phaseListener) { } + @Override public void execute(FacesContext facesContext) throws FacesException { } + @Override public PhaseListener[] getPhaseListeners() { return null; } + @Override public void removePhaseListener(PhaseListener phaseListener) { } + @Override public void render(FacesContext facesContext) throws FacesException { } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java index 573b1c54b30..986df7e9fa5 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java @@ -265,14 +265,17 @@ public class ModelAttributeMethodProcessorTests { return validateInvoked; } + @Override public void bind(WebRequest request) { bindInvoked = true; } + @Override public void validate() { validateInvoked = true; } + @Override public void validate(Object... validationHints) { validateInvoked = true; } diff --git a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java index 9eb740031e4..d4e681abe38 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java @@ -226,10 +226,12 @@ public class InvocableHandlerMethodTests { private static class ExceptionRaisingArgumentResolver implements HandlerMethodArgumentResolver { + @Override public boolean supportsParameter(MethodParameter parameter) { return true; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { throw new HttpMessageNotReadableException("oops, can't read"); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java index 45c84b353b2..918894fb5fd 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java @@ -46,10 +46,12 @@ public class StubArgumentResolver implements HandlerMethodArgumentResolver { return resolvedParameters; } + @Override public boolean supportsParameter(MethodParameter parameter) { return parameter.getParameterType().equals(this.parameterType); } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { this.resolvedParameters.add(parameter); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java index 7f888093543..0320b886129 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java @@ -38,10 +38,12 @@ public class StubReturnValueHandler implements HandlerMethodReturnValueHandler { return this.returnValue; } + @Override public boolean supportsReturnType(MethodParameter returnType) { return returnType.getParameterType().equals(this.returnType); } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { this.returnValue = returnValue; diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java index ae2f318b4ce..b3aa9beb689 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java @@ -282,6 +282,7 @@ public class CommonsMultipartResolverTests { final List files = new ArrayList(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { MultipartHttpServletRequest request = (MultipartHttpServletRequest) servletRequest; files.addAll(request.getFileMap().values()); @@ -319,6 +320,7 @@ public class CommonsMultipartResolverTests { final List files = new ArrayList(); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest originalRequest, ServletResponse response) { if (originalRequest instanceof MultipartHttpServletRequest) { MultipartHttpServletRequest request = (MultipartHttpServletRequest) originalRequest; @@ -415,38 +417,47 @@ public class CommonsMultipartResolverTests { this.value = value; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(value.getBytes()); } + @Override public String getContentType() { return contentType; } + @Override public String getName() { return name; } + @Override public boolean isInMemory() { return true; } + @Override public long getSize() { return value.length(); } + @Override public byte[] get() { return value.getBytes(); } + @Override public String getString(String encoding) throws UnsupportedEncodingException { return new String(get(), encoding); } + @Override public String getString() { return value; } + @Override public void write(File file) throws Exception { this.writtenFile = file; } @@ -455,6 +466,7 @@ public class CommonsMultipartResolverTests { return writtenFile; } + @Override public void delete() { this.deleted = true; } @@ -463,22 +475,27 @@ public class CommonsMultipartResolverTests { return deleted; } + @Override public String getFieldName() { return fieldName; } + @Override public void setFieldName(String s) { this.fieldName = s; } + @Override public boolean isFormField() { return (this.name == null); } + @Override public void setFormField(boolean b) { throw new UnsupportedOperationException(); } + @Override public OutputStream getOutputStream() throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java index 72f1019cdc3..80bf92165b3 100644 --- a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java @@ -270,6 +270,7 @@ public class ExpressionEvaluationUtilsTests { private ExpressionEvaluator eval = new CountingMockExpressionEvaluator(this); + @Override public ExpressionEvaluator getExpressionEvaluator() { return eval; } @@ -286,11 +287,13 @@ public class ExpressionEvaluationUtilsTests { super(pageContext); } + @Override public Expression parseExpression(String expression, Class expectedType, FunctionMapper functionMapper) throws ELException { this.parseExpressionCount++; return super.parseExpression(expression, expectedType, functionMapper); } + @Override public Object evaluate(String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) throws ELException { this.evaluateCount++; return super.evaluate(expression, expectedType, variableResolver, functionMapper); diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java index bb078da54c4..d2eab76bc3c 100644 --- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java +++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java @@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent) */ + @Override protected void append(LoggingEvent evt) { //System.out.println("Adding " + evt.getMessage()); loggingStrings.add(evt.getMessage()); @@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#close() */ + @Override public void close() { closeCalled = true; } @@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#requiresLayout() */ + @Override public boolean requiresLayout() { return false; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index a04d1796443..9c8be8ac4c4 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 4715fe448f6..17fd2145987 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java index 72c129ca4e3..2a624d5c97f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java @@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index a0493b62ec2..fe8201644ba 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java index 8137de62f61..bd15215911b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java index 9ab3f8ea40d..a4c79b2e2c0 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java index 50c9936c444..14acac1ceb9 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java index 29f375105ff..739222190fa 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java @@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index 784e160483a..c4d9b9ebb3d 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java index c86e95a93a7..5a2b7fd1aa8 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; @@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java index 1855230d2c5..82a89b61a38 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index f71992aed7e..dbcfa62be33 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile { } + @Override public String getName() { return this.name; } + @Override public String getOriginalFilename() { return this.originalFilename; } + @Override public String getContentType() { return this.contentType; } + @Override public boolean isEmpty() { return (this.content.length == 0); } + @Override public long getSize() { return this.content.length; } + @Override public byte[] getBytes() throws IOException { return this.content; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public void transferTo(File dest) throws IOException, IllegalStateException { FileCopyUtils.copy(this.content, dest); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java index 88660bb3aed..e43172c1982 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java index e3fa23eff3e..cf3e6e26c16 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java @@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return new Vector(this.attributes.keySet()).elements(); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java index bec6687887c..2f5c773e0c2 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java @@ -59,6 +59,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action } + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set WindowState after sendRedirect has been called"); @@ -67,6 +68,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set PortletMode after sendRedirect has been called"); @@ -75,6 +77,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameters(Map parameters) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -83,6 +86,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameter(String key, String value) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -91,6 +95,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameter(String key, String[] values) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -99,6 +104,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void sendRedirect(String location) throws IOException { if (!this.redirectAllowed) { throw new IllegalStateException( @@ -108,6 +114,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectedUrl = location; } + @Override public void sendRedirect(String location, String renderUrlParamName) throws IOException { sendRedirect(location); if (renderUrlParamName != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java index aad992058b9..fcdc50acdc0 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java @@ -56,18 +56,21 @@ public abstract class MockBaseURL implements BaseURL { // BaseURL methods //--------------------------------------------------------------------- + @Override public void setParameter(String key, String value) { Assert.notNull(key, "Parameter key must be null"); Assert.notNull(value, "Parameter value must not be null"); this.parameters.put(key, new String[] {value}); } + @Override public void setParameter(String key, String[] values) { Assert.notNull(key, "Parameter key must be null"); Assert.notNull(values, "Parameter values must not be null"); this.parameters.put(key, values); } + @Override public void setParameters(Map parameters) { Assert.notNull(parameters, "Parameters Map must not be null"); this.parameters.clear(); @@ -87,10 +90,12 @@ public abstract class MockBaseURL implements BaseURL { return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } + @Override public void setSecure(boolean secure) throws PortletSecurityException { this.secure = secure; } @@ -99,14 +104,17 @@ public abstract class MockBaseURL implements BaseURL { return this.secure; } + @Override public void write(Writer out) throws IOException { out.write(toString()); } + @Override public void write(Writer out, boolean escapeXML) throws IOException { out.write(toString()); } + @Override public void addProperty(String key, String value) { String[] values = this.properties.get(key); if (values != null) { @@ -117,6 +125,7 @@ public abstract class MockBaseURL implements BaseURL { } } + @Override public void setProperty(String key, String value) { this.properties.put(key, new String[] {value}); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java index 0ee9fbeb7c7..cac1a83d5ff 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java @@ -35,34 +35,42 @@ public class MockCacheControl implements CacheControl { private boolean useCachedContent = false; + @Override public int getExpirationTime() { return this.expirationTime; } + @Override public void setExpirationTime(int time) { this.expirationTime = time; } + @Override public boolean isPublicScope() { return this.publicScope; } + @Override public void setPublicScope(boolean publicScope) { this.publicScope = publicScope; } + @Override public String getETag() { return this.etag; } + @Override public void setETag(String token) { this.etag = token; } + @Override public boolean useCachedContent() { return this.useCachedContent; } + @Override public void setUseCachedContent(boolean useCachedContent) { this.useCachedContent = useCachedContent; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java index 8f36c3a7640..8fa396de4d5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java @@ -76,6 +76,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.content = content; } + @Override public InputStream getPortletInputStream() throws IOException { if (this.content != null) { return new ByteArrayInputStream(this.content); @@ -85,10 +86,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD } } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -101,6 +104,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } @@ -109,10 +113,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.contentType = contentType; } + @Override public String getContentType() { return this.contentType; } + @Override public int getContentLength() { return (this.content != null ? content.length : -1); } @@ -121,6 +127,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.method = method; } + @Override public String getMethod() { return this.method; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java index 0dc7efaba8d..c2c82febae7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java @@ -73,14 +73,17 @@ public class MockEvent implements Event { } + @Override public QName getQName() { return this.name; } + @Override public String getName() { return this.name.getLocalPart(); } + @Override public Serializable getValue() { return this.value; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java index 2406f18d01c..af4725dea72 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java @@ -73,6 +73,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest return EVENT_PHASE; } + @Override public Event getEvent() { return this.event; } @@ -81,6 +82,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest this.method = method; } + @Override public String getMethod() { return this.method; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java index 1a00e8b2d55..f7c846e028f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java @@ -27,6 +27,7 @@ import javax.portlet.EventResponse; */ public class MockEventResponse extends MockStateAwareResponse implements EventResponse { + @Override public void setRenderParameters(EventRequest request) { setRenderParameters(request.getParameterMap()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java index e606fc808d2..cbfb70bca1e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java @@ -101,6 +101,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons // RenderResponse methods //--------------------------------------------------------------------- + @Override public void setContentType(String contentType) { if (this.request != null) { Enumeration supportedTypes = this.request.getResponseContentTypes(); @@ -112,6 +113,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.contentType = contentType; } + @Override public String getContentType() { return this.contentType; } @@ -120,10 +122,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.characterEncoding = characterEncoding; } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (this.writer == null) { Writer targetWriter = (this.characterEncoding != null @@ -150,18 +154,22 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { if (this.writer != null) { this.writer.flush(); @@ -177,6 +185,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.committed = true; } + @Override public void resetBuffer() { if (this.committed) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -188,10 +197,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -199,22 +210,27 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.locale = null; } + @Override public OutputStream getPortletOutputStream() throws IOException { return this.outputStream; } + @Override public PortletURL createRenderURL() { return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_RENDER); } + @Override public PortletURL createActionURL() { return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_ACTION); } + @Override public ResourceURL createResourceURL() { return new MockResourceURL(); } + @Override public CacheControl getCacheControl() { return this.cacheControl; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java index 7df8b547b09..54201b8ec8b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java @@ -56,14 +56,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul this.multipartFiles.add(file.getName(), file); } + @Override public Iterator getFileNames() { return this.multipartFiles.keySet().iterator(); } + @Override public MultipartFile getFile(String name) { return this.multipartFiles.getFirst(name); } + @Override public List getFiles(String name) { List multipartFiles = this.multipartFiles.get(name); if (multipartFiles != null) { @@ -74,14 +77,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul } } + @Override public Map getFileMap() { return this.multipartFiles.toSingleValueMap(); } + @Override public MultiValueMap getMultiFileMap() { return new LinkedMultiValueMap(this.multipartFiles); } + @Override public String getMultipartContentType(String paramOrFileName) { MultipartFile file = getFile(paramOrFileName); if (file != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java index 949d077b9a2..8731438d70c 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java @@ -74,6 +74,7 @@ public class MockPortalContext implements PortalContext { } + @Override public String getPortalInfo() { return "MockPortal/1.0"; } @@ -82,18 +83,22 @@ public class MockPortalContext implements PortalContext { this.properties.put(name, value); } + @Override public String getProperty(String name) { return this.properties.get(name); } + @Override public Enumeration getPropertyNames() { return Collections.enumeration(this.properties.keySet()); } + @Override public Enumeration getSupportedPortletModes() { return Collections.enumeration(this.portletModes); } + @Override public Enumeration getSupportedWindowStates() { return Collections.enumeration(this.windowStates); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java index 985c1e20dca..8d9157e1d2f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java @@ -96,10 +96,12 @@ public class MockPortletConfig implements PortletConfig { } + @Override public String getPortletName() { return this.portletName; } + @Override public PortletContext getPortletContext() { return this.portletContext; } @@ -109,6 +111,7 @@ public class MockPortletConfig implements PortletConfig { this.resourceBundles.put(locale, resourceBundle); } + @Override public ResourceBundle getResourceBundle(Locale locale) { Assert.notNull(locale, "Locale must not be null"); return this.resourceBundles.get(locale); @@ -119,11 +122,13 @@ public class MockPortletConfig implements PortletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -132,6 +137,7 @@ public class MockPortletConfig implements PortletConfig { this.publicRenderParameterNames.add(name); } + @Override public Enumeration getPublicRenderParameterNames() { return Collections.enumeration(this.publicRenderParameterNames); } @@ -140,6 +146,7 @@ public class MockPortletConfig implements PortletConfig { this.defaultNamespace = defaultNamespace; } + @Override public String getDefaultNamespace() { return this.defaultNamespace; } @@ -148,6 +155,7 @@ public class MockPortletConfig implements PortletConfig { this.publishingEventQNames.add(name); } + @Override public Enumeration getPublishingEventQNames() { return Collections.enumeration(this.publishingEventQNames); } @@ -156,6 +164,7 @@ public class MockPortletConfig implements PortletConfig { this.processingEventQNames.add(name); } + @Override public Enumeration getProcessingEventQNames() { return Collections.enumeration(this.processingEventQNames); } @@ -164,6 +173,7 @@ public class MockPortletConfig implements PortletConfig { this.supportedLocales.add(locale); } + @Override public Enumeration getSupportedLocales() { return Collections.enumeration(this.supportedLocales); } @@ -176,6 +186,7 @@ public class MockPortletConfig implements PortletConfig { this.containerRuntimeOptions.put(key, values); } + @Override public Map getContainerRuntimeOptions() { return Collections.unmodifiableMap(this.containerRuntimeOptions); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java index cd8c997e37d..a37c747e12a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java @@ -124,10 +124,12 @@ public class MockPortletContext implements PortletContext { } + @Override public String getServerInfo() { return "MockPortal/1.0"; } + @Override public PortletRequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException( @@ -136,10 +138,12 @@ public class MockPortletContext implements PortletContext { return new MockPortletRequestDispatcher(path); } + @Override public PortletRequestDispatcher getNamedDispatcher(String path) { return null; } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -151,18 +155,22 @@ public class MockPortletContext implements PortletContext { } } + @Override public int getMajorVersion() { return 2; } + @Override public int getMinorVersion() { return 0; } + @Override public String getMimeType(String filePath) { return null; } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -174,6 +182,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public Set getResourcePaths(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -192,6 +201,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -203,14 +213,17 @@ public class MockPortletContext implements PortletContext { } } + @Override public Object getAttribute(String name) { return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public void setAttribute(String name, Object value) { if (value != null) { this.attributes.put(name, value); @@ -220,6 +233,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public void removeAttribute(String name) { this.attributes.remove(name); } @@ -229,19 +243,23 @@ public class MockPortletContext implements PortletContext { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(String message, Throwable t) { logger.info(message, t); } @@ -250,6 +268,7 @@ public class MockPortletContext implements PortletContext { this.portletContextName = portletContextName; } + @Override public String getPortletContextName() { return this.portletContextName; } @@ -258,6 +277,7 @@ public class MockPortletContext implements PortletContext { this.containerRuntimeOptions.add(key); } + @Override public Enumeration getContainerRuntimeOptions() { return Collections.enumeration(this.containerRuntimeOptions); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java index b885f358526..d5dab011ced 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -171,10 +171,12 @@ public class MockPortletRequest implements PortletRequest { // PortletRequest methods //--------------------------------------------------------------------- + @Override public boolean isWindowStateAllowed(WindowState windowState) { return CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState); } + @Override public boolean isPortletModeAllowed(PortletMode portletMode) { return CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode); } @@ -184,6 +186,7 @@ public class MockPortletRequest implements PortletRequest { this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } @@ -193,6 +196,7 @@ public class MockPortletRequest implements PortletRequest { this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } @@ -202,6 +206,7 @@ public class MockPortletRequest implements PortletRequest { this.portletPreferences = preferences; } + @Override public PortletPreferences getPreferences() { return this.portletPreferences; } @@ -214,10 +219,12 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public PortletSession getPortletSession() { return getPortletSession(true); } + @Override public PortletSession getPortletSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -261,21 +268,25 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public String getProperty(String key) { Assert.notNull(key, "Property key must not be null"); List list = this.properties.get(key); return (list != null && list.size() > 0 ? (String) list.get(0) : null); } + @Override public Enumeration getProperties(String key) { Assert.notNull(key, "property key must not be null"); return Collections.enumeration(this.properties.get(key)); } + @Override public Enumeration getPropertyNames() { return Collections.enumeration(this.properties.keySet()); } + @Override public PortalContext getPortalContext() { return this.portalContext; } @@ -284,6 +295,7 @@ public class MockPortletRequest implements PortletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -292,6 +304,7 @@ public class MockPortletRequest implements PortletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -300,6 +313,7 @@ public class MockPortletRequest implements PortletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -308,6 +322,7 @@ public class MockPortletRequest implements PortletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -316,15 +331,18 @@ public class MockPortletRequest implements PortletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return this.userRoles.contains(role); } + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); @@ -365,19 +383,23 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public String getParameter(String name) { String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -386,10 +408,12 @@ public class MockPortletRequest implements PortletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public void setAttribute(String name, Object value) { checkActive(); if (value != null) { @@ -400,11 +424,13 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); this.attributes.remove(name); } + @Override public String getRequestedSessionId() { PortletSession session = this.getPortletSession(); return (session != null ? session.getId() : null); @@ -414,6 +440,7 @@ public class MockPortletRequest implements PortletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -426,10 +453,12 @@ public class MockPortletRequest implements PortletRequest { this.responseContentTypes.add(0, responseContentType); } + @Override public String getResponseContentType() { return this.responseContentTypes.get(0); } + @Override public Enumeration getResponseContentTypes() { return Collections.enumeration(this.responseContentTypes); } @@ -442,10 +471,12 @@ public class MockPortletRequest implements PortletRequest { this.locales.add(0, locale); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -454,6 +485,7 @@ public class MockPortletRequest implements PortletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -462,6 +494,7 @@ public class MockPortletRequest implements PortletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -470,6 +503,7 @@ public class MockPortletRequest implements PortletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } @@ -478,6 +512,7 @@ public class MockPortletRequest implements PortletRequest { this.windowID = windowID; } + @Override public String getWindowID() { return this.windowID; } @@ -486,10 +521,12 @@ public class MockPortletRequest implements PortletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } + @Override public Map getPrivateParameterMap() { if (!this.publicParameterNames.isEmpty()) { Map filtered = new LinkedHashMap(); @@ -505,6 +542,7 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public Map getPublicParameterMap() { if (!this.publicParameterNames.isEmpty()) { Map filtered = new LinkedHashMap(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java index ca8695f90e2..5ba423ed0e5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java @@ -53,10 +53,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher { } + @Override public void include(RenderRequest request, RenderResponse response) throws PortletException, IOException { include((PortletRequest) request, (PortletResponse) response); } + @Override public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -69,6 +71,7 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher { } } + @Override public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java index b556209fcd3..9fe6d6315f7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java @@ -85,6 +85,7 @@ public class MockPortletResponse implements PortletResponse { // PortletResponse methods //--------------------------------------------------------------------- + @Override public void addProperty(String key, String value) { Assert.notNull(key, "Property key must not be null"); String[] oldArr = this.properties.get(key); @@ -99,6 +100,7 @@ public class MockPortletResponse implements PortletResponse { } } + @Override public void setProperty(String key, String value) { Assert.notNull(key, "Property key must not be null"); this.properties.put(key, new String[] {value}); @@ -119,6 +121,7 @@ public class MockPortletResponse implements PortletResponse { return this.properties.get(key); } + @Override public String encodeURL(String path) { return path; } @@ -127,10 +130,12 @@ public class MockPortletResponse implements PortletResponse { this.namespace = namespace; } + @Override public String getNamespace() { return this.namespace; } + @Override public void addProperty(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -150,6 +155,7 @@ public class MockPortletResponse implements PortletResponse { return null; } + @Override public void addProperty(String key, Element value) { Assert.notNull(key, "Property key must not be null"); Element[] oldArr = this.xmlProperties.get(key); @@ -180,6 +186,7 @@ public class MockPortletResponse implements PortletResponse { return this.xmlProperties.get(key); } + @Override public Element createElement(String tagName) throws DOMException { if (this.xmlDocument == null) { try { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java index d9632906f76..e589e6a1034 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java @@ -76,10 +76,12 @@ public class MockPortletSession implements PortletSession { } + @Override public Object getAttribute(String name) { return this.portletAttributes.get(name); } + @Override public Object getAttribute(String name, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return this.portletAttributes.get(name); @@ -90,10 +92,12 @@ public class MockPortletSession implements PortletSession { return null; } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.portletAttributes.keySet()); } + @Override public Enumeration getAttributeNames(int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return Collections.enumeration(this.portletAttributes.keySet()); @@ -104,10 +108,12 @@ public class MockPortletSession implements PortletSession { return null; } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -117,10 +123,12 @@ public class MockPortletSession implements PortletSession { setNew(false); } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } @@ -146,6 +154,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void invalidate() { this.invalid = true; clearAttributes(); @@ -159,14 +168,17 @@ public class MockPortletSession implements PortletSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } + @Override public void removeAttribute(String name) { this.portletAttributes.remove(name); } + @Override public void removeAttribute(String name, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { this.portletAttributes.remove(name); @@ -176,6 +188,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setAttribute(String name, Object value) { if (value != null) { this.portletAttributes.put(name, value); @@ -185,6 +198,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setAttribute(String name, Object value, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { if (value != null) { @@ -204,18 +218,22 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public PortletContext getPortletContext() { return this.portletContext; } + @Override public Map getAttributeMap() { return Collections.unmodifiableMap(this.portletAttributes); } + @Override public Map getAttributeMap(int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return Collections.unmodifiableMap(this.portletAttributes); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java index 12abdf57c93..53deff09162 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java @@ -69,6 +69,7 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { // PortletURL methods //--------------------------------------------------------------------- + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (!CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState)) { throw new WindowStateException("WindowState not supported", windowState); @@ -76,10 +77,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (!CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode)) { throw new PortletModeException("PortletMode not supported", portletMode); @@ -87,10 +90,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } + @Override public void removePublicRenderParameter(String name) { this.parameters.remove(name); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java index d86ba7f2ad4..672a51dcb72 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java @@ -86,6 +86,7 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque return RENDER_PHASE; } + @Override public String getETag() { return getProperty(RenderRequest.ETAG); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java index a2feeb3726d..7f70be9a051 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java @@ -69,6 +69,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon // RenderResponse methods //--------------------------------------------------------------------- + @Override public void setTitle(String title) { this.title = title; } @@ -77,6 +78,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon return this.title; } + @Override public void setNextPossiblePortletModes(Collection portletModes) { this.nextPossiblePortletModes = portletModes; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java index 7cce4ba3c6d..e889d923149 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java @@ -97,6 +97,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.resourceID = resourceID; } + @Override public String getResourceID() { return this.resourceID; } @@ -105,10 +106,12 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.cacheability = cacheLevel; } + @Override public String getCacheability() { return this.cacheability; } + @Override public String getETag() { return getProperty(RenderRequest.ETAG); } @@ -121,6 +124,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.privateRenderParameterMap.put(key, values); } + @Override public Map getPrivateRenderParameterMap() { return Collections.unmodifiableMap(this.privateRenderParameterMap); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java index 297a19682ea..00a267b1d83 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java @@ -29,6 +29,7 @@ public class MockResourceResponse extends MockMimeResponse implements ResourceRe private int contentLength = 0; + @Override public void setContentLength(int len) { this.contentLength = len; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java index cce36b18d55..12b7fd4a39e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java @@ -36,6 +36,7 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL { // ResourceURL methods //--------------------------------------------------------------------- + @Override public void setResourceID(String resourceID) { this.resourceID = resourceID; } @@ -44,10 +45,12 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL { return this.resourceID; } + @Override public void setCacheability(String cacheLevel) { this.cacheability = cacheLevel; } + @Override public String getCacheability() { return this.cacheability; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java index 68536584471..6d2f6d74faf 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java @@ -68,6 +68,7 @@ public class MockStateAwareResponse extends MockPortletResponse implements State } + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (!CollectionUtils.contains(getPortalContext().getSupportedWindowStates(), windowState)) { throw new WindowStateException("WindowState not supported", windowState); @@ -75,10 +76,12 @@ public class MockStateAwareResponse extends MockPortletResponse implements State this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (!CollectionUtils.contains(getPortalContext().getSupportedPortletModes(), portletMode)) { throw new PortletModeException("PortletMode not supported", portletMode); @@ -86,22 +89,26 @@ public class MockStateAwareResponse extends MockPortletResponse implements State this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } + @Override public void setRenderParameters(Map parameters) { Assert.notNull(parameters, "Parameters Map must not be null"); this.renderParameters.clear(); this.renderParameters.putAll(parameters); } + @Override public void setRenderParameter(String key, String value) { Assert.notNull(key, "Parameter key must not be null"); Assert.notNull(value, "Parameter value must not be null"); this.renderParameters.put(key, new String[] {value}); } + @Override public void setRenderParameter(String key, String[] values) { Assert.notNull(key, "Parameter key must not be null"); Assert.notNull(values, "Parameter values must not be null"); @@ -123,18 +130,22 @@ public class MockStateAwareResponse extends MockPortletResponse implements State return this.renderParameters.keySet().iterator(); } + @Override public Map getRenderParameterMap() { return Collections.unmodifiableMap(this.renderParameters); } + @Override public void removePublicRenderParameter(String name) { this.renderParameters.remove(name); } + @Override public void setEvent(QName name, Serializable value) { this.events.put(name, value); } + @Override public void setEvent(String name, Serializable value) { this.events.put(new QName(name), value); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java index a333984f48a..bb7e68319ce 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java @@ -59,85 +59,105 @@ public class ServletWrappingPortletContext implements PortletContext { } + @Override public String getServerInfo() { return this.servletContext.getServerInfo(); } + @Override public PortletRequestDispatcher getRequestDispatcher(String path) { return null; } + @Override public PortletRequestDispatcher getNamedDispatcher(String name) { return null; } + @Override public InputStream getResourceAsStream(String path) { return this.servletContext.getResourceAsStream(path); } + @Override public int getMajorVersion() { return 2; } + @Override public int getMinorVersion() { return 0; } + @Override public String getMimeType(String file) { return this.servletContext.getMimeType(file); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } + @Override @SuppressWarnings("unchecked") public Set getResourcePaths(String path) { return this.servletContext.getResourcePaths(path); } + @Override public URL getResource(String path) throws MalformedURLException { return this.servletContext.getResource(path); } + @Override public Object getAttribute(String name) { return this.servletContext.getAttribute(name); } + @Override @SuppressWarnings("unchecked") public Enumeration getAttributeNames() { return this.servletContext.getAttributeNames(); } + @Override public String getInitParameter(String name) { return this.servletContext.getInitParameter(name); } + @Override @SuppressWarnings("unchecked") public Enumeration getInitParameterNames() { return this.servletContext.getInitParameterNames(); } + @Override public void log(String msg) { this.servletContext.log(msg); } + @Override public void log(String message, Throwable throwable) { this.servletContext.log(message, throwable); } + @Override public void removeAttribute(String name) { this.servletContext.removeAttribute(name); } + @Override public void setAttribute(String name, Object object) { this.servletContext.setAttribute(name, object); } + @Override public String getPortletContextName() { return this.servletContext.getServletContextName(); } + @Override public Enumeration getContainerRuntimeOptions() { return Collections.enumeration(new HashSet()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java index f2fc531e763..0bed2747f11 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java @@ -80,6 +80,7 @@ import org.springframework.web.portlet.mvc.SimpleControllerHandlerAdapter; */ public class ComplexPortletApplicationContext extends StaticPortletApplicationContext { + @Override public void refresh() throws BeansException { registerSingleton("standardHandlerAdapter", SimpleControllerHandlerAdapter.class); registerSingleton("portletHandlerAdapter", SimplePortletHandlerAdapter.class); @@ -185,10 +186,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class TestController1 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("result", "test1-action"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return null; } @@ -197,8 +200,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class TestController2 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) {} + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { response.setProperty("result", "test2-view"); return null; @@ -208,8 +213,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class ViewController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) {} + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("someViewName", "result", "view was here"); } @@ -218,10 +225,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class EditController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "edit was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView(request.getParameter("param")); } @@ -230,10 +239,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class HelpController1 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "help1 was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("help1-view"); } @@ -242,10 +253,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class HelpController2 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "help2 was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("help2-view"); } @@ -253,12 +266,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class RequestLocaleCheckingController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException { if (!Locale.CANADA.equals(request.getLocale())) { throw new PortletException("Incorrect Locale in ActionRequest"); } } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws PortletException, IOException { if (!Locale.CANADA.equals(request.getLocale())) { @@ -272,12 +287,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class LocaleContextCheckingController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException { if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) { throw new PortletException("Incorrect Locale in LocaleContextHolder"); } } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws PortletException, IOException { if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) { @@ -293,14 +310,17 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo private PortletConfig portletConfig; + @Override public void init(PortletConfig portletConfig) throws PortletException { this.portletConfig = portletConfig; } + @Override public void processAction(ActionRequest request, ActionResponse response) throws PortletException { response.setRenderParameter("result", "myPortlet action called"); } + @Override public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.getWriter().write("myPortlet was here"); } @@ -309,6 +329,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return this.portletConfig; } + @Override public void destroy() { this.portletConfig = null; } @@ -323,6 +344,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class ExceptionThrowingHandler implements MyHandler { + @Override public void doSomething(PortletRequest request) throws Exception { if (request.getParameter("fail") != null) { throw new ModelAndViewDefiningException(new ModelAndView("failed-modelandview")); @@ -346,28 +368,34 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerAdapter implements HandlerAdapter, Ordered { + @Override public int getOrder() { return 99; } + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public void handleAction(ActionRequest request, ActionResponse response, Object delegate) throws Exception { ((MyHandler) delegate).doSomething(request); } + @Override public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object delegate) throws Exception { ((MyHandler) delegate).doSomething(request); return null; } + @Override public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler) throws Exception { return null; } + @Override public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception { } } @@ -375,6 +403,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor1 extends HandlerInterceptorAdapter { + @Override public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) throws PortletException { if (request.getAttribute("test2-remove-never") != null) { @@ -386,6 +415,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return true; } + @Override public void postHandleRender( RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView) throws PortletException { @@ -398,6 +428,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo request.removeAttribute("test1-remove-post"); } + @Override public void afterRenderCompletion( RenderRequest request, RenderResponse response, Object handler, Exception ex) throws PortletException { @@ -411,6 +442,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor2 extends HandlerInterceptorAdapter { + @Override public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) throws PortletException { if (request.getAttribute("test1-remove-post") == null) { @@ -425,6 +457,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return true; } + @Override public void postHandleRender( RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView) throws PortletException { @@ -440,6 +473,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo request.removeAttribute("test2-remove-post"); } + @Override public void afterRenderCompletion( RenderRequest request, RenderResponse response, Object handler, Exception ex) throws Exception { @@ -453,6 +487,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MultipartCheckingHandler implements MyHandler { + @Override public void doSomething(PortletRequest request) throws PortletException, IllegalAccessException { if (!(request instanceof MultipartActionRequest)) { throw new PortletException("Not in a MultipartActionRequest"); @@ -463,10 +498,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MockMultipartResolver implements PortletMultipartResolver { + @Override public boolean isMultipart(ActionRequest request) { return true; } + @Override public MultipartActionRequest resolveMultipart(ActionRequest request) throws MultipartException { if (request.getAttribute("fail") != null) { throw new MaxUploadSizeExceededException(1000); @@ -485,6 +522,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return new DefaultMultipartActionRequest(request, files, params, Collections.emptyMap()); } + @Override public void cleanupMultipart(MultipartActionRequest request) { if (request.getAttribute("cleanedUp") != null) { throw new IllegalStateException("Already cleaned up"); @@ -498,6 +536,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public int counter = 0; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof PortletRequestHandledEvent) { this.counter++; diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java index b624737c1b0..46ea7b2ba04 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java @@ -73,6 +73,7 @@ public class DispatcherPortletTests extends TestCase { private DispatcherPortlet complexDispatcherPortlet; + @Override protected void setUp() throws PortletException { simplePortletConfig = new MockPortletConfig(new MockPortletContext(), "simple"); complexPortletConfig = new MockPortletConfig(simplePortletConfig.getPortletContext(), "complex"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java index b2bc75c7033..7bd390f9d29 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java @@ -44,6 +44,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon private String renderCommandSessionAttributeName; private String formSessionAttributeName; + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); registerSingleton("controller1", TestFormController.class, pvs); @@ -98,17 +99,20 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon this.setFormView("form"); } + @Override public void doSubmitAction(Object command) { TestBean testBean = (TestBean) command; testBean.setAge(testBean.getAge() + 10); } + @Override public ModelAndView showForm(RenderRequest request, RenderResponse response, BindException errors) throws Exception { TestBean testBean = (TestBean) errors.getModel().get(getCommandName()); this.writeResponse(response, testBean, false); return null; } + @Override public ModelAndView onSubmitRender(RenderRequest request, RenderResponse response, Object command, BindException errors) throws IOException { TestBean testBean = (TestBean) command; @@ -128,6 +132,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon response.getWriter().write((finished ? "finished" : "") + (testBean.getAge() + 5)); } + @Override public void handleEventRequest(EventRequest request, EventResponse response) throws Exception { response.setRenderParameter("event", request.getEvent().getName()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java index da9b841c1b0..128f169bb82 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java @@ -70,6 +70,7 @@ public class PortletRequestDataBinderTests extends TestCase { PortletRequestDataBinder binder = new PortletRequestDataBinder(bean); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java index 98f3b178582..13fafe991a7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java @@ -44,6 +44,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl * Overridden as we can't trust superclass method * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { TestListener listener = (TestListener) this.applicationContext.getBean("testListener"); listener.zeroCounter(); @@ -58,6 +59,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl assertTrue("1 parent events after publication", parentListener.getEventCount() == 1); } + @Override public void testCount() { assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 14); @@ -104,6 +106,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) fail(); @@ -117,6 +120,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) fail(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java index 3492556e9a1..58118d77117 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java @@ -25,6 +25,7 @@ public class PortletConfigAwareBean implements PortletConfigAware { private PortletConfig portletConfig; + @Override public void setPortletConfig(PortletConfig portletConfig) { this.portletConfig = portletConfig; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java index b89b393ea78..405bc5d9fee 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java @@ -25,6 +25,7 @@ public class PortletContextAwareBean implements PortletContextAware { private PortletContext portletContext; + @Override public void setPortletContext(PortletContext portletContext) { this.portletContext = portletContext; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java index 148943c06de..61a42a0257e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java @@ -41,6 +41,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication private ConfigurablePortletApplicationContext root; + @Override protected ConfigurableApplicationContext createContext() throws Exception { root = new XmlPortletApplicationContext(); PortletContext portletContext = new MockPortletContext(); @@ -48,8 +49,10 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication root.setPortletConfig(portletConfig); root.setConfigLocations(new String[] {"/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml"}); root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { beanFactory.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if(bean instanceof TestBean) { ((TestBean) bean).getFriends().add("myFriend"); @@ -57,6 +60,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } @@ -101,6 +105,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication * Overridden in order to access the root ApplicationContext * @see org.springframework.web.context.XmlWebApplicationContextTests#testContextNesting() */ + @Override public void testContextNesting() { TestBean father = (TestBean) this.applicationContext.getBean("father"); assertTrue("Bean from root context", father != null); @@ -116,6 +121,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication assertTrue("Custom BeanPostProcessor applied", rod.getFriends().contains("myFriend")); } + @Override public void testCount() { assertTrue("should have 16 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 16); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java index 8f3c4a539d9..f260a375057 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java @@ -33,6 +33,7 @@ public class ParameterHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java index cff6418b88b..d1b9f80628b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java @@ -35,6 +35,7 @@ public class PortletModeHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java index 687e4938e4a..09206812b03 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java @@ -35,6 +35,7 @@ public class PortletModeParameterHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java index aecf7ef773a..a1bd2834d91 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java @@ -43,6 +43,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase { private Object handler2; private Exception genericException; + @Override protected void setUp() { exceptionResolver = new SimpleMappingExceptionResolver(); request = new MockRenderRequest(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java index fdf57bb0af2..f68e3b8d2d1 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java @@ -212,6 +212,7 @@ public class CommandControllerTests extends TestCase { public void testSuppressBinding() throws Exception { TestController tc = new TestController() { + @Override protected boolean suppressBinding(PortletRequest request) { return true; } @@ -236,6 +237,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditor() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); } @@ -261,6 +263,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditorEmptyNotAllowed() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); } @@ -287,6 +290,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditorEmptyAllowed() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); } @@ -310,8 +314,10 @@ public class CommandControllerTests extends TestCase { public void testNestedBindingWithPropertyEditor() throws Exception { TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } @@ -341,9 +347,11 @@ public class CommandControllerTests extends TestCase { public void testWithValidatorNotSupportingCommandClass() throws Exception { Validator v = new Validator() { + @Override public boolean supports(Class c) { return false; } + @Override public void validate(Object o, Errors e) {} }; TestController tc = new TestController(); @@ -364,9 +372,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { e.reject(errorCode, defaultMessage); } @@ -386,9 +396,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { ValidationUtils.rejectIfEmpty(e, "name", errorCode, defaultMessage); } @@ -413,9 +425,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { ValidationUtils.rejectIfEmptyOrWhitespace(e, "name", errorCode, defaultMessage); } @@ -444,10 +458,12 @@ public class CommandControllerTests extends TestCase { super(TestBean.class, "testBean"); } + @Override protected void handleAction(ActionRequest request, ActionResponse response, Object command, BindException errors) { ((TestBean)command).setJedi(true); } + @Override protected ModelAndView handleRender(RenderRequest request, RenderResponse response, Object command, BindException errors) { assertNotNull(command); assertNotNull(errors); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java index 008ccfaeeb6..af1d41ae3ec 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java @@ -34,6 +34,7 @@ public class PortletModeNameViewControllerTests extends TestCase { private PortletModeNameViewController controller; + @Override public void setUp() { controller = new PortletModeNameViewController(); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java index 1bda3ed3d29..93490aa4611 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java @@ -155,10 +155,12 @@ public final class PortletWrappingControllerTests { private PortletConfig portletConfig; + @Override public void init(PortletConfig portletConfig) { this.portletConfig = portletConfig; } + @Override public void processAction(ActionRequest request, ActionResponse response) throws PortletException { if (request.getParameter("test") != null) { response.setRenderParameter(RESULT_RENDER_PARAMETER_NAME, "myPortlet-action"); @@ -169,6 +171,7 @@ public final class PortletWrappingControllerTests { } } + @Override public void render(RenderRequest request, RenderResponse response) throws IOException { response.getWriter().write(RENDERED_RESPONSE_CONTENT); } @@ -177,6 +180,7 @@ public final class PortletWrappingControllerTests { return this.portletConfig; } + @Override public void destroy() { throw new IllegalStateException("Being destroyed..."); } @@ -185,6 +189,7 @@ public final class PortletWrappingControllerTests { private static final class MyApplicationContext extends StaticPortletApplicationContext { + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); pvs.add("portletClass", MyPortlet.class); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java index 71fd56e812a..4705be2f542 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java @@ -104,6 +104,7 @@ public class Portlet20AnnotationControllerTests { @Test public void standardHandleMethod() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class)); @@ -122,6 +123,7 @@ public class Portlet20AnnotationControllerTests { @Test public void standardHandleMethodWithResources() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletConfig(getPortletConfig()); @@ -173,6 +175,7 @@ public class Portlet20AnnotationControllerTests { private void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass)); @@ -217,12 +220,14 @@ public class Portlet20AnnotationControllerTests { @Test public void formController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -240,12 +245,14 @@ public class Portlet20AnnotationControllerTests { @Test public void modelFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -263,6 +270,7 @@ public class Portlet20AnnotationControllerTests { @Test public void commandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class)); @@ -272,6 +280,7 @@ public class Portlet20AnnotationControllerTests { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -290,6 +299,7 @@ public class Portlet20AnnotationControllerTests { @Test public void typedCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class)); @@ -301,6 +311,7 @@ public class Portlet20AnnotationControllerTests { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -338,12 +349,14 @@ public class Portlet20AnnotationControllerTests { @Test public void binderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -362,12 +375,14 @@ public class Portlet20AnnotationControllerTests { @Test public void specificBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -386,6 +401,7 @@ public class Portlet20AnnotationControllerTests { @Test public void parameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -427,6 +443,7 @@ public class Portlet20AnnotationControllerTests { @Test public void typeLevelParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -513,6 +530,7 @@ public class Portlet20AnnotationControllerTests { @Test public void portlet20DispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -613,6 +631,7 @@ public class Portlet20AnnotationControllerTests { @Test public void eventDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -697,6 +716,7 @@ public class Portlet20AnnotationControllerTests { @Test public void testPredicatePriorityComparisonAcrossControllers() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); // The order of handler registration is important to get @@ -762,6 +782,7 @@ public class Portlet20AnnotationControllerTests { @RequestMapping("VIEW") private static class MyController extends AbstractController { + @Override protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception { response.getWriter().write("test"); return null; @@ -950,6 +971,7 @@ public class Portlet20AnnotationControllerTests { return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString()); } + @Override @RequestMapping("VIEW") @RenderMapping public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { @@ -996,6 +1018,7 @@ public class Portlet20AnnotationControllerTests { private static class MyOtherTypedCommandProvidingFormController extends MyCommandProvidingFormController { + @Override @RequestMapping("VIEW") @RenderMapping public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { @@ -1034,6 +1057,7 @@ public class Portlet20AnnotationControllerTests { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { assertNotNull(request.getLocale()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -1045,6 +1069,7 @@ public class Portlet20AnnotationControllerTests { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java index 88cec558020..c1bc5ab6763 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java @@ -86,6 +86,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testStandardHandleMethod() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class)); @@ -115,6 +116,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass)); @@ -153,12 +155,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -175,12 +179,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testModelFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -197,6 +203,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class)); @@ -206,6 +213,7 @@ public class PortletAnnotationControllerTests extends TestCase { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -223,6 +231,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testTypedCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class)); @@ -234,6 +243,7 @@ public class PortletAnnotationControllerTests extends TestCase { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -270,12 +280,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -293,12 +305,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testSpecificBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -316,6 +330,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -356,6 +371,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testTypeLevelParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -465,6 +481,7 @@ public class PortletAnnotationControllerTests extends TestCase { @RequestMapping("VIEW") private static class MyController extends AbstractController { + @Override protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception { response.getWriter().write("test"); return null; @@ -600,6 +617,7 @@ public class PortletAnnotationControllerTests extends TestCase { return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString()); } + @Override @RequestMapping("VIEW") public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { if (!model.containsKey("myKey")) { @@ -644,6 +662,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MyOtherTypedCommandProvidingFormController extends MyCommandProvidingFormController { + @Override @RequestMapping("VIEW") public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { if (!model.containsKey("myKey")) { @@ -681,6 +700,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { assertNotNull(request.getLocale()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -692,6 +712,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -807,6 +828,7 @@ public class PortletAnnotationControllerTests extends TestCase { public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override public org.springframework.web.servlet.ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, Object returnValue, @@ -814,10 +836,12 @@ public class PortletAnnotationControllerTests extends TestCase { NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new org.springframework.web.servlet.ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java index a55e0d8e964..66903c3b910 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java @@ -83,6 +83,7 @@ public final class PortletUtilsTests { @Test(expected=FileNotFoundException.class) public void testGetRealPathWithPathThatCannotBeResolvedToFile() throws Exception { PortletUtils.getRealPath(new MockPortletContext() { + @Override public String getRealPath(String path) { return null; } @@ -221,6 +222,7 @@ public final class PortletUtilsTests { request.setParameter("William", "Baskerville"); request.setParameter("Adso", "Melk"); MockActionResponse response = new MockActionResponse() { + @Override public void setRenderParameter(String key, String[] values) { throw new IllegalStateException(); } @@ -243,6 +245,7 @@ public final class PortletUtilsTests { @Test public void testClearAllRenderParametersDoesNotPropagateExceptionIfRedirectAlreadySentAtTimeOfCall() throws Exception { MockActionResponse response = new MockActionResponse() { + @Override @SuppressWarnings("unchecked") public void setRenderParameters(Map parameters) { throw new IllegalStateException(); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 4715fe448f6..17fd2145987 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java index 72c129ca4e3..2a624d5c97f 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java @@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java index 8137de62f61..bd15215911b 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java index 9ab3f8ea40d..a4c79b2e2c0 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java index 50c9936c444..14acac1ceb9 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java index 29f375105ff..739222190fa 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java +++ b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java @@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java index ce3c45d2e72..facc86bace1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java @@ -45,10 +45,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java index cd81c78fa6e..2e0e3a0d3cd 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java @@ -325,6 +325,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index 8169998a93e..a84b83f7ad6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -105,6 +105,7 @@ public final class ContextLoaderTests { sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "/org/springframework/web/context/WEB-INF/applicationContext.xml"); final ServletContextListener listener = new ContextLoaderListener() { + @Override protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) { assertNotNull("The ServletContext should not be null.", servletContext); assertEquals("Verifying that we received the expected ServletContext.", sc, servletContext); @@ -301,6 +302,7 @@ public final class ContextLoaderTests { "/org/springframework/web/context/WEB-INF/applicationContext.xml", "/org/springframework/web/context/WEB-INF/fail.xml" }) { + @Override public void refresh() throws BeansException { try { super.refresh(); @@ -320,6 +322,7 @@ public final class ContextLoaderTests { } private static class TestContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableApplicationContext applicationContext) { ConfigurableEnvironment environment = applicationContext.getEnvironment(); environment.getPropertySources().addFirst(new PropertySource("testPropertySource") { @@ -332,6 +335,7 @@ public final class ContextLoaderTests { } private static class TestWebContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableWebApplicationContext applicationContext) { ServletContext ctx = applicationContext.getServletContext(); // type-safe access to servlet-specific methods ctx.setAttribute("initialized", true); @@ -339,6 +343,7 @@ public final class ContextLoaderTests { } private static class EnvApplicationContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableWebApplicationContext applicationContext) { // test that ApplicationContextInitializers can access ServletContext properties // via the environment (SPR-8991) @@ -352,6 +357,7 @@ public final class ContextLoaderTests { } private static class UnknownContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(UnknownApplicationContext applicationContext) { applicationContext.unheardOf(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java index ff462f3650f..b9710dd7980 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java @@ -60,6 +60,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext private MessageSource themeMsgSource; + @Override protected ConfigurableApplicationContext createContext() throws Exception { root = new XmlWebApplicationContext(); MockServletContext sc = new MockServletContext(); @@ -82,6 +83,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext return wac; } + @Override public void testCount() { assertTrue("should have 14 beans, not " + this.applicationContext.getBeanDefinitionCount(), @@ -92,6 +94,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext * Overridden as we can't trust superclass method. * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { // Do nothing } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java index c3dc6275e1b..018dd1cfeb8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java @@ -25,6 +25,7 @@ public class ServletConfigAwareBean implements ServletConfigAware { private ServletConfig servletConfig; + @Override public void setServletConfig(ServletConfig servletConfig) { this.servletConfig = servletConfig; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java index a868f2f30d9..2272378104b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java @@ -25,6 +25,7 @@ public class ServletContextAwareBean implements ServletContextAware { private ServletContext servletContext; + @Override public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java index cca608e9f19..3423fd8e884 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java @@ -45,6 +45,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes private ConfigurableWebApplicationContext root; + @Override protected ConfigurableApplicationContext createContext() throws Exception { InitAndIB.constructed = false; root = new XmlWebApplicationContext(); @@ -53,8 +54,10 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes root.setServletContext(sc); root.setConfigLocations(new String[] {"/org/springframework/web/context/WEB-INF/applicationContext.xml"}); root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.addBeanPostProcessor(new BeanPostProcessor() { + @Override @SuppressWarnings("unchecked") public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof TestBean) { @@ -62,6 +65,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { return bean; } @@ -90,6 +94,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes * Overridden as we can't trust superclass method * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { TestListener listener = (TestListener) this.applicationContext.getBean("testListener"); listener.zeroCounter(); @@ -104,6 +109,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes assertTrue("1 parent events after publication", parentListener.getEventCount() == 1); } + @Override public void testCount() { assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 14); @@ -169,6 +175,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) fail(); @@ -182,6 +189,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) fail(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java index 96429a28cda..c6a5025c137 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java @@ -48,6 +48,7 @@ public class HttpRequestHandlerTests { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.getBeanFactory().registerSingleton("myHandler", new HttpRequestHandler() { + @Override public void handleRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { assertSame(request, req); assertSame(response, res); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java index 75af2c0b5a4..2bf2ee7edbc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java @@ -371,6 +371,7 @@ public class ServletContextSupportTests { paths.add("/WEB-INF/context2.xml"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return paths; @@ -397,6 +398,7 @@ public class ServletContextSupportTests { dirs.add("/WEB-INF/mydir2/"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return dirs; @@ -433,6 +435,7 @@ public class ServletContextSupportTests { paths.add("/WEB-INF/mydir2/mydir3/"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return dirs; @@ -470,6 +473,7 @@ public class ServletContextSupportTests { paths.add("C:/webroot/someOtherDirThatDoesntContainPath"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return paths; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java index cae15040058..17bbabaa3db 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java @@ -73,6 +73,7 @@ import org.springframework.web.servlet.view.ResourceBundleViewResolver; */ public class ComplexWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException { registerSingleton(DispatcherServlet.LOCALE_RESOLVER_BEAN_NAME, SessionLocaleResolver.class); registerSingleton(DispatcherServlet.THEME_RESOLVER_BEAN_NAME, SessionThemeResolver.class); @@ -179,6 +180,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class HeadController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { if ("HEAD".equals(request.getMethod())) { response.setContentLength(5); @@ -190,6 +192,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class BodyController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { response.getOutputStream().write("body".getBytes()); return null; @@ -199,6 +202,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class NoViewController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { return new ModelAndView(); } @@ -209,22 +213,27 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { private ServletConfig servletConfig; + @Override public void init(ServletConfig servletConfig) throws ServletException { this.servletConfig = servletConfig; } + @Override public ServletConfig getServletConfig() { return servletConfig; } + @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException { servletResponse.getOutputStream().write("body".getBytes()); } + @Override public String getServletInfo() { return null; } + @Override public void destroy() { this.servletConfig = null; } @@ -241,20 +250,24 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerAdapter extends ApplicationObjectSupport implements HandlerAdapter, Ordered { + @Override public int getOrder() { return 99; } + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) throws ServletException, IllegalAccessException { ((MyHandler) delegate).doSomething(request); return null; } + @Override public long getLastModified(HttpServletRequest request, Object delegate) { return ((MyHandler) delegate).lastModified(); } @@ -263,15 +276,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyDummyAdapter extends ApplicationObjectSupport implements HandlerAdapter { + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) throws IOException, ServletException { throw new ServletException("dummy"); } + @Override public long getLastModified(HttpServletRequest request, Object delegate) { return -1; } @@ -280,6 +296,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor1 implements HandlerInterceptor { + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException { if (request.getAttribute("test2") != null) { @@ -291,6 +308,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { return true; } + @Override public void postHandle( HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws ServletException { @@ -303,6 +321,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { request.removeAttribute("test1x"); } + @Override public void afterCompletion( HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws ServletException { @@ -316,6 +335,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor2 implements HandlerInterceptor { + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException { if (request.getAttribute("test1x") == null) { @@ -330,6 +350,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { return true; } + @Override public void postHandle( HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws ServletException { @@ -345,6 +366,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { request.removeAttribute("test2x"); } + @Override public void afterCompletion( HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { @@ -358,14 +380,17 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyWebRequestInterceptor implements WebRequestInterceptor { + @Override public void preHandle(WebRequest request) throws Exception { request.setAttribute("test3", "test3", WebRequest.SCOPE_REQUEST); } + @Override public void postHandle(WebRequest request, ModelMap model) throws Exception { request.setAttribute("test3x", "test3x", WebRequest.SCOPE_REQUEST); } + @Override public void afterCompletion(WebRequest request, Exception ex) throws Exception { request.setAttribute("test3y", "test3y", WebRequest.SCOPE_REQUEST); } @@ -374,6 +399,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class ComplexLocaleChecker implements MyHandler { + @Override public void doSomething(HttpServletRequest request) throws ServletException, IllegalAccessException { WebApplicationContext wac = RequestContextUtils.getWebApplicationContext(request); if (!(wac instanceof ComplexWebApplicationContext)) { @@ -411,6 +437,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } } + @Override public long lastModified() { return 99; } @@ -419,10 +446,12 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MockMultipartResolver implements MultipartResolver { + @Override public boolean isMultipart(HttpServletRequest request) { return true; } + @Override public MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException { if (request.getAttribute("fail") != null) { throw new MaxUploadSizeExceededException(1000); @@ -435,15 +464,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } request.setAttribute("resolved", Boolean.TRUE); return new AbstractMultipartHttpServletRequest(request) { + @Override public HttpHeaders getMultipartHeaders(String paramOrFileName) { return null; } + @Override public String getMultipartContentType(String paramOrFileName) { return null; } }; } + @Override public void cleanupMultipart(MultipartHttpServletRequest request) { if (request.getAttribute("cleanedUp") != null) { throw new IllegalStateException("Already cleaned up"); @@ -457,6 +489,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public int counter = 0; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof RequestHandledEvent) { this.counter++; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index 9eadbf64610..635b8e0ba8c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -81,6 +81,7 @@ public class DispatcherServletTests extends TestCase { private DispatcherServlet complexDispatcherServlet; + @Override protected void setUp() throws ServletException { servletConfig = new MockServletConfig(new MockServletContext(), "simple"); MockServletConfig complexConfig = new MockServletConfig(servletConfig.getServletContext(), "complex"); @@ -869,6 +870,7 @@ public class DispatcherServletTests extends TestCase { public static class ControllerFromParent implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { return new ModelAndView(ControllerFromParent.class.getName()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java index 70c40be9fd1..85a0756fb7a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java @@ -47,6 +47,7 @@ import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; */ public class SimpleWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); pvs.add("commandClass", "org.springframework.beans.TestBean"); @@ -75,6 +76,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { public static class LocaleChecker implements Controller, LastModified { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!(RequestContextUtils.getWebApplicationContext(request) instanceof SimpleWebApplicationContext)) { @@ -89,6 +91,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { return null; } + @Override public long getLastModified(HttpServletRequest request) { return 98; } @@ -105,6 +108,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { this.messageSource.addMessage("themetestArgs", Locale.ENGLISH, "theme test message {0}"); } + @Override public Theme getTheme(String themeName) { if (AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME.equals(themeName)) { return new SimpleTheme(AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME, this.messageSource); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index e1c8898604f..c55aeb7d0ca 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -148,6 +148,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { class TestWebArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception { return null; } @@ -156,10 +157,12 @@ class TestWebArgumentResolver implements WebArgumentResolver { class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + @Override public boolean supportsParameter(MethodParameter parameter) { return false; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { return null; @@ -168,10 +171,12 @@ class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHandler { + @Override public boolean supportsReturnType(MethodParameter returnType) { return false; } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { @@ -181,10 +186,12 @@ class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHan class TestMessageCodesResolver implements MessageCodesResolver { + @Override public String[] resolveMessageCodes(String errorCode, String objectName) { return new String[] { "test.foo.bar" }; } + @Override @SuppressWarnings("rawtypes") public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class fieldType) { return new String[] { "test.foo.bar" }; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 9ced7b5ddd9..8ff997204f1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -516,10 +516,12 @@ public class MvcNamespaceTests { boolean validatorInvoked; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object target, Errors errors) { this.validatorInvoked = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index 6c43c1ea0fd..b1433e2986e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -161,13 +161,16 @@ public class InterceptorRegistryTests { private boolean preHandleInvoked = false; + @Override public void preHandle(WebRequest request) throws Exception { preHandleInvoked = true; } + @Override public void postHandle(WebRequest request, ModelMap model) throws Exception { } + @Override public void afterCompletion(WebRequest request, Exception ex) throws Exception { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index c14ad7735ca..1c270ae5716 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java @@ -222,6 +222,7 @@ public class WebMvcConfigurationSupportExtensionTests { @Override public void addFormatters(FormatterRegistry registry) { registry.addConverter(new Converter() { + @Override public String convert(TestBean source) { return "converted"; } @@ -236,9 +237,11 @@ public class WebMvcConfigurationSupportExtensionTests { @Override public Validator getValidator() { return new Validator() { + @Override public void validate(Object target, Errors errors) { errors.reject("invalid"); } + @Override public boolean supports(Class clazz) { return true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java index 6e018218fd7..c8e3a860d70 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java @@ -38,6 +38,7 @@ public class BeanNameUrlHandlerMappingTests extends TestCase { private ConfigurableWebApplicationContext wac; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java index d066e44525f..ea1b09ed217 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java @@ -183,6 +183,7 @@ public class CancellableFormControllerTests extends TestCase { final String reason = "Because I wanted to"; TestController ctl = new TestController() { + @Override protected ModelAndView onCancel(HttpServletRequest request, HttpServletResponse response, Object command) { return new ModelAndView(getCancelView(), "reason", reason); } @@ -221,9 +222,11 @@ public class CancellableFormControllerTests extends TestCase { private boolean invoked = false; + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object target, Errors errors) { this.invoked = true; TestBean tb = (TestBean) target; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java index 26b73b097fd..4749c85df72 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java @@ -208,6 +208,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithLastModified() throws Exception { class LastModifiedTestController extends TestController implements LastModified { + @Override public long getLastModified(HttpServletRequest request) { return 0; } @@ -223,6 +224,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomCacheForSecondsCall() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { cacheForSeconds(response, 5); return super.handle(request, response, command, errors); @@ -237,6 +239,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall1() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, 5); return super.handle(request, response, command, errors); @@ -251,6 +254,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall2() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, 0); return super.handle(request, response, command, errors); @@ -267,6 +271,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall3() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, -1); return super.handle(request, response, command, errors); @@ -282,6 +287,7 @@ public class CommandControllerTests extends TestCase { public void testCustomDateEditorWithAllowEmpty() throws Exception { final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(df, true)); } @@ -311,6 +317,7 @@ public class CommandControllerTests extends TestCase { public void testCustomDateEditorWithoutAllowEmpty() throws Exception { final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(df, false)); } @@ -341,6 +348,7 @@ public class CommandControllerTests extends TestCase { final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); } @@ -371,6 +379,7 @@ public class CommandControllerTests extends TestCase { final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, false)); } @@ -463,9 +472,11 @@ public class CommandControllerTests extends TestCase { public void testResetEmptyFieldsTurnedOff() throws Exception { TestController mc = new TestController() { + @Override protected Object getCommand(HttpServletRequest request) throws Exception { return new TestBean("original", 99); } + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.setFieldMarkerPrefix(null); } @@ -497,6 +508,7 @@ public class CommandControllerTests extends TestCase { super(TestBean.class, "person"); } + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { Map m = new HashMap(); assertTrue("Command not null", command != null); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java index 584e03d14ca..208225c4333 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java @@ -178,23 +178,28 @@ public class ControllerTests extends TestCase { destroyed = false; } + @Override public void init(ServletConfig servletConfig) { config = servletConfig; } + @Override public ServletConfig getServletConfig() { return config; } + @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) { request = servletRequest; response = servletResponse; } + @Override public String getServletInfo() { return "TestServlet"; } + @Override public void destroy() { destroyed = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java index ac926b224f5..26b84eff653 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java @@ -122,6 +122,7 @@ public class FormControllerTests extends TestCase { final Integer someNumber = new Integer(12); TestController mc = new TestController() { + @Override protected void onBindOnNewForm(HttpServletRequest request, Object command) throws Exception { TestBean testBean = (TestBean)command; testBean.setSomeNumber(new Integer(12)); @@ -370,6 +371,7 @@ public class FormControllerTests extends TestCase { String successView = "s"; TestController mc = new TestController() { + @Override protected ModelAndView handleInvalidSubmit(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { throw new ServletException("invalid submit"); @@ -438,10 +440,12 @@ public class FormControllerTests extends TestCase { final Float myFloat = new Float("123.45"); TestController mc = new TestController() { + @Override protected boolean isFormChangeRequest(HttpServletRequest request) { return (request.getParameter("formChange") != null); } + @Override protected void onFormChange(HttpServletRequest request, HttpServletResponse response, Object command) { assertNotNull("Command should not be null", command); assertEquals("Incorrect command class", TestBean.class, command.getClass()); @@ -513,8 +517,10 @@ public class FormControllerTests extends TestCase { public static String TOOSHORT = "tooshort"; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb.getName() == null || "".equals(tb.getName())) @@ -529,8 +535,10 @@ public class FormControllerTests extends TestCase { public static String TOOSHORT = "tooshort"; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object obj, Errors errors) { errors.reject("test", "testmessage"); } @@ -548,12 +556,14 @@ public class FormControllerTests extends TestCase { setCommandName(BEAN_NAME); } + @Override protected Object formBackingObject(HttpServletRequest request) throws ServletException { TestBean person = new TestBean(); person.setAge(DEFAULT_AGE); return person; } + @Override protected boolean isFormChangeRequest(HttpServletRequest request) { return (request.getParameter("formChange") != null); } @@ -562,6 +572,7 @@ public class FormControllerTests extends TestCase { private static class TestControllerWithCustomOnSubmit extends TestController { + @Override protected ModelAndView onSubmit(Object command) throws Exception { return new ModelAndView("mySuccess"); } @@ -580,6 +591,7 @@ public class FormControllerTests extends TestCase { setCommandClass(TestBean.class); } + @Override protected Map referenceData(HttpServletRequest request) { ++refDataCount; Map m = new HashMap(); @@ -595,6 +607,7 @@ public class FormControllerTests extends TestCase { public static class BooleanBindingFormController extends AbstractFormController { + @Override protected ModelAndView processFormSubmission (HttpServletRequest req, HttpServletResponse resp, Object command, BindException errors) throws Exception { ModelAndView mav = new ModelAndView(); @@ -602,6 +615,7 @@ public class FormControllerTests extends TestCase { return mav; } + @Override protected ModelAndView showForm( HttpServletRequest req, HttpServletResponse resp, BindException err) throws Exception { return null; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java index 1d48f052d56..5249a82cdda 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java @@ -105,9 +105,11 @@ public class WizardFormControllerTests extends TestCase { public void testCustomSessionAttributes() throws Exception { AbstractWizardFormController wizard = new TestWizardController() { + @Override protected String getFormSessionAttributeName() { return "myFormAttr"; } + @Override protected String getPageSessionAttributeName() { return "myPageAttr"; } @@ -140,9 +142,11 @@ public class WizardFormControllerTests extends TestCase { public void testCustomRequestDependentSessionAttributes() throws Exception { AbstractWizardFormController wizard = new TestWizardController() { + @Override protected String getFormSessionAttributeName(HttpServletRequest request) { return "myFormAttr" + request.getParameter("formAttr"); } + @Override protected String getPageSessionAttributeName(HttpServletRequest request) { return "myPageAttr" + request.getParameter("pageAttr"); } @@ -383,15 +387,18 @@ public class WizardFormControllerTests extends TestCase { setPages(new String[] {"page0", "page1"}); } + @Override protected Map referenceData(HttpServletRequest request, int page) throws Exception { assertEquals(new Integer(page), request.getAttribute("target")); return super.referenceData(request, page); } + @Override protected boolean suppressValidation(HttpServletRequest request, Object command) { return (request.getParameter("formChange") != null); } + @Override protected void validatePage(Object command, Errors errors, int page) { TestBean tb = (TestBean) command; switch (page) { @@ -410,6 +417,7 @@ public class WizardFormControllerTests extends TestCase { } } + @Override protected ModelAndView processFinish( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws ServletException, IOException { @@ -417,6 +425,7 @@ public class WizardFormControllerTests extends TestCase { return new ModelAndView("success", getCommandName(), command); } + @Override protected ModelAndView processCancel( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws ServletException, IOException { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java index cbf9da30612..6c495b31ab7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java @@ -41,6 +41,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase { private HandlerMapping hm4; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java index bac4f505bb2..45249d3e4b1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java @@ -110,6 +110,7 @@ public class JdkProxyServletAnnotationTests { public static class TypeLevelImpl implements TypeLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } @@ -126,6 +127,7 @@ public class JdkProxyServletAnnotationTests { public static class MethodLevelImpl implements MethodLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } @@ -142,6 +144,7 @@ public class JdkProxyServletAnnotationTests { public static class TypeAndMethodLevelImpl implements TypeAndMethodLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java index 22299a891f6..e85d4aafa5e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java @@ -124,6 +124,7 @@ public class RequestSpecificMappingInfoComparatorTests { private static class MockComparator implements Comparator { + @Override public int compare(String s1, String s2) { return 0; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index cd36fa25088..07d68187be2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -1964,6 +1964,7 @@ public class ServletAnnotationControllerTests { public static class ListEditorRegistrar implements PropertyEditorRegistrar { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Set.class, new ListEditor()); } @@ -2190,12 +2191,14 @@ public class ServletAnnotationControllerTests { @Controller public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc { + @Override public String get(Model model) { model.addAttribute("object1", new Object()); model.addAttribute("object2", new Object()); return "page1"; } + @Override public String post(@ModelAttribute("object1") Object object1) { //do something with object1 return "page2"; @@ -2222,6 +2225,7 @@ public class ServletAnnotationControllerTests { @Controller public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc { + @Override public List getTestBeans() { List list = new LinkedList(); list.add(new TestBean("tb1")); @@ -2229,12 +2233,14 @@ public class ServletAnnotationControllerTests { return list; } + @Override public String get(Model model) { model.addAttribute("object1", new TestBean()); model.addAttribute("object2", new TestBean()); return "page1"; } + @Override public String post(TestBean object) { //do something with object1 return "page2"; @@ -2244,6 +2250,7 @@ public class ServletAnnotationControllerTests { @Controller public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc { + @Override @ModelAttribute("testBeanList") public List getTestBeans() { List list = new LinkedList(); @@ -2252,6 +2259,7 @@ public class ServletAnnotationControllerTests { return list; } + @Override @RequestMapping(method = RequestMethod.GET) public String get(Model model) { model.addAttribute("object1", new TestBean()); @@ -2259,6 +2267,7 @@ public class ServletAnnotationControllerTests { return "page1"; } + @Override @RequestMapping(method = RequestMethod.POST) public String post(@ModelAttribute("object1") TestBean object1) { //do something with object1 @@ -2428,6 +2437,7 @@ public class ServletAnnotationControllerTests { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean(); vf.afterPropertiesSet(); @@ -2441,6 +2451,7 @@ public class ServletAnnotationControllerTests { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -2599,6 +2610,7 @@ public class ServletAnnotationControllerTests { private static class TestPrincipal implements Principal { + @Override public String getName() { return "test"; } @@ -2606,6 +2618,7 @@ public class ServletAnnotationControllerTests { private static class OtherPrincipal implements Principal { + @Override public String getName() { return "other"; } @@ -2613,12 +2626,15 @@ public class ServletAnnotationControllerTests { private static class TestViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override @SuppressWarnings({"unchecked", "deprecation"}) public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -2657,11 +2673,14 @@ public class ServletAnnotationControllerTests { public static class ModelExposingViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) { request.setAttribute("viewName", viewName); request.getSession().setAttribute("model", model); @@ -2758,6 +2777,7 @@ public class ServletAnnotationControllerTests { public static class TestBeanConverter implements Converter { + @Override public ITestBean convert(String source) { return new TestBean(source); } @@ -2849,23 +2869,28 @@ public class ServletAnnotationControllerTests { public static class NotReadableMessageConverter implements HttpMessageConverter { + @Override public boolean canRead(Class clazz, MediaType mediaType) { return true; } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return true; } + @Override public List getSupportedMediaTypes() { return Collections.singletonList(new MediaType("application", "pdf")); } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { throw new HttpMessageNotReadableException("Could not read"); } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { throw new UnsupportedOperationException("Not implemented"); @@ -2880,23 +2905,28 @@ public class ServletAnnotationControllerTests { this.supportedMediaTypes = Arrays.asList(supportedMediaTypes); } + @Override public boolean canRead(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public List getSupportedMediaTypes() { return supportedMediaTypes; } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { return null; } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { outputMessage.getHeaders().setContentType(contentType); @@ -2968,6 +2998,7 @@ public class ServletAnnotationControllerTests { public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override public ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, Object returnValue, @@ -2975,10 +3006,12 @@ public class ServletAnnotationControllerTests { NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); @@ -3036,6 +3069,7 @@ public class ServletAnnotationControllerTests { @Controller public static class TestControllerImpl implements TestController { + @Override @RequestMapping("/method") public ModelAndView method(MyEntity object) { return new ModelAndView("/something"); @@ -3131,6 +3165,7 @@ public class ServletAnnotationControllerTests { @Controller public static class IMyControllerImpl implements IMyController { + @Override public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException { writer.write("handle " + param); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java index b88c10fa9f7..bd2ac2fccf8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java @@ -46,6 +46,7 @@ public class Spr7766Tests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java index f9c1b200c24..555dbd89b66 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java @@ -48,6 +48,7 @@ public class Spr7839Tests { ConfigurableWebBindingInitializer binder = new ConfigurableWebBindingInitializer(); GenericConversionService service = new DefaultConversionService(); service.addConverter(new Converter() { + @Override public NestedBean convert(String source) { return new NestedBean(source); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java index 307b6ab80d8..53cb85a215e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java @@ -26,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView; */ public class Controller implements org.springframework.web.servlet.mvc.Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) { return new ModelAndView("indexView"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java index fce0eca69ae..a0822913bcf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java @@ -35,6 +35,7 @@ public class ControllerBeanNameHandlerMappingTests extends TestCase { private HandlerMapping hm; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java index bb2ee10976c..15cdacd232b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java @@ -42,6 +42,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase { private HandlerMapping hm4; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java index 5c36b0989d3..b8fa5d7e662 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java @@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.Controller; */ public class WelcomeController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) { return new ModelAndView("welcomeView"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java index ea7e21b24f1..676e44729df 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java @@ -195,6 +195,7 @@ public class RequestMappingInfoTests { new ParamsRequestCondition("foo"), null, null, null, null); Comparator comparator = new Comparator() { + @Override public int compare(RequestMappingInfo info, RequestMappingInfo otherInfo) { return info.compareTo(otherInfo, new MockHttpServletRequest()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java index eaabf4c2d92..fa7a9f81303 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java @@ -114,6 +114,7 @@ public class HandlerMethodAnnotationDetectionTests { } class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazz) { return method.getName().equals("hashCode"); } @@ -202,19 +203,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class AbstractClassController extends MappingAbstractClass { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String pattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(pattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -251,19 +256,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class InterfaceController implements MappingInterface { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -295,19 +304,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class ParameterizedAbstractClassController extends MappingParameterizedAbstractClass { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -340,23 +353,27 @@ public class HandlerMethodAnnotationDetectionTests { */ static class ParameterizedInterfaceController implements MappingParameterizedInterface { + @Override @InitBinder public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override @ModelAttribute public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override @RequestMapping(value="/path1/path2", method=RequestMethod.POST) @ModelAttribute("attr2") public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override @ExceptionHandler(Exception.class) @ResponseBody public String handleException(Exception exception) { @@ -412,6 +429,7 @@ public class HandlerMethodAnnotationDetectionTests { private static StaticMethodMatcherPointcut getControllerPointcut() { return new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return ((AnnotationUtils.findAnnotation(targetClass, Controller.class) != null) || (AnnotationUtils.findAnnotation(targetClass, RequestMapping.class) != null)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java index 467fff6dcfa..cd431d61541 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java @@ -159,10 +159,12 @@ public class HttpEntityMethodProcessorTests { private Long id; private String name; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -177,6 +179,7 @@ public class HttpEntityMethodProcessorTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java index 1ff5a6303ee..54d187f91a1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java @@ -124,6 +124,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests { this.returnValueType = returnValueType; } + @Override @SuppressWarnings("rawtypes") public ModelAndView resolveModelAndView(Method method, Class handlerType, Object returnValue, ExtendedModelMap model, NativeWebRequest request) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java index e86b96b3732..450315e6de4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java @@ -394,28 +394,33 @@ public class RequestMappingHandlerAdapterIntegrationTests { } private static class StubValidator implements Validator { + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object target, Errors errors) { errors.reject("error"); } } private static class ColorArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception { return new Color(0); } } private static class User implements Principal { + @Override public String getName() { return "user"; } } private static class OtherUser implements Principal { + @Override public String getName() { return "other user"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index 813c7819a9f..5f9869e1dc8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -275,6 +275,7 @@ public class RequestPartMethodArgumentResolverTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java index 85ab677a0a7..315040419e9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java @@ -323,6 +323,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index e42a2aa9679..5c69b6f4245 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -259,10 +259,12 @@ public class RequestResponseBodyMethodProcessorTests { private Long id; private String name; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -277,6 +279,7 @@ public class RequestResponseBodyMethodProcessorTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index d1872128cbe..e42ccb29693 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -243,6 +243,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void defaultExpressionParameters() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition ppc = new RootBeanDefinition(PropertyPlaceholderConfigurer.class); ppc.getPropertyValues().add("properties", "myKey=foo"); @@ -266,6 +267,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void typeNestedSetBinding() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class); csDef.getPropertyValues().add("converters", new TestBeanConverter()); @@ -308,6 +310,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void emptyParameterListHandleMethod() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition vrDef = new RootBeanDefinition(InternalResourceViewResolver.class); vrDef.getPropertyValues().add("suffix", ".jsp"); @@ -328,6 +331,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void sessionAttributeExposure() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -358,6 +362,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void sessionAttributeExposureWithInterface() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); @@ -392,6 +397,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterizedAnnotatedInterface() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -424,6 +430,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterizedAnnotatedInterfaceWithOverriddenMappingsInImpl() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -508,6 +515,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void formController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -524,6 +532,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void modelFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -540,6 +549,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void proxiedFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); @@ -561,6 +571,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void commandProvidingFormControllerWithCustomEditor() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); @@ -581,6 +592,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void typedCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); @@ -620,6 +632,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void binderInitializingCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -637,6 +650,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void specificBinderInitializingCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -658,6 +672,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl WebApplicationContext webAppContext = initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.setServletContext(servletContext); AnnotationConfigUtils.registerAnnotationConfigProcessors(wac); @@ -831,6 +846,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void responseBodyNoAcceptableMediaType() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); StringHttpMessageConverter converter = new StringHttpMessageConverter(); @@ -866,6 +882,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void unsupportedRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); adapterDef.getPropertyValues().add("messageConverters", new ByteArrayHttpMessageConverter()); @@ -900,6 +917,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void badRequestRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); adapterDef.getPropertyValues().add("messageConverters", new NotReadableMessageConverter()); @@ -946,6 +964,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void overlappingMessageConvertersRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); List> messageConverters = new ArrayList>(); @@ -980,6 +999,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void responseBodyArgMismatch() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); marshaller.setClassesToBeBound(A.class, B.class); @@ -1155,6 +1175,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void mavResolver() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); ModelAndViewResolver[] mavResolvers = new ModelAndViewResolver[] {new MyModelAndViewResolver()}; @@ -1283,6 +1304,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void requestMappingInterfaceWithProxy() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); autoProxyCreator.setBeanFactory(wac.getBeanFactory()); @@ -1420,6 +1442,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterCsvAsStringArray() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class); RootBeanDefinition wbiDef = new RootBeanDefinition(ConfigurableWebBindingInitializer.class); @@ -1525,6 +1548,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void prototypeController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition beanDef = new RootBeanDefinition(PrototypeController.class); beanDef.setScope(BeanDefinition.SCOPE_PROTOTYPE); @@ -1727,12 +1751,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc { + @Override public String get(Model model) { model.addAttribute("object1", new Object()); model.addAttribute("object2", new Object()); return "page1"; } + @Override public String post(@ModelAttribute("object1") Object object1) { //do something with object1 return "page2"; @@ -1759,6 +1785,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc { + @Override public List getTestBeans() { List list = new LinkedList(); list.add(new TestBean("tb1")); @@ -1766,12 +1793,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return list; } + @Override public String get(Model model) { model.addAttribute("object1", new TestBean()); model.addAttribute("object2", new TestBean()); return "page1"; } + @Override public String post(TestBean object) { //do something with object1 return "page2"; @@ -1781,6 +1810,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc { + @Override @ModelAttribute("testBeanList") public List getTestBeans() { List list = new LinkedList(); @@ -1789,6 +1819,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return list; } + @Override @RequestMapping(method = RequestMethod.GET) public String get(Model model) { model.addAttribute("object1", new TestBean()); @@ -1796,6 +1827,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return "page1"; } + @Override @RequestMapping(method = RequestMethod.POST) public String post(@ModelAttribute("object1") TestBean object1) { //do something with object1 @@ -1966,6 +1998,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean(); vf.afterPropertiesSet(); @@ -1979,6 +2012,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -2132,6 +2166,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class TestPrincipal implements Principal { + @Override public String getName() { return "test"; } @@ -2139,6 +2174,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class OtherPrincipal implements Principal { + @Override public String getName() { return "other"; } @@ -2146,12 +2182,15 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class TestViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override @SuppressWarnings({"unchecked", "deprecation", "rawtypes"}) public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -2190,11 +2229,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class ModelExposingViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) { request.setAttribute("viewName", viewName); request.getSession().setAttribute("model", model); @@ -2291,6 +2333,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class TestBeanConverter implements Converter { + @Override public ITestBean convert(String source) { return new TestBean(source); } @@ -2398,23 +2441,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class NotReadableMessageConverter implements HttpMessageConverter { + @Override public boolean canRead(Class clazz, MediaType mediaType) { return true; } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return true; } + @Override public List getSupportedMediaTypes() { return Collections.singletonList(new MediaType("application", "pdf")); } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { throw new HttpMessageNotReadableException("Could not read"); } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { throw new UnsupportedOperationException("Not implemented"); @@ -2429,23 +2477,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl this.supportedMediaTypes = Arrays.asList(supportedMediaTypes); } + @Override public boolean canRead(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public List getSupportedMediaTypes() { return supportedMediaTypes; } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { return null; } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { outputMessage.getHeaders().setContentType(contentType); @@ -2545,6 +2598,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override @SuppressWarnings("rawtypes") public ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, @@ -2553,10 +2607,12 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); @@ -2628,6 +2684,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class TestControllerImpl implements TestController { + @Override @RequestMapping("/method") public ModelAndView method(MyEntity object) { return new ModelAndView("/something"); @@ -2723,6 +2780,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class IMyControllerImpl implements IMyController { + @Override public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException { writer.write("handle " + param); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java index 50d30583af1..5365749ed5d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java @@ -185,10 +185,12 @@ public class ServletInvocableHandlerMethodTests { private static class ExceptionRaisingReturnValueHandler implements HandlerMethodReturnValueHandler { + @Override public boolean supportsReturnType(MethodParameter returnType) { return true; } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { throw new HttpMessageNotWritableException("oops, can't write"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java index f3c51db5a8b..0b0afcee8d9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java @@ -95,6 +95,7 @@ public class ServletRequestMethodArgumentResolverTests { @Test public void principal() throws Exception { Principal principal = new Principal() { + @Override public String getName() { return "Foo"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java index 22e924e600f..3739046c597 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java @@ -107,6 +107,7 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab WebApplicationContext wac = initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition beanDef = new RootBeanDefinition(ModelValidatingViewResolver.class); beanDef.getConstructorArgumentValues().addGenericArgumentValue(pathVars); @@ -671,8 +672,10 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab this.attrsToValidate = attrsToValidate; } + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new AbstractView () { + @Override public String getContentType() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java index e229bac169a..43c83b7ef41 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java @@ -139,6 +139,7 @@ public class RedirectAttributesModelMapTests { public static class TestBeanConverter implements Converter { + @Override public String convert(TestBean source) { return "[" + source.getName() + "]"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java index 92b5d65487a..d3d0547fba8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java @@ -39,10 +39,12 @@ class MockFilterRegistration implements Dynamic { return this.asyncSupported; } + @Override public void setAsyncSupported(boolean isAsyncSupported) { this.asyncSupported = isAsyncSupported; } + @Override public void addMappingForServletNames(EnumSet dispatcherTypes, boolean isMatchAfter, String... servletNames) { @@ -53,38 +55,47 @@ class MockFilterRegistration implements Dynamic { // Not implemented + @Override public String getName() { return null; } + @Override public Collection getServletNameMappings() { return null; } + @Override public void addMappingForUrlPatterns(EnumSet dispatcherTypes, boolean isMatchAfter, String... urlPatterns) { } + @Override public Collection getUrlPatternMappings() { return null; } + @Override public String getClassName() { return null; } + @Override public boolean setInitParameter(String name, String value) { return false; } + @Override public String getInitParameter(String name) { return null; } + @Override public Set setInitParameters(Map initParameters) { return null; } + @Override public Map getInitParameters() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java index 2b0e15a4db5..958f1755b49 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java @@ -40,27 +40,33 @@ class MockServletRegistration implements ServletRegistration.Dynamic { return loadOnStartup; } + @Override public void setLoadOnStartup(int loadOnStartup) { this.loadOnStartup = loadOnStartup; } + @Override public void setRunAsRole(String roleName) { this.roleName = roleName; } + @Override public Set addMapping(String... urlPatterns) { mappings.addAll(Arrays.asList(urlPatterns)); return mappings; } + @Override public Collection getMappings() { return mappings; } + @Override public String getRunAsRole() { return roleName; } + @Override public void setAsyncSupported(boolean isAsyncSupported) { this.asyncSupported = isAsyncSupported; } @@ -71,33 +77,41 @@ class MockServletRegistration implements ServletRegistration.Dynamic { // not implemented + @Override public String getName() { return null; } + @Override public void setMultipartConfig(MultipartConfigElement multipartConfig) { } + @Override public Set setServletSecurity(ServletSecurityElement constraint) { return null; } + @Override public String getClassName() { return null; } + @Override public boolean setInitParameter(String name, String value) { return false; } + @Override public String getInitParameter(String name) { return null; } + @Override public Set setInitParameters(Map initParameters) { return null; } + @Override public Map getInitParameters() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java index 84e940352ac..2fcc677126b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java @@ -30,18 +30,22 @@ public class RequestDataValueProcessorWrapper implements RequestDataValueProcess this.processor = processor; } + @Override public String processUrl(HttpServletRequest request, String url) { return (this.processor != null) ? this.processor.processUrl(request, url) : url; } + @Override public String processFormFieldValue(HttpServletRequest request, String name, String value, String type) { return (this.processor != null) ? this.processor.processFormFieldValue(request, name, value, type) : value; } + @Override public String processAction(HttpServletRequest request, String action) { return (this.processor != null) ? this.processor.processAction(request, action) : action; } + @Override public Map getExtraHiddenFields(HttpServletRequest request) { return (this.processor != null) ? this.processor.getExtraHiddenFields(request) : null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java index e4fce1213fc..976fcb923e6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class BindTagOutsideDispatcherServletTests extends BindTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index 03c39fa8def..6f22532bdc5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java @@ -509,6 +509,7 @@ public class BindTagTests extends AbstractTagTests { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new ServletRequestDataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, null, new PropertyEditorSupport() { + @Override public String getAsText() { return "something"; } @@ -987,6 +988,7 @@ public class BindTagTests extends AbstractTagTests { pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", binder.getBindingResult()); FormTag formTag = new FormTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(new StringWriter()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java index 9dbbf6416f2..1cec18763fc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java @@ -40,6 +40,7 @@ public class EvalTagTests extends AbstractTagTests { private MockPageContext context; + @Override protected void setUp() throws Exception { context = createPageContext(); FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java index 4d3e4c9f76a..3795717267e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index 51820dc8394..f33101a3b85 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -37,6 +37,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { tag.setPageContext(pc); tag.doStartTag(); HtmlEscapingAwareTag testTag = new HtmlEscapingAwareTag() { + @Override public int doStartTagInternal() throws Exception { return EVAL_BODY_INCLUDE; } @@ -113,9 +114,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "test text"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -131,9 +134,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "test & text"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -150,9 +155,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "' test & text \\"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -169,9 +176,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "' test & text \\"; } + @Override protected void writeBodyContent(String content) { result.append(content); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java index d2205f8fcc0..8148682f0f8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class MessageTagOutsideDispatcherServletTests extends MessageTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 8e737c22578..8aa294af9ac 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -43,6 +43,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -58,6 +59,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -74,6 +76,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -91,6 +94,7 @@ public class MessageTagTests extends AbstractTagTests { request.addPreferredLocale(Locale.CANADA); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -108,6 +112,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -123,6 +128,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -139,6 +145,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -155,6 +162,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -172,6 +180,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -188,6 +197,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -204,6 +214,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -221,6 +232,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -239,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -256,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -274,6 +288,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -290,6 +305,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -307,6 +323,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -323,6 +340,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -341,6 +359,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -357,6 +376,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java index cbd498112e3..bff2b1eef95 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java @@ -97,6 +97,7 @@ public class ParamTagTests extends AbstractTagTests { private Param param; + @Override public void addParam(Param param) { this.param = param; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index fc92aeaa46c..9beea85f112 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -40,6 +40,7 @@ public class ThemeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); ThemeTag tag = new ThemeTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java index 4d9df5c6481..e380397ed48 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java @@ -31,12 +31,14 @@ public abstract class AbstractFormTagTests extends AbstractHtmlElementTagTests { private FormTag formTag = new FormTag(); + @Override protected void extendRequest(MockHttpServletRequest request) { request.setAttribute(COMMAND_NAME, createTestBean()); } protected abstract TestBean createTestBean(); + @Override protected void extendPageContext(MockPageContext pageContext) throws JspException { this.formTag.setCommandName(COMMAND_NAME); this.formTag.setAction("myAction"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java index e101be304be..a114680a942 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java @@ -53,6 +53,7 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests { private MockPageContext pageContext; + @Override protected final void setUp() throws Exception { // set up a writer for the tag content to be written to this.writer = new StringWriter(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java index 431f85d03d2..ebe0e344a27 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java @@ -29,6 +29,7 @@ public class ButtonTagTests extends AbstractFormTagTests { private ButtonTag tag; + @Override protected void onSetUp() { this.tag = createTag(getWriter()); this.tag.setParent(getFormTag()); @@ -82,6 +83,7 @@ public class ButtonTagTests extends AbstractFormTagTests { @SuppressWarnings("serial") protected ButtonTag createTag(final Writer writer) { return new ButtonTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(writer); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java index 1ac1ea619e3..77e0a6fa315 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java @@ -50,9 +50,11 @@ public class CheckboxTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -636,6 +638,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -678,6 +681,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { this.count++; super.setAsText(text); @@ -689,6 +693,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { public int count = 0; + @Override public void setAsText(String text) { this.count++; setValue(new Integer(text.trim())); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java index 96bae8946cc..b0baea78846 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java @@ -59,9 +59,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxesTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -426,9 +428,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests { BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(String.class, new Formatter() { + @Override public String print(String object, Locale locale) { return object; } + @Override public String parse(String text, Locale locale) throws ParseException { return text.trim(); } @@ -728,6 +732,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -770,6 +775,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { super.setAsText(text); this.allProcessedValues.add(getValue()); @@ -779,10 +785,12 @@ public class CheckboxesTagTests extends AbstractFormTagTests { private static class MyLowerCaseEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text.toLowerCase()); } + @Override public String getAsText() { return ObjectUtils.nullSafeToString(getValue()).toUpperCase(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java index 90cdd281d20..6e11e063319 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java @@ -48,9 +48,11 @@ public class ErrorsTagTests extends AbstractFormTagTests { private ErrorsTag tag; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new ErrorsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -60,6 +62,7 @@ public class ErrorsTagTests extends AbstractFormTagTests { this.tag.setPageContext(getPageContext()); } + @Override protected TestBean createTestBean() { return new TestBean(); } @@ -434,6 +437,7 @@ public class ErrorsTagTests extends AbstractFormTagTests { assertTrue(output.contains("field error")); } + @Override protected void exposeBindingResult(Errors errors) { // wrap errors in a Model Map model = new HashMap(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java index f8023dffb23..3bd879a1eac 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java @@ -47,9 +47,11 @@ public class FormTagTests extends AbstractHtmlElementTagTests { private MockHttpServletRequest request; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new FormTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java index 4058788ffd9..26828da7bd3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java @@ -31,9 +31,11 @@ public class HiddenInputTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new HiddenInputTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -120,6 +122,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests { assertTrue(output.startsWith("")); } + @Override protected void extendRequest(MockHttpServletRequest request) { TestBean bean = new TestBean(); bean.setName("foo"); @@ -520,10 +529,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { private static class TestBeanPropertyEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text + "k", 123)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -589,10 +600,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { public class RulesVariantEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(RulesVariant.fromId(text)); } + @Override public String getAsText() { RulesVariant rulesVariant = (RulesVariant) getValue(); return rulesVariant.toId(); @@ -602,11 +615,13 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { private static class FriendEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java index accbc09cf4d..92290c23cc9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java @@ -54,17 +54,21 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { private SelectTag selectTag; private OptionsTag tag; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new OptionsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } }; selectTag = new SelectTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } + @Override public String getName() { // Should not be used other than to delegate to // RequestDataValueDataProcessor @@ -276,6 +280,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { assertEquals(value2, rootElement.selectSingleNode("option[@selected]")); } + @Override protected void extendRequest(MockHttpServletRequest request) { TestBean bean = new TestBean(); bean.setName("foo"); @@ -295,6 +300,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { request.setAttribute("floats", floats); } + @Override protected void exposeBindingResult(Errors errors) { // wrap errors in a Model Map model = new HashMap(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java index 242135cb760..50485dec42b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java @@ -78,6 +78,7 @@ public class PasswordInputTagTests extends InputTagTests { assertValueAttribute(output, ""); } + @Override public void testDynamicTypeAttribute() throws JspException { try { this.getTag().setDynamicAttribute(null, "type", "email"); @@ -88,6 +89,7 @@ public class PasswordInputTagTests extends InputTagTests { } } + @Override protected void assertValueAttribute(String output, String expectedValue) { if (this.getPasswordTag().isShowPassword()) { super.assertValueAttribute(output, expectedValue); @@ -96,13 +98,16 @@ public class PasswordInputTagTests extends InputTagTests { } } + @Override protected String getType() { return "password"; } + @Override @SuppressWarnings("serial") protected InputTag createTag(final Writer writer) { return new PasswordInputTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(writer); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java index 2c372aa6da0..12652ed2e6a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java @@ -43,9 +43,11 @@ public class RadioButtonTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new RadioButtonTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -251,6 +253,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests { return new Float("12.99"); } + @Override protected TestBean createTestBean() { this.bean = new TestBean(); bean.setSex("M"); @@ -262,10 +265,12 @@ public class RadioButtonTagTests extends AbstractFormTagTests { private static class MyFloatEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text.substring(1)); } + @Override public String getAsText() { return "F" + getValue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java index 8ac60397714..de6e902eb2a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java @@ -53,9 +53,11 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new RadioButtonsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -582,6 +584,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -619,6 +622,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { super.setAsText(text); this.allProcessedValues.add(getValue()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index dc9b9404e2a..8786a091fae 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -64,9 +64,11 @@ public class SelectTagTests extends AbstractFormTagTests { private TestBeanWithRealCountry bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new SelectTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -175,9 +177,11 @@ public class SelectTagTests extends AbstractFormTagTests { this.tag.setItems("${countries}"); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -203,9 +207,11 @@ public class SelectTagTests extends AbstractFormTagTests { this.tag.setItemLabel("name"); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -230,6 +236,7 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setBean(withCountry); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (text==null || text.length()==0) { setValue(null); @@ -237,6 +244,7 @@ public class SelectTagTests extends AbstractFormTagTests { } setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { Country value = (Country) getValue(); if (value==null) { @@ -263,9 +271,11 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setBean(getTestBean()); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -287,9 +297,11 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setRealCountry(null); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean, "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { Country value = (Country) getValue(); if (value==null) { @@ -470,9 +482,11 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(Country.class, new Formatter() { + @Override public String print(Country object, Locale locale) { return object.getName(); } + @Override public Country parse(String text, Locale locale) throws ParseException { return new Country(text, text); } @@ -515,9 +529,11 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(Country.class, new Formatter() { + @Override public String print(Country object, Locale locale) { return object.getName(); } + @Override public Country parse(String text, Locale locale) throws ParseException { return new Country(text, text); } @@ -563,6 +579,7 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); errors.getPropertyAccessor().registerCustomEditor(List.class, new CustomCollectionEditor(LinkedList.class) { + @Override public String getAsText() { return getValue().toString(); } @@ -671,10 +688,12 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), COMMAND_NAME); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(final String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getIsoCode(); } @@ -772,6 +791,7 @@ public class SelectTagTests extends AbstractFormTagTests { private Map getCountryToLocaleMap() { Map map = new TreeMap(new Comparator() { + @Override public int compare(Object o1, Object o2) { return ((Country)o1).getName().compareTo(((Country)o2).getName()); } @@ -793,6 +813,7 @@ public class SelectTagTests extends AbstractFormTagTests { return sexes; } + @Override protected void extendRequest(MockHttpServletRequest request) { super.extendRequest(request); request.setAttribute("countries", Country.getCountries()); @@ -834,6 +855,7 @@ public class SelectTagTests extends AbstractFormTagTests { } } + @Override protected TestBean createTestBean() { this.bean = new TestBeanWithRealCountry(); this.bean.setName("Rob"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java index 075ea9e0114..127656b9789 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java @@ -24,10 +24,12 @@ import java.beans.PropertyEditorSupport; */ class SimpleFloatEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new Float(text)); } + @Override public String getAsText() { return getValue() + "f"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java index 965bd06a41f..82de492c307 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java @@ -31,6 +31,7 @@ public class TagWriterTests extends TestCase { private StringWriter data; + @Override protected void setUp() throws Exception { this.data = new StringWriter(); this.writer = new TagWriter(this.data); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java index 44521f112d9..2fc7c3100e8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java @@ -33,9 +33,11 @@ public class TextareaTagTests extends AbstractFormTagTests { private TestBean rob; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new TextareaTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -110,6 +112,7 @@ public class TextareaTagTests extends AbstractFormTagTests { assertBlockTagContains(output, "12.34f"); } + @Override protected TestBean createTestBean() { // set up test data this.rob = new TestBean(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index d3e02cc7c28..289fcbf064c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -309,6 +309,7 @@ public class BaseViewTests extends TestCase { */ private class ConcreteView extends AbstractView { // Do-nothing concrete subclass + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { throw new UnsupportedOperationException(); @@ -330,6 +331,7 @@ public class BaseViewTests extends TestCase { this.wac = wac; } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // do nothing @@ -338,6 +340,7 @@ public class BaseViewTests extends TestCase { /** * @see org.springframework.context.support.ApplicationObjectSupport#initApplicationContext() */ + @Override protected void initApplicationContext() throws ApplicationContextException { if (inited) throw new RuntimeException("Already initialized"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java index 46d34e7b335..e46aa5449e5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java @@ -73,6 +73,7 @@ public class InternalResourceViewTests extends TestCase { InternalResourceView view = new InternalResourceView(); view.setUrl(url); view.setServletContext(new MockServletContext() { + @Override public int getMinorVersion() { return 4; } @@ -118,6 +119,7 @@ public class InternalResourceViewTests extends TestCase { InternalResourceView view = new InternalResourceView(); view.setUrl(url); view.setServletContext(new MockServletContext() { + @Override public int getMinorVersion() { return 4; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java index 1695bd0c540..56feded2d67 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java @@ -21,6 +21,7 @@ package org.springframework.web.servlet.view; */ public class ResourceBundleViewResolverNoCacheTests extends ResourceBundleViewResolverTests { + @Override protected boolean getCache() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java index 117063f7af5..b100a6a68eb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java @@ -46,6 +46,7 @@ public class ResourceBundleViewResolverTests extends TestCase { private StaticWebApplicationContext wac; + @Override protected void setUp() throws Exception { rb = new ResourceBundleViewResolver(); rb.setBasename(PROPS_FILE); @@ -170,9 +171,11 @@ public class ResourceBundleViewResolverTests extends TestCase { } } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { } + @Override protected void initApplicationContext() { ++initCount; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java index 286f628e22f..fadc6063737 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java @@ -249,8 +249,10 @@ public class ViewResolverTests { vr.setApplicationContext(wac); MockHttpServletRequest request = new MockHttpServletRequest(sc) { + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path) { + @Override public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) { assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null); assertEquals("value1", forwardRequest.getAttribute("key1")); @@ -287,8 +289,10 @@ public class ViewResolverTests { vr.setApplicationContext(wac); MockHttpServletRequest request = new MockHttpServletRequest(sc) { + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path) { + @Override public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) { assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null); assertEquals("value1", forwardRequest.getAttribute("key1")); @@ -432,6 +436,7 @@ public class ViewResolverTests { @Test public void testXmlViewResolverDefaultLocation() { StaticWebApplicationContext wac = new StaticWebApplicationContext() { + @Override protected Resource getResourceByPath(String path) { assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path)); return super.getResourceByPath(path); @@ -453,6 +458,7 @@ public class ViewResolverTests { @Test public void testXmlViewResolverWithoutCache() throws Exception { StaticWebApplicationContext wac = new StaticWebApplicationContext() { + @Override protected Resource getResourceByPath(String path) { assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path)); return super.getResourceByPath(path); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java index 5f44339cbde..62ba99fb7bf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java @@ -57,6 +57,7 @@ public class ExcelViewTests extends TestCase { private MockHttpServletResponse response; private StaticWebApplicationContext webAppCtx; + @Override public void setUp() { servletCtx = new MockServletContext("org/springframework/web/servlet/view/document"); request = new MockHttpServletRequest(servletCtx); @@ -67,6 +68,7 @@ public class ExcelViewTests extends TestCase { public void testExcel() throws Exception { AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -101,6 +103,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("nl", "nl")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -135,6 +138,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("en", "US")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -169,6 +173,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("de", "")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -200,6 +205,7 @@ public class ExcelViewTests extends TestCase { public void testJExcel() throws Exception { AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -229,6 +235,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("nl", "nl")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -259,6 +266,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("en", "US")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -289,6 +297,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("de", "")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -316,10 +325,12 @@ public class ExcelViewTests extends TestCase { private LocaleResolver newDummyLocaleResolver(final String lang, final String country) { return new LocaleResolver() { + @Override public Locale resolveLocale(HttpServletRequest request) { return new Locale(lang, country); } + @Override public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { // not supported! diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java index c0b9938bb5a..933b8e0129e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java @@ -44,6 +44,7 @@ public class PdfViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractPdfView pdfView = new AbstractPdfView() { + @Override protected void buildPdfDocument(Map model, Document document, PdfWriter writer, HttpServletRequest request, HttpServletResponse response) throws Exception { document.add(new Paragraph(text)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index 8da83022c48..8b49f3ba55f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -85,12 +85,14 @@ public class FreeMarkerConfigurerTests extends TestCase { settings.setProperty("localized_lookup", "false"); fcfb.setFreemarkerSettings(settings); fcfb.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if (!("file:/mydir".equals(location) || "file:/mydir/test".equals(location))) { throw new IllegalArgumentException(location); } return new ByteArrayResource("test".getBytes(), "test"); } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java index d3a6bfab40a..ff233b9be2f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java @@ -202,9 +202,11 @@ public class FreeMarkerViewTests { private class TestConfiguration extends Configuration { + @Override public Template getTemplate(String name, final Locale locale) throws IOException { if (name.equals("templateName") || name.equals("prefix_test_suffix")) { return new Template(name, new StringReader("test")) { + @Override public void process(Object model, Writer writer) throws TemplateException, IOException { assertEquals(Locale.US, locale); assertTrue(model instanceof AllHttpScopesHashModel); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java index 5638a35db6c..f78a5f1b022 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java @@ -54,6 +54,7 @@ public abstract class AbstractJasperReportsTests extends TestCase { protected MockHttpServletResponse response; + @Override public void setUp() { request = new MockHttpServletRequest(); response = new MockHttpServletResponse(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java index a4a9fb610a6..5350f159999 100755 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java @@ -411,10 +411,12 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor super(clazz); } + @Override public JRDataSource create(JasperReport jasperReport) throws JRException { return new JRBeanCollectionDataSource(getData()); } + @Override public void dispose(JRDataSource jrDataSource) throws JRException { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java index 85ce6ff5ffc..046d3cfc55e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java @@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRHtmlExporter; */ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfigurableJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { ConfigurableJasperReportsView view = new ConfigurableJasperReportsView(); view.setExporterClass(JRHtmlExporter.class); @@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfig return view; } + @Override protected String getDesiredContentType() { return "application/pdf"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java index e35f3e93a88..349f455f3e2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java @@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRPdfExporter; */ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfigurableJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { ConfigurableJasperReportsView view = new ConfigurableJasperReportsView(); view.setExporterClass(JRPdfExporter.class); @@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfig return view; } + @Override protected String getDesiredContentType() { return "text/html"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java index 18e25e2cd8c..0cd2f131f29 100755 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java @@ -41,6 +41,7 @@ public class ExporterParameterTests extends AbstractJasperReportsTests { params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo/bar"); AbstractJasperReportsView view = new AbstractJasperReportsView() { + @Override protected void renderReport(JasperPrint filledReport, Map model, HttpServletResponse response) throws Exception { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java index 2200bd3f6f8..09cb2aa70be 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsCsvViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsCsvView(); } + @Override protected String getDesiredContentType() { return "text/csv"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java index 0c38a3b2a8c..88d83e4fcb1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java @@ -30,10 +30,12 @@ import org.springframework.web.servlet.DispatcherServlet; */ public class JasperReportsHtmlViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsHtmlView(); } + @Override protected String getDesiredContentType() { return "text/html"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java index e91dc32e572..093afd7853d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java @@ -29,6 +29,7 @@ import net.sf.jasperreports.engine.JasperPrint; */ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsViewTests { + @Override protected void extendModel(Map model) { model.put(getDiscriminatorKey(), "csv"); } @@ -48,6 +49,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView assertEquals("Invalid content type", "text/html", response.getContentType()); } + @Override public void testOverrideContentDisposition() throws Exception { if (!canCompileReport) { return; @@ -101,10 +103,12 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView return "format"; } + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsMultiFormatView(); } + @Override protected String getDesiredContentType() { return "text/csv"; } @@ -121,6 +125,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView public static final String TEST_PARAM = "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI"; + @Override protected void renderReport(JasperPrint filledReport, Map parameters, HttpServletResponse response) { assertNotNull("Exporter parameters are null", getExporterParameters()); assertEquals("Incorrect number of exporter parameters", 1, getExporterParameters().size()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java index 3bb3b30bd04..b7b1e9ebea3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java @@ -25,6 +25,7 @@ import java.util.Map; */ public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperReportsMultiFormatViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { JasperReportsMultiFormatView view = new JasperReportsMultiFormatView(); view.setFormatKey("fmt"); @@ -37,10 +38,12 @@ public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperR return view; } + @Override protected String getDiscriminatorKey() { return "fmt"; } + @Override protected void extendModel(Map model) { model.put(getDiscriminatorKey(), "comma-separated"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java index 84060185caf..6fbf2076b63 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsPdfViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsPdfView(); } + @Override protected String getDesiredContentType() { return "application/pdf"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java index af86756cb43..2f09e9bf0f2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsXlsViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsXlsView(); } + @Override protected String getDesiredContentType() { return "application/vnd.ms-excel"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java index 401c914230a..92f0b4c4bf9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java @@ -44,6 +44,7 @@ public class TestVelocityEngine extends VelocityEngine { } + @Override public Template getTemplate(String name) throws ResourceNotFoundException { Template template = (Template) this.templates.get(name); if (template == null) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java index af090a253bc..bf51bed1c78 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java @@ -87,6 +87,7 @@ public class VelocityConfigurerTests extends TestCase { VelocityEngineFactoryBean vefb = new VelocityEngineFactoryBean(); vefb.setResourceLoaderPath("file:/mydir"); vefb.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if (location.equals("file:/mydir") || location.equals("file:/mydir/test")) { return new ByteArrayResource("test".getBytes(), "test"); @@ -98,6 +99,7 @@ public class VelocityConfigurerTests extends TestCase { throw new IllegalArgumentException(ex.toString()); } } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } @@ -133,12 +135,14 @@ public class VelocityConfigurerTests extends TestCase { VelocityConfigurer vc = new VelocityConfigurer(); vc.setResourceLoaderPath("file:/mydir,file:/yourdir"); vc.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if ("file:/yourdir/test".equals(location)) { return new DescriptiveResource(""); } return new ByteArrayResource("test".getBytes(), "test"); } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java index fb265453d98..3ed42765505 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java @@ -57,12 +57,14 @@ public class VelocityMacroTests extends TestCase { private MockHttpServletResponse response; + @Override public void setUp() throws Exception { wac = new StaticWebApplicationContext(); wac.setServletContext(new MockServletContext()); final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(TEMPLATE_FILE, expectedTemplate); } @@ -79,6 +81,7 @@ public class VelocityMacroTests extends TestCase { public void testExposeSpringMacroHelpers() throws Exception { VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { assertTrue(context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE) instanceof RequestContext); RequestContext rc = (RequestContext) context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE); @@ -100,6 +103,7 @@ public class VelocityMacroTests extends TestCase { final String helperTool = "wrongType"; VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { fail(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java index 97dc0cb787e..43f3d5d5cc1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java @@ -64,6 +64,7 @@ public class VelocityRenderTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("test.vm", expectedTemplate); } @@ -106,9 +107,11 @@ public class VelocityRenderTests { thrown.expect(NestedServletException.class); thrown.expect(new TypeSafeMatcher() { + @Override public boolean matchesSafely(Exception item) { return item.getCause() instanceof MethodInvocationException; } + @Override public void describeTo(Description description) { description.appendText("exception has cause of MethodInvocationException"); @@ -138,9 +141,11 @@ public class VelocityRenderTests { thrown.expect(NestedServletException.class); thrown.expect(new TypeSafeMatcher() { + @Override public boolean matchesSafely(Exception item) { return item.getCause() instanceof IOException; } + @Override public void describeTo(Description description) { description.appendText("exception has cause of IOException"); 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 5bf06837bf0..4cdf72c4b36 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 @@ -39,6 +39,7 @@ public class VelocityToolboxViewTests { wac.setServletContext(new MockServletContext()); final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -49,6 +50,7 @@ public class VelocityToolboxViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityToolboxView vv = new VelocityToolboxView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); 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 d8a43ebf481..e17f0b00878 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 @@ -24,6 +24,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolver() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("prefix_test_suffix", new Template()); } @@ -57,6 +58,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolverWithToolbox() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("prefix_test_suffix", new Template()); } @@ -83,6 +85,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolverWithToolboxSubclass() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { TestVelocityEngine ve = new TestVelocityEngine(); ve.addTemplate("prefix_test_suffix", new Template()); @@ -113,6 +116,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityLayoutViewResolver() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { TestVelocityEngine ve = new TestVelocityEngine(); ve.addTemplate("prefix_test_suffix", new Template()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java index 916e1f2fb1b..ac1a396f659 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java @@ -137,6 +137,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -157,6 +158,7 @@ public class VelocityViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(context.getKeys().length >= 1); @@ -194,6 +196,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -215,10 +218,12 @@ public class VelocityViewTests { expectedResponse.setContentType("myContentType"); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); } + @Override protected void exposeHelpers(Map model, HttpServletRequest request) throws Exception { model.put("myHelper", "myValue"); } @@ -244,6 +249,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -268,6 +274,7 @@ public class VelocityViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); @@ -284,6 +291,7 @@ public class VelocityViewTests { assertTrue(numberTool.getLocale().equals(Locale.CANADA)); } + @Override protected void exposeHelpers(Map model, HttpServletRequest request) throws Exception { model.put("myHelper", "myValue"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java index 2b96a0c3e39..43cbba5a779 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java @@ -63,6 +63,7 @@ public class TestXsltViewTests extends TestCase { private int fatal = 0; + @Override public void setUp() { this.view = new TestXsltView(); } @@ -80,12 +81,15 @@ public class TestXsltViewTests extends TestCase { public void testCustomErrorListener() { view.setErrorListener(new ErrorListener() { + @Override public void warning(TransformerException ex) { incWarnings(); } + @Override public void error(TransformerException ex) { incErrors(); } + @Override public void fatalError(TransformerException ex) { incFatals(); } @@ -110,6 +114,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -136,6 +141,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -163,6 +169,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -195,6 +202,7 @@ public class TestXsltViewTests extends TestCase { response.setWriterAccessAllowed(false); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -221,6 +229,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -256,6 +265,7 @@ public class TestXsltViewTests extends TestCase { response.setOutputStreamAccessAllowed(false); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -265,11 +275,13 @@ public class TestXsltViewTests extends TestCase { node.setAttribute("catchphrase", hero.getCatchphrase()); return new DOMSource(node); } + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); return parameters; } + @Override protected boolean useWriter() { return true; } @@ -299,6 +311,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource( Map model, String rootName, HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index 7b2f7d94a42..93a34f14666 100644 --- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -207,6 +207,7 @@ class NeverMatchAdvisor extends StaticMethodMatcherPointcutAdvisor { /** * @see org.springframework.aop.MethodMatcher#matches(java.lang.reflect.Method, java.lang.Class) */ + @Override public boolean matches(Method m, Class targetClass) { return false; } @@ -249,10 +250,12 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement return (CountingBeforeAdvice) getAdvice(); } + @Override public void afterPropertiesSet() throws Exception { setAdvice(new TxCountingBeforeAdvice()); } + @Override public boolean matches(Method method, Class targetClass) { return method.getName().startsWith("setAge"); } @@ -260,6 +263,7 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement private class TxCountingBeforeAdvice extends CountingBeforeAdvice { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { // do transaction checks if (requireTransactionContext) { @@ -323,21 +327,25 @@ class CallCountingTransactionManager extends AbstractPlatformTransactionManager public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java index b209a01d545..01155d3f3b1 100644 --- a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java +++ b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java @@ -121,6 +121,7 @@ public class EnableCachingIntegrationTests { @Repository static class DummyFooRepository implements FooRepository { + @Override @Cacheable("primary") public List findAll() { return Collections.emptyList(); diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index c1d74a88d26..89964f2e850 100644 --- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -300,6 +300,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); scanner.setScopeMetadataResolver(new ScopeMetadataResolver() { + @Override public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) { ScopeMetadata metadata = new ScopeMetadata(); if (definition instanceof AnnotatedBeanDefinition) { @@ -345,8 +346,10 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { private String name = DEFAULT_NAME; + @Override public String getName() { return this.name; } + @Override public void setName(String name) { this.name = name; } } diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index dab551d075d..9ee6eb4a8cf 100644 --- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -284,6 +284,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); scanner.setBeanNameGenerator(new BeanNameGenerator() { + @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { return definition.getScope(); } @@ -311,8 +312,10 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { private String name = DEFAULT_NAME; + @Override public String getName() { return this.name; } + @Override public void setName(String name) { this.name = name; } } diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java index c4da57a4f82..ee65521d4d1 100644 --- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java +++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java @@ -656,6 +656,7 @@ public class EnvironmentIntegrationTests { public Environment environment; + @Override public void setEnvironment(Environment environment) { this.environment = environment; } diff --git a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java index 032ab7c6fbf..e095fd1e568 100644 --- a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java +++ b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java @@ -57,6 +57,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { this.conversionService = conversionService; } + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { if (beanFactory instanceof ConfigurableBeanFactory) { Object typeConverter = ((ConfigurableBeanFactory) beanFactory).getTypeConverter(); @@ -80,6 +81,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { return delegate.findCustomEditor(targetType, null) != null || delegate.getDefaultEditor(targetType) != null; } + @Override public boolean canConvert(TypeDescriptor sourceTypeDescriptor, TypeDescriptor targetTypeDescriptor) { if (conversionService.canConvert(sourceTypeDescriptor, targetTypeDescriptor)) { return true; @@ -90,6 +92,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { return canConvert(sourceType, targetType); } + @Override public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) { if (targetType.getType() == Void.class || targetType.getType() == Void.TYPE) { return null; diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java index 2970b5f0aa6..eb715261ea0 100644 --- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java +++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java @@ -153,6 +153,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests { this.count.incrementAndGet(); } + @Override public int getInvocationCount() { return this.count.get(); } @@ -168,12 +169,14 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests { private final AtomicInteger count = new AtomicInteger(0); + @Override @Transactional @Scheduled(fixedDelay = 5) public void scheduled() { this.count.incrementAndGet(); } + @Override public int getInvocationCount() { return this.count.get(); } diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 4b5aaa39de1..943a9e1e1b5 100644 --- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -33,21 +33,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java index 6391a5328e3..ced09c321ff 100644 --- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java +++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java @@ -219,6 +219,7 @@ public class EnableTransactionManagementIntegrationTests { return new CallCountingTransactionManager(); } + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager1(); } @@ -327,6 +328,7 @@ public class EnableTransactionManagementIntegrationTests { public void setDataSource(DataSource dataSource) { } + @Override @Transactional public List findAll() { return Collections.emptyList(); @@ -336,6 +338,7 @@ public class EnableTransactionManagementIntegrationTests { @Repository static class DummyFooRepository implements FooRepository { + @Override @Transactional public List findAll() { return Collections.emptyList(); diff --git a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java index 076f73b84c1..26bc6fdb192 100644 --- a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java +++ b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java @@ -115,10 +115,12 @@ interface AnnotatedService { } class NonAnnotatedServiceImpl implements AnnotatedService { + @Override public void m() { } } class AnnotatedServiceImpl implements NonAnnotatedService { + @Override @Transactional public void m() { } } diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java index 2e9aaa5a15b..fe373ecc7e8 100644 --- a/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice; @SuppressWarnings("serial") public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice { + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java index 3dc49faf24f..89fc45aeb5e 100644 --- a/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/src/test/java/test/advice/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java index b0f9df9d9b6..610931b50c8 100644 --- a/src/test/java/test/beans/NestedTestBean.java +++ b/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java index 2c42a8cca50..d237316c8a3 100644 --- a/src/test/java/test/beans/TestBean.java +++ b/src/test/java/test/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java index 79158e74ea4..ccda8189944 100644 --- a/src/test/java/test/interceptor/NopInterceptor.java +++ b/src/test/java/test/interceptor/NopInterceptor.java @@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java index c7b2acf82fa..f33e0d1e1b4 100644 --- a/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; }