[libspring-java] 01/09: Merge tag 'upstream/4.3.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Aug 3 22:18:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libspring-java.
commit d172dea33439f99b67f14510bfdc66a1c47cbcc1
Merge: 347dd62 75a721d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Aug 3 19:55:24 2016 +0200
Merge tag 'upstream/4.3.2'
Upstream version 4.3.2
CODE_OF_CONDUCT.adoc | 44 +
CONTRIBUTING.md | 4 +
README.md | 4 +
build.gradle | 123 +-
gradle.properties | 2 +-
.../src/main/java/org/aopalliance/aop/Advice.java | 28 +
.../java/org/aopalliance/aop/AspectException.java | 48 +
.../intercept/ConstructorInterceptor.java | 59 +
.../intercept/ConstructorInvocation.java | 41 +
.../org/aopalliance/intercept/Interceptor.java | 69 +
.../java/org/aopalliance/intercept/Invocation.java | 37 +
.../java/org/aopalliance/intercept/Joinpoint.java | 65 +
.../aopalliance/intercept/MethodInterceptor.java | 56 +
.../aopalliance/intercept/MethodInvocation.java | 41 +
.../aop/aspectj/AbstractAspectJAdvice.java | 41 +-
.../aop/aspectj/AspectJAfterAdvice.java | 5 +-
.../aop/aspectj/AspectJAfterReturningAdvice.java | 5 +-
.../aop/aspectj/AspectJAfterThrowingAdvice.java | 5 +-
.../aop/aspectj/AspectJAroundAdvice.java | 4 +-
.../aop/aspectj/AspectJMethodBeforeAdvice.java | 4 +-
.../aop/aspectj/DeclareParentsAdvisor.java | 2 +-
.../aop/aspectj/SimpleAspectInstanceFactory.java | 8 +-
.../aspectj/SingletonAspectInstanceFactory.java | 7 +-
.../aop/aspectj/annotation/AspectMetadata.java | 25 +-
.../BeanFactoryAspectInstanceFactory.java | 6 +-
...InstantiationModelAwarePointcutAdvisorImpl.java | 27 +-
...azySingletonAspectInstanceFactoryDecorator.java | 16 +-
.../MetadataAwareAspectInstanceFactory.java | 9 +-
.../annotation/PrototypeAspectInstanceFactory.java | 5 +-
.../ReflectiveAspectJAdvisorFactory.java | 4 +-
.../SimpleMetadataAwareAspectInstanceFactory.java | 7 +-
...ingletonMetadataAwareAspectInstanceFactory.java | 12 +-
.../springframework/aop/config/AopConfigUtils.java | 4 +-
.../aop/framework/AdvisedSupport.java | 25 +-
.../aop/framework/AopProxyUtils.java | 40 +-
.../aop/framework/JdkDynamicAopProxy.java | 13 +-
.../aop/framework/ProxyProcessorSupport.java | 5 +-
.../autoproxy/AbstractAutoProxyCreator.java | 4 +-
.../aop/framework/autoproxy/AutoProxyUtils.java | 2 +-
.../interceptor/AsyncExecutionAspectSupport.java | 2 +-
.../org/springframework/aop/support/AopUtils.java | 35 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/aop/config/spring-aop-4.3.xsd | 409 ++++++
.../AspectJAdviceParameterNameDiscovererTests.java | 3 +-
.../MethodInvocationProceedingJoinPointTests.java | 3 +-
.../TrickyAspectJPointcutExpressionTests.java | 35 +-
.../AbstractAspectJAdvisorFactoryTests.java | 7 +-
.../annotation/AspectProxyFactoryTests.java | 27 +-
.../aop/framework/AopProxyUtilsTests.java | 15 +-
.../aop/framework/ProxyFactoryTests.java | 54 +-
.../aop/interceptor/DebugInterceptorTests.java | 3 +-
.../interceptor/SimpleTraceInterceptorTests.java | 3 +-
.../aop/target/ThreadLocalTargetSourceTests.java | 3 +-
.../cache/aspectj/AbstractCacheAspect.aj | 15 +-
.../springframework/cache/aspectj/AnyThrow.java | 35 +
.../cache/aspectj/JCacheCacheAspect.aj | 12 -
.../staticmock/AbstractMethodMockingControl.aj | 2 +
.../AnnotationDrivenStaticEntityMockingControl.aj | 2 +
.../mock/staticmock/MockStaticEntityMethods.java | 2 +
.../aspectj/AnnotationAsyncExecutionAspect.aj | 6 +-
.../config/AnnotatedClassCacheableService.java | 30 +
.../cache/config/CacheableService.java | 11 +
.../cache/config/DefaultCacheableService.java | 35 +-
.../AnnotationAsyncExecutionAspectTests.java | 3 +-
.../beans/AbstractNestablePropertyAccessor.java | 10 +-
.../beans/AbstractPropertyAccessor.java | 2 +-
.../org/springframework/beans/BeanInfoFactory.java | 2 +-
.../beans/BeanInstantiationException.java | 59 +-
.../java/org/springframework/beans/BeanUtils.java | 39 +-
.../org/springframework/beans/BeanWrapperImpl.java | 13 +
.../beans/CachedIntrospectionResults.java | 20 +-
.../beans/NullValueInNestedPathException.java | 15 +-
.../springframework/beans/PropertyAccessor.java | 14 +-
.../beans/PropertyEditorRegistrySupport.java | 16 +-
.../beans/TypeConverterDelegate.java | 9 +-
.../beans/factory/BeanCreationException.java | 8 +-
.../springframework/beans/factory/BeanFactory.java | 4 +-
.../beans/factory/BeanInitializationException.java | 6 +-
.../factory/BeanNotOfRequiredTypeException.java | 6 +-
.../beans/factory/InjectionPoint.java | 167 +++
.../factory/NoUniqueBeanDefinitionException.java | 15 +-
.../beans/factory/ObjectProvider.java | 61 +
.../factory/UnsatisfiedDependencyException.java | 46 +
.../access/SingletonBeanFactoryLocator.java | 6 +-
.../beans/factory/annotation/Autowired.java | 4 +-
.../AutowiredAnnotationBeanPostProcessor.java | 210 +--
.../annotation/BeanFactoryAnnotationUtils.java | 17 +-
.../InitDestroyAnnotationBeanPostProcessor.java | 21 +-
...alifierAnnotationAutowireCandidateResolver.java | 23 +-
.../beans/factory/config/AbstractFactoryBean.java | 4 +-
.../factory/config/AutowireCapableBeanFactory.java | 12 +-
.../factory/config/ConfigurableBeanFactory.java | 9 +-
.../factory/config/ConstructorArgumentValues.java | 12 +-
.../beans/factory/config/DependencyDescriptor.java | 123 +-
.../config/DestructionAwareBeanPostProcessor.java | 22 +-
.../factory/config/EmbeddedValueResolver.java | 59 +
.../InstantiationAwareBeanPostProcessor.java | 2 +-
.../config/PlaceholderConfigurerSupport.java | 14 +-
.../factory/config/PropertiesFactoryBean.java | 4 +-
.../config/PropertyPlaceholderConfigurer.java | 9 +-
.../beans/factory/config/Scope.java | 2 +-
.../support/AbstractBeanDefinitionReader.java | 2 +-
.../beans/factory/support/AbstractBeanFactory.java | 8 +-
.../CglibSubclassingInstantiationStrategy.java | 4 +-
.../beans/factory/support/ConstructorResolver.java | 139 +-
.../support/DefaultListableBeanFactory.java | 286 ++--
.../support/DefaultSingletonBeanRegistry.java | 4 +-
.../factory/support/DisposableBeanAdapter.java | 57 +-
.../beans/factory/support/RootBeanDefinition.java | 4 +-
.../support/SimpleInstantiationStrategy.java | 10 +-
.../factory/support/StaticListableBeanFactory.java | 27 +-
.../xml/DefaultBeanDefinitionDocumentReader.java | 6 +-
.../propertyeditors/CustomCollectionEditor.java | 6 +-
.../beans/propertyeditors/CustomMapEditor.java | 6 +-
.../beans/propertyeditors/FileEditor.java | 10 +-
.../beans/propertyeditors/InputStreamEditor.java | 8 +-
.../beans/propertyeditors/PathEditor.java | 116 ++
.../beans/propertyeditors/ReaderEditor.java | 8 +-
.../propertyeditors/StringArrayPropertyEditor.java | 4 +-
.../beans/propertyeditors/URIEditor.java | 9 +-
.../beans/propertyeditors/URLEditor.java | 4 +-
.../beans/support/ResourceEditorRegistrar.java | 20 +-
.../src/main/resources/META-INF/spring.schemas | 9 +-
.../beans/factory/xml/spring-beans-4.3.xsd | 1201 +++++++++++++++++
.../beans/factory/xml/spring-tool-4.3.xsd | 115 ++
.../beans/factory/xml/spring-util-4.3.xsd | 221 ++++
.../beans/AbstractPropertyAccessorTests.java | 34 +-
.../springframework/beans/BeanWrapperTests.java | 27 +-
.../factory/DefaultListableBeanFactoryTests.java | 22 +-
.../beans/factory/Spr5475Tests.java | 32 +-
.../AutowiredAnnotationBeanPostProcessorTests.java | 426 +++++-
.../config/PropertyPlaceholderConfigurerTests.java | 73 +-
.../config/ServiceLocatorFactoryBeanTests.java | 18 +-
.../support/security/CallbacksSecurityTests.java | 33 +-
.../beans/factory/xml/DuplicateBeanIdTests.java | 3 +-
.../beans/factory/xml/XmlBeanCollectionTests.java | 32 +-
.../beans/propertyeditors/CustomEditorTests.java | 3 +-
.../beans/propertyeditors/FileEditorTests.java | 19 +-
.../propertyeditors/InputStreamEditorTests.java | 5 +-
.../beans/propertyeditors/PathEditorTests.java | 80 ++
.../beans/propertyeditors/ReaderEditorTests.java | 4 +-
.../beans/propertyeditors/URIEditorTests.java | 21 +-
.../beans/propertyeditors/URLEditorTests.java | 16 +-
.../springframework/tests/sample/beans/HasMap.java | 23 +-
.../beans/factory/xml/collections.xml | 17 +-
.../springframework/beans/factory/xml/import.xml | 2 +-
.../cache/caffeine/CaffeineCache.java | 166 +++
.../cache/caffeine/CaffeineCacheManager.java | 230 ++++
.../cache/caffeine/package-info.java | 6 +
.../cache/ehcache/EhCacheCache.java | 46 +-
.../cache/ehcache/package-info.java | 2 +-
.../springframework/cache/guava/GuavaCache.java | 19 +
.../springframework/cache/jcache/JCacheCache.java | 41 +
.../AbstractFallbackJCacheOperationSource.java | 10 +-
.../TransactionAwareCacheDecorator.java | 9 +-
.../cache/transaction/package-info.java | 2 +-
.../commonj/WorkManagerTaskExecutor.java | 21 +-
.../freemarker/FreeMarkerConfigurationFactory.java | 14 +-
.../ui/velocity/VelocityEngineFactory.java | 4 +-
.../ui/velocity/VelocityEngineFactoryBean.java | 2 +
.../ui/velocity/VelocityEngineUtils.java | 2 +
.../springframework/cache/AbstractCacheTests.java | 114 --
.../cache/caffeine/CaffeineCacheManagerTests.java | 207 +++
.../cache/caffeine/CaffeineCacheTests.java | 70 +
.../cache/ehcache/EhCacheCacheTests.java | 3 +-
.../cache/guava/GuavaCacheTests.java | 3 +-
.../main/java/org/springframework/cache/Cache.java | 45 +-
.../cache/annotation/CacheEvict.java | 21 +-
.../springframework/cache/annotation/CachePut.java | 29 +-
.../cache/annotation/Cacheable.java | 47 +-
.../springframework/cache/annotation/Caching.java | 5 +-
.../annotation/CachingConfigurationSelector.java | 8 +-
.../cache/annotation/EnableCaching.java | 6 +-
.../annotation/SpringCacheAnnotationParser.java | 135 +-
.../cache/concurrent/ConcurrentMapCache.java | 119 +-
.../concurrent/ConcurrentMapCacheManager.java | 67 +-
.../AnnotationDrivenCacheBeanDefinitionParser.java | 9 +-
.../cache/config/CacheAdviceParser.java | 60 +-
.../AbstractFallbackCacheOperationSource.java | 43 +-
.../cache/interceptor/CacheAspectSupport.java | 216 ++-
.../cache/interceptor/CacheEvictOperation.java | 61 +-
.../cache/interceptor/CacheOperation.java | 194 ++-
.../CacheOperationExpressionEvaluator.java | 152 +++
.../cache/interceptor/CacheOperationInvoker.java | 5 +-
.../cache/interceptor/CachePutOperation.java | 50 +-
.../cache/interceptor/CacheableOperation.java | 65 +-
.../cache/interceptor/ExpressionEvaluator.java | 150 ---
.../cache/interceptor/NamedCacheResolver.java | 4 +-
.../cache/interceptor/SimpleKey.java | 4 +-
.../interceptor/VariableNotAvailableException.java | 4 +-
.../cache/support/AbstractCacheManager.java | 10 +-
.../cache/support/NoOpCacheManager.java | 13 +-
.../cache/support/package-info.java | 2 +-
.../context/ConfigurableApplicationContext.java | 16 +-
.../context/EmbeddedValueResolverAware.java | 6 +-
.../access/ContextSingletonBeanFactoryLocator.java | 4 +-
.../annotation/AnnotatedBeanDefinitionReader.java | 12 +-
.../AnnotationScopeMetadataResolver.java | 7 +-
.../annotation/AspectJAutoProxyRegistrar.java | 10 +-
.../context/annotation/AutoProxyRegistrar.java | 4 +-
.../context/annotation/BeanAnnotationHelper.java | 13 +-
.../annotation/ClassPathBeanDefinitionScanner.java | 2 +-
.../CommonAnnotationBeanPostProcessor.java | 22 +-
.../context/annotation/ComponentScan.java | 11 +
.../annotation/ComponentScanAnnotationParser.java | 44 +-
.../context/annotation/ComponentScans.java | 44 +
.../context/annotation/ConfigurationClass.java | 8 +-
.../ConfigurationClassBeanDefinitionReader.java | 2 +-
.../annotation/ConfigurationClassEnhancer.java | 6 +-
.../annotation/ConfigurationClassParser.java | 81 +-
.../context/annotation/EnableAspectJAutoProxy.java | 9 +
.../annotation/ImportBeanDefinitionRegistrar.java | 2 +-
.../context/annotation/ImportSelector.java | 2 +-
.../context/annotation/PropertySource.java | 25 +-
.../config/LoadTimeWeaverBeanDefinitionParser.java | 26 +-
.../PropertyPlaceholderBeanDefinitionParser.java | 6 +-
.../event/AbstractApplicationEventMulticaster.java | 21 +-
.../event/ApplicationListenerMethodAdapter.java | 7 +-
.../context/event/EventExpressionEvaluator.java | 19 +-
.../event/EventListenerMethodProcessor.java | 7 +-
.../context/expression/AnnotatedElementKey.java | 16 +-
.../expression/CachedExpressionEvaluator.java | 40 +-
.../expression/MethodBasedEvaluationContext.java | 3 +-
.../support/AbstractApplicationContext.java | 28 +-
.../AbstractResourceBasedMessageSource.java | 208 +++
.../support/ApplicationContextAwareProcessor.java | 25 +-
.../context/support/DefaultLifecycleProcessor.java | 2 +-
.../support/PostProcessorRegistrationDelegate.java | 5 +
.../PropertySourcesPlaceholderConfigurer.java | 9 +-
.../ReloadableResourceBundleMessageSource.java | 138 +-
.../support/ResourceBundleMessageSource.java | 148 +--
.../format/annotation/DateTimeFormat.java | 6 +
.../standard/DateTimeFormatterFactory.java | 9 +-
.../format/datetime/standard/InstantFormatter.java | 18 +-
.../classloading/ReflectiveLoadTimeWeaver.java | 7 +-
.../glassfish/GlassFishLoadTimeWeaver.java | 5 +-
.../classloading/tomcat/TomcatLoadTimeWeaver.java | 9 +-
.../weblogic/WebLogicLoadTimeWeaver.java | 7 +-
.../websphere/WebSphereLoadTimeWeaver.java | 6 +-
.../jmx/access/MBeanClientInterceptor.java | 33 +-
.../springframework/jmx/export/MBeanExporter.java | 2 +-
.../annotation/AnnotationJmxAttributeSource.java | 24 +-
.../export/annotation/ManagedNotifications.java | 4 +-
.../MethodNameBasedMBeanInfoAssembler.java | 4 +-
.../jmx/export/naming/IdentityNamingStrategy.java | 2 +-
.../jmx/export/naming/KeyNamingStrategy.java | 2 +-
.../jmx/support/ConnectorServerFactoryBean.java | 2 +-
.../springframework/jndi/JndiLocatorDelegate.java | 30 +-
.../jndi/JndiObjectFactoryBean.java | 2 +-
.../springframework/jndi/JndiPropertySource.java | 11 +-
.../AnnotationAsyncExecutionInterceptor.java | 6 +-
.../scheduling/annotation/AsyncResult.java | 18 +-
.../scheduling/annotation/Scheduled.java | 28 +-
.../ScheduledAnnotationBeanPostProcessor.java | 129 +-
.../scheduling/annotation/Schedules.java | 5 +-
.../concurrent/ConcurrentTaskExecutor.java | 17 +-
.../concurrent/ThreadPoolTaskExecutor.java | 47 +-
.../scheduling/config/ScheduledTask.java | 49 +
.../scheduling/config/ScheduledTaskRegistrar.java | 161 ++-
.../scheduling/support/CronSequenceGenerator.java | 26 +-
.../scripting/bsh/BshScriptUtils.java | 3 +-
.../scripting/config/ScriptingDefaultsParser.java | 6 +-
.../scripting/groovy/GroovyScriptFactory.java | 2 +-
.../support/ScriptFactoryPostProcessor.java | 2 +-
.../scripting/support/StandardScriptFactory.java | 4 +-
.../beanvalidation/LocalValidatorFactoryBean.java | 42 +-
.../beanvalidation/SpringValidatorAdapter.java | 73 +-
.../src/main/resources/META-INF/spring.schemas | 15 +-
.../cache/config/spring-cache-4.3.xsd | 317 +++++
.../context/config/spring-context-4.3.xsd | 547 ++++++++
.../springframework/ejb/config/spring-jee-4.3.xsd | 267 ++++
.../scheduling/config/spring-task-4.3.xsd | 309 +++++
.../scripting/config/spring-lang-4.3.xsd | 240 ++++
.../aspectj/AspectAndAdvicePrecedenceTests.java | 8 +-
.../springframework/aop/aspectj/_TestTypes.java | 2 +-
.../aspectj/autoproxy/AnnotationBindingTests.java | 9 +-
.../autoproxy/AspectJAutoProxyCreatorTests.java | 8 +-
.../aspectj/autoproxy/spr3064/SPR3064Tests.java | 10 +-
.../aop/framework/AbstractAopProxyTests.java | 3 +-
.../aop/framework/ClassWithComplexConstructor.java | 6 +-
.../aop/framework/JdkDynamicProxyTests.java | 4 +-
.../autoproxy/AdvisorAutoProxyCreatorTests.java | 36 +-
.../framework/autoproxy/AutoProxyCreatorTests.java | 21 +-
.../framework/autoproxy/PackageVisibleMethod.java | 24 +
.../QualifierAnnotationAutowireContextTests.java | 67 +-
.../beans/factory/xml/XmlBeanFactoryTests.java | 15 +-
.../springframework/cache/AbstractCacheTests.java | 218 ++++
.../org/springframework/cache/CacheReproTests.java | 50 +
.../cache/NoOpCacheManagerTests.java | 57 +-
.../AnnotationCacheOperationSourceTests.java | 44 +
.../cache/concurrent/ConcurrentCacheTests.java | 115 --
.../concurrent/ConcurrentMapCacheManagerTests.java | 18 +
.../cache/concurrent/ConcurrentMapCacheTests.java | 111 ++
.../cache/config/AbstractCacheAnnotationTests.java | 97 ++
.../config/AnnotatedClassCacheableService.java | 29 +
.../cache/config/CacheAdviceParserTests.java | 5 +-
.../cache/config/CacheableService.java | 10 +
.../cache/config/DefaultCacheableService.java | 32 +-
.../config/EnableCachingIntegrationTests.java | 98 +-
.../config/ExpressionCachingIntegrationTests.java | 2 +
.../cache/interceptor/CacheSyncFailureTests.java | 158 +++
.../interceptor/ExpressionEvaluatorTests.java | 40 +-
.../AbstractCircularImportDetectionTests.java | 19 +-
.../AsmCircularImportDetectionTests.java | 10 +-
.../CommonAnnotationBeanPostProcessorTests.java | 5 +
...entScanAndImportAnnotationInteractionTests.java | 14 +-
.../ComponentScanAnnotationIntegrationTests.java | 86 +-
.../ConfigurationClassPostProcessorTests.java | 10 +-
.../annotation/EnableAspectJAutoProxyTests.java | 36 +-
.../annotation/PropertySourceAnnotationTests.java | 65 +-
.../context/annotation/Spr12278Tests.java | 115 ++
.../configuration/AutowiredConfigurationTests.java | 159 ++-
.../ConfigurationClassAspectIntegrationTests.java | 6 +-
.../ConfigurationClassProcessingTests.java | 50 +-
...ionClassWithPlaceholderConfigurerBeanTests.java | 74 +-
.../configuration/ImportResourceTests.java | 52 +-
.../annotation/configuration/ScopingTests.java | 16 +-
.../context/annotation/spr10546/Spr10546Tests.java | 2 +-
.../config/ContextNamespaceHandlerTests.java | 24 +-
.../AbstractApplicationEventListenerTests.java | 6 +-
.../event/AnnotationDrivenEventListenerTests.java | 100 +-
.../event/ApplicationContextEventTests.java | 6 +-
.../ApplicationListenerMethodAdapterTests.java | 24 +-
.../event/EventPublicationInterceptorTests.java | 12 +-
.../context/event/test/AbstractIdentifiable.java | 8 +-
.../context/event/test/EventCollector.java | 6 +-
.../event/test/IdentifiableApplicationEvent.java | 8 +-
.../context/expression/FactoryBeanAccessTests.java | 130 ++
.../context/expression/MapAccessorTests.java | 22 +-
.../MethodBasedEvaluationContextTests.java | 44 +-
.../PropertySourcesPlaceholderConfigurerTests.java | 153 ++-
.../SerializableBeanFactoryMemoryLeakTests.java | 6 +-
...LocalStatelessSessionProxyFactoryBeanTests.java | 8 +-
...emoteStatelessSessionProxyFactoryBeanTests.java | 11 +-
.../format/datetime/DateFormattingTests.java | 10 +-
.../datetime/joda/JodaTimeFormattingTests.java | 10 +-
.../datetime/standard/DateTimeFormattingTests.java | 12 +-
.../support/FormattingConversionServiceTests.java | 4 +-
.../jmx/access/MBeanClientInterceptorTests.java | 12 +-
.../access/RemoteMBeanClientInterceptorTests.java | 3 +-
.../jmx/export/NotificationListenerTests.java | 9 +-
.../jmx/export/annotation/AnnotationTestBean.java | 2 +-
.../annotation/AnotherAnnotationTestBeanImpl.java | 2 +-
.../EnableMBeanExportConfigurationTests.java | 243 ++--
...thodNameBasedMBeanInfoAssemblerMappedTests.java | 2 +-
.../MethodNameBasedMBeanInfoAssemblerTests.java | 2 +-
.../support/ConnectorServerFactoryBeanTests.java | 15 +-
.../MBeanServerConnectionFactoryBeanTests.java | 9 +-
.../jndi/JndiPropertySourceTests.java | 36 +-
.../remoting/rmi/RmiSupportTests.java | 3 +-
.../scheduling/annotation/EnableAsyncTests.java | 91 +-
.../annotation/EnableSchedulingTests.java | 244 ++--
.../ScheduledAnnotationBeanPostProcessorTests.java | 189 ++-
...azyScheduledTasksBeanDefinitionParserTests.java | 6 +-
.../support/CronSequenceGeneratorTests.java | 47 +-
.../scripting/groovy/GroovyScriptFactoryTests.java | 11 +-
.../jruby/AdvisedJRubyScriptFactoryTests.java | 6 +-
.../tests/sample/beans/Employee.java | 9 +-
.../validation/DataBinderTests.java | 47 +-
.../SpringValidatorAdapterTests.java | 225 ++++
...orAutoProxyCreatorTests-common-interceptors.xml | 43 +-
.../xml/XmlBeanFactoryTests-constructorArg.xml | 8 +
.../springframework/cache/config/cache-advice.xml | 3 +
.../contextNamespaceHandlerTests-location.xml | 6 +-
.../context/config/test-bar.properties | 4 +-
.../groovy/jruby-with-xsd-proxy-target-class.xml | 17 -
.../java/org/springframework/asm/ClassReader.java | 3 +-
.../java/org/springframework/asm/ClassWriter.java | 47 +-
.../main/java/org/springframework/asm/Frame.java | 2 +-
.../main/java/org/springframework/asm/Handle.java | 60 +-
.../springframework/core/CollectionFactory.java | 6 +-
.../core/ConfigurableObjectInputStream.java | 12 +-
.../core/DecoratingClassLoader.java | 33 +-
.../org/springframework/core/DecoratingProxy.java | 47 +
.../org/springframework/core/MethodClassKey.java | 85 ++
.../springframework/core/MethodIntrospector.java | 15 +-
.../org/springframework/core/MethodParameter.java | 78 ++
.../core/OverridingClassLoader.java | 37 +-
.../core/SerializableTypeWrapper.java | 7 +-
.../org/springframework/core/SpringProperties.java | 3 +-
...ractAliasAwareAnnotationAttributeExtractor.java | 17 +-
.../core/annotation/AnnotatedElementUtils.java | 1135 ++++++++++++----
.../annotation/AnnotationAttributeExtractor.java | 5 +-
.../core/annotation/AnnotationAttributes.java | 100 +-
.../annotation/AnnotationAwareOrderComparator.java | 20 +-
.../core/annotation/AnnotationUtils.java | 293 +++--
.../DefaultAnnotationAttributeExtractor.java | 7 +-
.../MapAnnotationAttributeExtractor.java | 36 +-
.../SynthesizedAnnotationInvocationHandler.java | 31 +-
.../annotation/SynthesizingMethodParameter.java | 57 +-
.../core/convert/TypeDescriptor.java | 6 +-
.../core/convert/converter/ConverterRegistry.java | 13 +-
.../support/AbstractConditionalEnumConverter.java | 50 +
.../core/convert/support/ConversionUtils.java | 15 +-
.../convert/support/DefaultConversionService.java | 8 +-
.../convert/support/EnumToIntegerConverter.java | 40 +
.../convert/support/EnumToStringConverter.java | 21 +-
.../convert/support/GenericConversionService.java | 17 +-
.../support/IntegerToEnumConverterFactory.java | 52 +
.../convert/support/ObjectToObjectConverter.java | 7 +-
.../support/StringToEnumConverterFactory.java | 13 +-
.../core/env/AbstractEnvironment.java | 3 +-
.../core/env/AbstractPropertyResolver.java | 17 +-
.../core/env/ConfigurablePropertyResolver.java | 20 +-
.../springframework/core/env/PropertyResolver.java | 24 +-
.../core/env/PropertySourcesPropertyResolver.java | 67 +-
.../core/env/SystemEnvironmentPropertySource.java | 58 +-
.../core/io/AbstractFileResolvingResource.java | 4 +-
.../core/io/DefaultResourceLoader.java | 37 +-
.../core/io/FileSystemResource.java | 5 +-
.../org/springframework/core/io/PathResource.java | 6 +-
.../springframework/core/io/ProtocolResolver.java | 42 +
.../java/org/springframework/core/io/Resource.java | 23 +-
.../org/springframework/core/io/UrlResource.java | 7 +-
.../io/support/DefaultPropertySourceFactory.java | 39 +
.../PathMatchingResourcePatternResolver.java | 132 +-
.../core/io/support/PropertySourceFactory.java | 41 +
.../core/io/support/ResourcePatternUtils.java | 6 +-
.../core/io/support/ResourceRegion.java | 77 ++
.../core/io/support/SpringFactoriesLoader.java | 10 +-
.../serializer/support/SerializationDelegate.java | 78 ++
.../core/style/ToStringCreator.java | 14 +-
.../core/task/SimpleAsyncTaskExecutor.java | 23 +-
.../springframework/core/task/TaskDecorator.java | 45 +
.../core/task/support/TaskExecutorAdapter.java | 50 +-
.../AbstractRecursiveAnnotationVisitor.java | 4 +-
.../AnnotationAttributesReadingVisitor.java | 51 +-
.../AnnotationMetadataReadingVisitor.java | 5 +-
.../AnnotationReadingVisitorUtils.java | 43 +-
.../classreading/MethodMetadataReadingVisitor.java | 8 +-
.../RecursiveAnnotationArrayVisitor.java | 2 +-
.../RecursiveAnnotationAttributesVisitor.java | 51 +-
.../java/org/springframework/lang/UsesSunMisc.java | 36 +
.../org/springframework/util/AntPathMatcher.java | 65 +-
.../springframework/util/AutoPopulatingList.java | 15 +-
.../java/org/springframework/util/Base64Utils.java | 8 +-
.../java/org/springframework/util/ClassUtils.java | 11 +-
.../java/org/springframework/util/DigestUtils.java | 26 +-
.../util/LinkedCaseInsensitiveMap.java | 10 +-
.../java/org/springframework/util/MimeType.java | 157 ++-
.../org/springframework/util/MimeTypeUtils.java | 5 +-
.../java/org/springframework/util/NumberUtils.java | 48 +-
.../util/ResizableByteArrayOutputStream.java | 2 +-
.../org/springframework/util/ResourceUtils.java | 4 +-
.../java/org/springframework/util/StopWatch.java | 4 +-
.../java/org/springframework/util/StreamUtils.java | 59 +-
.../util/UpdateMessageDigestInputStream.java | 4 +-
.../org/springframework/util/backoff/BackOff.java | 2 +-
.../util/comparator/CompoundComparator.java | 2 +-
.../util/comparator/InstanceComparator.java | 2 +-
.../CompletableToListenableFutureAdapter.java | 5 +-
.../util/concurrent/FailureCallback.java | 10 +-
.../util/concurrent/FutureAdapter.java | 9 +-
.../util/concurrent/ListenableFuture.java | 23 +-
.../util/concurrent/ListenableFutureAdapter.java | 8 +-
.../util/concurrent/ListenableFutureCallback.java | 4 +-
.../ListenableFutureCallbackRegistry.java | 38 +-
.../util/concurrent/SuccessCallback.java | 8 +-
.../util/xml/XmlValidationModeDetector.java | 2 +-
.../core/GenericTypeResolverTests.java | 2 +-
.../core/SerializableTypeWrapperTests.java | 52 +-
.../annotation/AnnotatedElementUtilsTests.java | 247 +++-
.../core/annotation/AnnotationAttributesTests.java | 366 +-----
.../core/annotation/AnnotationUtilsTests.java | 307 ++++-
.../ComposedRepeatableAnnotationsTests.java | 386 ++++++
.../MapAnnotationAttributeExtractorTests.java | 36 +-
...edAnnotationsOnSingleAnnotatedElementTests.java | 368 ++++++
.../core/convert/TypeDescriptorTests.java | 574 ++++----
.../CollectionToCollectionConverterTests.java | 48 +-
.../support/DefaultConversionServiceTests.java | 65 +-
.../support/GenericConversionServiceTests.java | 121 +-
.../convert/support/MapToMapConverterTests.java | 66 +-
.../core/convert/support/StreamConverterTests.java | 21 +-
.../springframework/core/env/DummyEnvironment.java | 9 +-
.../core/env/PropertySourceTests.java | 20 +-
.../env/PropertySourcesPropertyResolverTests.java | 23 +-
.../env/SystemEnvironmentPropertySourceTests.java | 55 +-
.../io/support/DummyPackagePrivateFactory.java | 26 +
.../core/io/support/ResourceRegionTests.java | 47 +
.../io/support/SpringFactoriesLoaderTests.java | 56 +
.../core/type/AnnotationMetadataTests.java | 24 +-
...lassMetadataReadingVisitorMemberClassTests.java | 3 +-
.../java/org/springframework/tests/Assume.java | 58 +-
.../java/org/springframework/tests/BuildTests.java | 36 -
.../org/springframework/tests/JavaVersion.java | 95 --
.../springframework/tests/JavaVersionTests.java | 43 -
.../java/org/springframework/tests/TestGroup.java | 11 +-
.../org/springframework/tests/TestGroupTests.java | 8 +-
.../springframework/util/AntPathMatcherTests.java | 55 +-
.../util/AutoPopulatingListTests.java | 4 +-
.../org/springframework/util/DigestUtilsTests.java | 32 +-
.../util/LinkedCaseInsensitiveMapTests.java | 22 +
.../org/springframework/util/MimeTypeTests.java | 15 +-
.../org/springframework/util/NumberUtilsTests.java | 19 +-
.../util/ResizableByteArrayOutputStreamTests.java | 2 +-
.../org/springframework/util/StreamUtilsTests.java | 10 +
.../util/xml/AbstractStaxHandlerTestCase.java | 2 +-
.../util/xml/AbstractStaxXMLReaderTestCase.java | 8 +-
.../src/test/resources/META-INF/spring.factories | 9 +
.../support/springFactoriesLoaderTests.properties | 2 -
.../springframework/expression/BeanResolver.java | 9 +-
.../springframework/expression/spel/CodeFlow.java | 147 ++-
.../expression/spel/SpelMessage.java | 4 +-
.../expression/spel/ast/BeanReference.java | 12 +-
.../expression/spel/ast/Indexer.java | 4 +-
.../expression/spel/ast/InlineList.java | 12 +-
.../expression/spel/ast/OperatorInstanceof.java | 22 +-
.../standard/InternalSpelExpressionParser.java | 13 +-
.../expression/spel/standard/TokenKind.java | 4 +-
.../expression/spel/standard/Tokenizer.java | 12 +-
.../spel/support/ReflectivePropertyAccessor.java | 53 +-
.../spel/support/StandardTypeConverter.java | 10 +-
.../expression/spel/EvaluationTests.java | 112 +-
.../spel/ExpressionLanguageScenarioTests.java | 17 +-
.../expression/spel/ExpressionStateTests.java | 12 +-
.../expression/spel/IndexingTests.java | 20 +-
.../expression/spel/OperatorOverloaderTests.java | 45 +-
.../expression/spel/ParsingTests.java | 3 +-
.../expression/spel/PropertyAccessTests.java | 36 +-
.../spel/ScenariosForSpringSecurity.java | 9 +-
.../spel/SelectionAndProjectionTests.java | 3 +-
.../expression/spel/SetValueTests.java | 31 +-
.../spel/SpelCompilationCoverageTests.java | 71 +-
.../spel/SpelCompilationPerformanceTests.java | 267 ++--
.../expression/spel/SpelReproTests.java | 33 +-
.../expression/spel/StandardTypeLocatorTests.java | 3 +-
.../expression/spel/VariableAndFunctionTests.java | 7 +-
.../expression/spel/standard/SpelParserTests.java | 61 +-
.../tomcat/TomcatInstrumentableClassLoader.java | 4 +-
.../jdbc/config/DatabasePopulatorConfigUtils.java | 20 +-
.../jdbc/core/BeanPropertyRowMapper.java | 41 +-
.../springframework/jdbc/core/JdbcTemplate.java | 34 +-
.../jdbc/core/metadata/TableMetaDataContext.java | 6 +-
.../jdbc/core/simple/AbstractJdbcInsert.java | 3 +-
.../jdbc/core/simple/SimpleJdbcInsert.java | 5 +-
.../core/simple/SimpleJdbcInsertOperations.java | 3 +-
.../datasource/AbstractDriverBasedDataSource.java | 52 +-
.../jdbc/datasource/ConnectionHandle.java | 4 +-
.../jdbc/datasource/ConnectionHolder.java | 6 +-
.../UserCredentialsDataSourceAdapter.java | 39 +-
.../init/CompositeDatabasePopulator.java | 29 +
.../jdbc/object/GenericSqlQuery.java | 54 +-
.../jdbc/support/SQLErrorCodes.java | 4 +-
.../jdbc/support/lob/DefaultLobHandler.java | 1 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../jdbc/config/spring-jdbc-4.3.xsd | 223 ++++
.../jdbc/support/sql-error-codes.xml | 7 +-
.../jdbc/config/JdbcNamespaceIntegrationTests.java | 13 +-
.../jdbc/core/JdbcTemplateQueryTests.java | 3 +-
.../datasource/DataSourceJtaTransactionTests.java | 9 +-
.../DataSourceTransactionManagerTests.java | 4 +-
.../init/CompositeDatabasePopulatorTests.java | 92 ++
.../lookup/BeanFactoryDataSourceLookupTests.java | 5 +-
.../jdbc/object/GenericSqlQueryTests.java | 19 +-
.../jdbc/object/StoredProcedureTests.java | 4 +-
.../rowset/ResultSetWrappingRowSetTests.java | 3 +-
.../jdbc/config/jdbc-config-custom-separator.xml | 13 +
.../config/jdbc-initialize-custom-separator.xml | 15 +
.../jdbc/object/GenericSqlQueryTests-context.xml | 26 +-
.../jms/UncategorizedJmsException.java | 4 +-
.../springframework/jms/annotation/EnableJms.java | 2 +-
.../jms/annotation/JmsListener.java | 8 +-
.../JmsListenerAnnotationBeanPostProcessor.java | 17 +-
.../jms/annotation/JmsListeners.java | 5 +-
.../jms/config/JcaListenerContainerParser.java | 4 +-
.../jms/config/MethodJmsListenerEndpoint.java | 44 +-
.../jms/connection/CachingConnectionFactory.java | 22 +-
.../jms/connection/SessionProxy.java | 2 +-
.../TransactionAwareConnectionFactoryProxy.java | 4 +-
.../org/springframework/jms/core/JmsTemplate.java | 45 +-
.../AbstractPollingMessageListenerContainer.java | 10 +-
.../listener/DefaultMessageListenerContainer.java | 14 +-
.../adapter/AbstractAdaptableMessageListener.java | 106 +-
.../adapter/MessagingMessageListenerAdapter.java | 16 +-
.../endpoint/JmsMessageEndpointFactory.java | 4 +-
.../springframework/jms/support/JmsAccessor.java | 2 +-
.../converter/MappingJackson2MessageConverter.java | 165 ++-
.../converter/MessagingMessageConverter.java | 33 +-
.../support/converter/SmartMessageConverter.java | 51 +
.../destination/JmsDestinationAccessor.java | 41 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/jms/config/spring-jms-4.3.xsd | 638 +++++++++
.../jms/annotation/EnableJmsTests.java | 64 +
...msListenerAnnotationBeanPostProcessorTests.java | 6 +-
...msListenerContainerFactoryIntegrationTests.java | 19 +-
.../jms/config/MethodJmsListenerEndpointTests.java | 44 +-
.../adapter/MessageListenerAdapterTests.java | 12 +-
.../MessagingMessageListenerAdapterTests.java | 92 +-
.../jms/support/SimpleMessageConverterTests.java | 30 +-
.../MappingJackson2MessageConverterTests.java | 134 +-
.../converter/MessagingMessageConverterTests.java | 46 +-
.../converter/MappingJackson2MessageConverter.java | 54 +-
.../converter/MarshallingMessageConverter.java | 2 +-
.../converter/StringMessageConverter.java | 4 +-
.../messaging/handler/HandlerMethod.java | 71 +-
.../messaging/handler/HandlerMethodSelector.java | 2 +-
.../messaging/handler/annotation/SendTo.java | 9 +-
.../AbstractNamedValueMethodArgumentResolver.java | 55 +-
.../DefaultMessageHandlerMethodFactory.java | 2 +-
.../support/MessageMethodArgumentResolver.java | 98 +-
.../AbstractExceptionHandlerMethodResolver.java | 33 +-
.../HandlerMethodArgumentResolverComposite.java | 14 +
.../handler/invocation/InvocableHandlerMethod.java | 15 +-
.../messaging/simp/annotation/SendToUser.java | 7 +-
.../support/SendToMethodReturnValueHandler.java | 69 +-
.../SimpAnnotationMethodMessageHandler.java | 32 +-
.../SubscriptionMethodReturnValueHandler.java | 65 +-
.../simp/broker/DefaultSubscriptionRegistry.java | 38 +-
.../simp/broker/SimpleBrokerMessageHandler.java | 50 +-
.../config/AbstractMessageBrokerConfiguration.java | 32 +-
.../simp/config/MessageBrokerRegistry.java | 38 +-
.../simp/config/TaskExecutorRegistration.java | 2 +-
.../messaging/simp/stomp/DefaultStompSession.java | 28 +-
.../simp/stomp/StompBrokerRelayMessageHandler.java | 2 +-
.../messaging/simp/stomp/StompHeaderAccessor.java | 2 +-
.../messaging/simp/stomp/StompSession.java | 15 +-
.../simp/user/DefaultUserDestinationResolver.java | 31 +-
.../simp/user/MultiServerUserRegistry.java | 331 +++--
.../simp/user/UserRegistryMessageHandler.java | 37 +-
.../simp/user/UserSessionRegistryAdapter.java | 39 +-
.../messaging/support/MessageHeaderAccessor.java | 21 +-
.../messaging/tcp/TcpConnection.java | 4 +-
.../AbstractPromiseToListenableFutureAdapter.java | 7 +-
.../converter/AbstractMessageConverterTests.java | 136 --
.../messaging/converter/MessageConverterTests.java | 5 +-
...otationExceptionHandlerMethodResolverTests.java | 18 +-
.../support/HeaderMethodArgumentResolverTests.java | 44 +-
.../MessageMethodArgumentResolverTests.java | 92 +-
.../invocation/MethodMessageHandlerTests.java | 5 +-
.../SendToMethodReturnValueHandlerTests.java | 379 ++++--
.../config/MessageBrokerConfigurationTests.java | 29 +-
.../simp/stomp/DefaultStompSessionTests.java | 73 +-
.../simp/stomp/Reactor2TcpStompClientTests.java | 22 +-
...pBrokerRelayMessageHandlerIntegrationTests.java | 49 +-
.../messaging/simp/stomp/StompCodecTests.java | 3 +-
.../user/DefaultUserDestinationResolverTests.java | 39 +-
.../simp/user/MultiServerUserRegistryTests.java | 147 ++-
.../messaging/simp/user/TestSimpSession.java | 17 +-
.../messaging/simp/user/TestSimpSubscription.java | 27 +-
.../messaging/simp/user/TestSimpUser.java | 15 +
.../support/MessageHeaderAccessorTests.java | 24 +-
.../hibernate5/HibernateExceptionTranslator.java | 16 +-
.../orm/hibernate5/HibernateTemplate.java | 82 +-
.../hibernate5/HibernateTransactionManager.java | 24 +-
.../orm/hibernate5/LocalSessionFactoryBean.java | 102 +-
.../orm/hibernate5/LocalSessionFactoryBuilder.java | 144 +-
.../orm/hibernate5/SessionFactoryUtils.java | 117 +-
.../orm/hibernate5/SpringFlushSynchronization.java | 11 +-
.../orm/hibernate5/SpringJtaSessionContext.java | 3 +-
.../orm/hibernate5/SpringSessionContext.java | 5 +-
.../hibernate5/SpringSessionSynchronization.java | 22 +-
.../support/OpenSessionInViewFilter.java | 3 +-
.../support/OpenSessionInViewInterceptor.java | 3 +-
.../hibernate5/support/OpenSessionInterceptor.java | 3 +-
.../orm/hibernate3/AbstractSessionFactoryBean.java | 2 +
.../hibernate3/FilterDefinitionFactoryBean.java | 2 +
.../orm/hibernate3/HibernateAccessor.java | 2 +
.../orm/hibernate3/HibernateCallback.java | 2 +
.../hibernate3/HibernateExceptionTranslator.java | 2 +
.../orm/hibernate3/HibernateJdbcException.java | 2 +
.../HibernateObjectRetrievalFailureException.java | 2 +
.../orm/hibernate3/HibernateOperations.java | 2 +
...HibernateOptimisticLockingFailureException.java | 2 +
.../orm/hibernate3/HibernateQueryException.java | 2 +
.../orm/hibernate3/HibernateSystemException.java | 2 +
.../orm/hibernate3/HibernateTemplate.java | 3 +-
.../hibernate3/HibernateTransactionManager.java | 4 +-
.../LocalDataSourceConnectionProvider.java | 2 +
.../LocalJtaDataSourceConnectionProvider.java | 2 +
.../orm/hibernate3/LocalRegionFactoryProxy.java | 2 +
.../orm/hibernate3/LocalSessionFactoryBean.java | 12 +-
.../hibernate3/LocalTransactionManagerLookup.java | 2 +
.../orm/hibernate3/SessionFactoryUtils.java | 3 +-
.../orm/hibernate3/SessionHolder.java | 2 +
.../orm/hibernate3/SpringSessionContext.java | 2 +
.../hibernate3/SpringSessionSynchronization.java | 2 +
.../orm/hibernate3/SpringTransactionFactory.java | 2 +
...ansactionAwareDataSourceConnectionProvider.java | 2 +
.../orm/hibernate3/TypeDefinitionBean.java | 2 +
.../annotation/AnnotationSessionFactoryBean.java | 6 +-
.../orm/hibernate3/support/AbstractLobType.java | 7 +-
.../support/AsyncRequestInterceptor.java | 10 +-
.../orm/hibernate3/support/BlobByteArrayType.java | 2 +
.../hibernate3/support/BlobSerializableType.java | 2 +
.../orm/hibernate3/support/BlobStringType.java | 2 +
.../orm/hibernate3/support/ClobStringType.java | 2 +
.../hibernate3/support/HibernateDaoSupport.java | 28 +-
.../support/IdTransferringMergeEventListener.java | 4 +-
.../support/OpenSessionInViewFilter.java | 24 +-
.../support/OpenSessionInViewInterceptor.java | 31 +-
.../hibernate3/support/OpenSessionInterceptor.java | 8 +-
.../hibernate3/support/ScopedBeanInterceptor.java | 2 +
.../orm/jpa/AbstractEntityManagerFactoryBean.java | 99 +-
.../orm/jpa/EntityManagerFactoryUtils.java | 4 +-
.../orm/jpa/ExtendedEntityManagerCreator.java | 7 +-
.../orm/jpa/JpaSystemException.java | 3 +-
.../springframework/orm/jpa/JpaVendorAdapter.java | 2 +-
.../LocalContainerEntityManagerFactoryBean.java | 17 +-
.../orm/jpa/SharedEntityManagerCreator.java | 12 +-
.../ClassFileTransformerAdapter.java | 57 +-
.../DefaultPersistenceUnitManager.java | 34 +-
.../jpa/persistenceunit/PersistenceUnitReader.java | 89 +-
.../PersistenceAnnotationBeanPostProcessor.java | 5 +
.../orm/jpa/vendor/HibernateJpaDialect.java | 27 +-
.../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 30 +-
spring-orm/src/main/java/overview.html | 2 +-
.../orm/hibernate3/HibernateInterceptorTests.java | 2 +
.../hibernate3/HibernateJtaTransactionTests.java | 21 +-
.../orm/hibernate3/HibernateTemplateTests.java | 4 +-
.../HibernateTransactionManagerTests.java | 4 +-
.../hibernate3/LocalSessionFactoryBeanTests.java | 2 +
.../support/HibernateDaoSupportTests.java | 2 +
.../orm/hibernate3/support/LobTypeTests.java | 2 +
.../hibernate3/support/OpenSessionInViewTests.java | 2 +
.../support/ScopedBeanInterceptorTests.java | 2 +
.../PersistenceXmlParsingTests.java | 15 +-
.../orm/jpa/hibernate/hibernate-manager.xml | 13 +-
spring-oxm/oxm.gradle | 34 +-
.../springframework/oxm/jaxb/Jaxb2Marshaller.java | 4 +-
.../springframework/oxm/jibx/JibxMarshaller.java | 4 +-
.../oxm/xstream/XStreamMarshaller.java | 12 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/oxm/config/spring-oxm-4.3.xsd | 136 ++
.../oxm/config/OxmNamespaceHandlerTests.java | 10 +-
.../java/org/springframework/oxm/jibx/Flights.java | 3 +-
.../oxm/jibx/JibxMarshallerTests.java | 12 +-
.../oxm/jibx/JibxUnmarshallerTests.java | 11 +-
.../mock/web/MockHttpServletRequest.java | 4 +-
.../mock/web/MockHttpServletResponse.java | 4 +-
.../mock/web/MockServletContext.java | 11 +-
.../web/portlet/ServletWrappingPortletContext.java | 5 +-
.../springframework/test/annotation/Commit.java | 4 +-
.../ProfileValueSourceConfiguration.java | 10 +-
.../test/annotation/ProfileValueUtils.java | 48 +-
.../springframework/test/annotation/Rollback.java | 2 +
.../test/annotation/TestAnnotationUtils.java | 5 +-
.../test/context/ActiveProfiles.java | 4 +-
.../test/context/BootstrapUtils.java | 71 +-
.../test/context/BootstrapWith.java | 6 +-
.../test/context/ContextConfiguration.java | 6 +-
.../context/ContextConfigurationAttributes.java | 30 +-
.../test/context/ContextCustomizer.java | 49 +
.../test/context/ContextCustomizerFactory.java | 52 +
.../test/context/ContextHierarchy.java | 6 +-
.../test/context/MergedContextConfiguration.java | 64 +-
.../test/context/TestContextBootstrapper.java | 15 +-
.../test/context/TestContextManager.java | 76 +-
.../test/context/TestExecutionListener.java | 2 +
.../test/context/TestExecutionListeners.java | 4 +-
.../test/context/TestPropertySource.java | 4 +-
.../test/context/cache/ContextCache.java | 24 +-
.../test/context/cache/ContextCacheUtils.java | 54 +
.../test/context/cache/DefaultContextCache.java | 93 +-
.../org/springframework/test/context/jdbc/Sql.java | 4 +-
.../jdbc/SqlScriptsTestExecutionListener.java | 9 +-
.../junit4/AbstractJUnit4SpringContextTests.java | 10 +-
...tractTransactionalJUnit4SpringContextTests.java | 9 +-
.../context/junit4/SpringJUnit4ClassRunner.java | 27 +-
.../test/context/junit4/SpringRunner.java | 52 +
.../test/context/junit4/package-info.java | 3 +-
.../test/context/junit4/rules/SpringClassRule.java | 14 +-
.../context/junit4/rules/SpringMethodRule.java | 14 +-
.../junit4/statements/ProfileValueChecker.java | 24 +-
.../statements/RunAfterTestClassCallbacks.java | 8 +-
.../statements/RunAfterTestMethodCallbacks.java | 8 +-
.../context/support/AbstractContextLoader.java | 24 +-
.../AbstractDelegatingSmartContextLoader.java | 17 +-
.../support/AbstractGenericContextLoader.java | 7 +-
.../support/AbstractTestContextBootstrapper.java | 132 +-
.../AnnotationConfigContextLoaderUtils.java | 6 +-
.../test/context/support/ContextLoaderUtils.java | 18 +-
.../context/support/TestPropertySourceUtils.java | 127 +-
...tractTransactionalTestNGSpringContextTests.java | 3 +-
.../test/context/transaction/AfterTransaction.java | 14 +-
.../context/transaction/BeforeTransaction.java | 14 +-
.../transaction/TestContextTransactionUtils.java | 41 +-
.../transaction/TransactionConfiguration.java | 7 +-
.../TransactionalTestExecutionListener.java | 166 +--
.../web/AbstractGenericWebContextLoader.java | 9 +-
.../context/web/ServletTestExecutionListener.java | 52 +-
.../test/context/web/WebAppConfiguration.java | 3 -
.../context/web/WebMergedContextConfiguration.java | 44 +-
.../context/web/WebTestContextBootstrapper.java | 22 +-
.../context/web/socket/MockServerContainer.java | 135 ++
.../MockServerContainerContextCustomizer.java | 52 +
...ockServerContainerContextCustomizerFactory.java | 73 ++
.../test/context/web/socket/package-info.java | 4 +
.../springframework/test/jdbc/JdbcTestUtils.java | 7 +-
.../springframework/test/util/AopTestUtils.java | 3 +-
.../springframework/test/util/AssertionErrors.java | 14 +-
.../test/util/JsonPathExpectationsHelper.java | 39 +-
.../test/util/MetaAnnotationUtils.java | 43 +-
.../test/util/ReflectionTestUtils.java | 71 +-
.../client/AbstractRequestExpectationManager.java | 189 +++
.../test/web/client/DefaultRequestExpectation.java | 146 +++
.../test/web/client/ExpectedCount.java | 118 ++
.../client/MockMvcClientHttpRequestFactory.java | 8 +-
.../test/web/client/MockRestServiceServer.java | 308 +++--
.../test/web/client/RequestExpectation.java | 42 +
.../test/web/client/RequestExpectationManager.java | 63 +
.../test/web/client/RequestMatcher.java | 3 +
.../client/RequestMatcherClientHttpRequest.java | 81 --
.../client/SimpleRequestExpectationManager.java | 82 ++
.../client/UnorderedRequestExpectationManager.java | 58 +
.../web/client/match/ContentRequestMatchers.java | 43 +-
.../web/client/match/MockRestRequestMatchers.java | 2 +-
.../client/response/DefaultResponseCreator.java | 17 +-
.../servlet/htmlunit/DelegatingWebConnection.java | 3 +-
.../servlet/htmlunit/MockMvcWebClientBuilder.java | 2 +-
.../web/servlet/htmlunit/MockMvcWebConnection.java | 109 +-
.../MockMvcWebConnectionBuilderSupport.java | 48 +-
.../servlet/htmlunit/MockWebResponseBuilder.java | 30 +-
.../webdriver/MockMvcHtmlUnitDriverBuilder.java | 2 +-
.../webdriver/WebConnectionHtmlUnitDriver.java | 8 +
.../request/MockHttpServletRequestBuilder.java | 119 +-
.../servlet/request/MockMvcRequestBuilders.java | 69 +-
.../web/servlet/result/HandlerResultMatchers.java | 91 +-
.../web/servlet/result/HeaderResultMatchers.java | 88 +-
.../web/servlet/result/JsonPathResultMatchers.java | 62 +-
.../web/servlet/result/MockMvcResultMatchers.java | 2 +-
.../web/servlet/result/StatusResultMatchers.java | 9 +
.../web/servlet/setup/AbstractMockMvcBuilder.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 5 +
.../mock/web/MockFilterChainTests.java | 6 +-
.../test/annotation/ProfileValueUtilsTests.java | 28 +-
.../test/context/BootstrapUtilsTests.java | 24 +-
.../context/MergedContextConfigurationTests.java | 34 +-
.../test/context/TestExecutionListenersTests.java | 13 +
.../cache/ClassLevelDirtiesContextTestNGTests.java | 36 +-
.../cache/ClassLevelDirtiesContextTests.java | 17 +-
.../test/context/cache/ContextCacheTests.java | 3 +-
.../test/context/cache/ContextCacheUtilsTests.java | 89 ++
.../test/context/cache/LruContextCacheTests.java | 177 +++
.../cache/SpringRunnerContextCacheTests.java | 3 +-
.../interfaces/ActiveProfilesInterfaceTests.java | 65 +
.../interfaces/ActiveProfilesTestInterface.java | 27 +
.../interfaces/BootstrapWithInterfaceTests.java | 43 +
.../interfaces/BootstrapWithTestInterface.java | 47 +
.../ContextConfigurationInterfaceTests.java | 45 +
.../ContextConfigurationTestInterface.java | 39 +
.../interfaces/ContextHierarchyInterfaceTests.java | 58 +
.../interfaces/ContextHierarchyTestInterface.java | 31 +
.../interfaces/DirtiesContextInterfaceTests.java | 95 ++
.../interfaces/DirtiesContextTestInterface.java | 27 +
.../interfaces/SqlConfigInterfaceTests.java | 46 +
.../interfaces/SqlConfigTestInterface.java | 32 +
.../TestPropertySourceInterfaceTests.java | 57 +
.../TestPropertySourceTestInterface.java | 27 +
.../WebAppConfigurationInterfaceTests.java | 44 +
.../WebAppConfigurationTestInterface.java | 37 +
...ridePropertiesFilesTestPropertySourceTests.java | 69 +
...TestClassWithTwoLevelContextHierarchyTests.java | 6 +-
.../jdbc/ComposedAnnotationSqlScriptsTests.java | 72 +
.../jdbc/MetaAnnotationSqlScriptsTests.java | 4 +-
.../test/context/jdbc/PrimaryDataSourceTests.java | 89 ++
.../AbstractTransactionalSpringRunnerTests.java | 4 +-
.../BeforeAndAfterTransactionAnnotationTests.java | 11 +-
.../ClassLevelDisabledSpringRunnerTests.java | 4 +-
.../ClassLevelTransactionalSpringRunnerTests.java | 4 +-
.../junit4/ContextCustomizerSpringRunnerTests.java | 66 +
...DefaultContextLoaderClassSpringRunnerTests.java | 4 +-
...kFalseRollbackAnnotationTransactionalTests.java | 4 +-
...ckTrueRollbackAnnotationTransactionalTests.java | 4 +-
.../junit4/EnabledAndIgnoredSpringRunnerTests.java | 6 +-
.../junit4/ExpectedExceptionSpringRunnerTests.java | 6 +-
.../FailingBeforeAndAfterMethodsJUnitTests.java | 10 +-
...rdCodedProfileValueSourceSpringRunnerTests.java | 4 +-
.../MethodLevelTransactionalSpringRunnerTests.java | 4 +-
...ionalContextConfigurationSpringRunnerTests.java | 58 +
...iesBasedSpringJUnit4ClassRunnerAppCtxTests.java | 6 +-
.../context/junit4/RepeatedSpringRunnerTests.java | 6 +-
.../junit4/SpringJUnit47ClassRunnerRuleTests.java | 8 +-
.../junit4/SpringJUnit4ClassRunnerAppCtxTests.java | 6 +-
.../test/context/junit4/SpringJUnit4TestSuite.java | 6 +-
.../StandardJUnit4FeaturesSpringRunnerTests.java | 6 +-
.../context/junit4/TimedSpringRunnerTests.java | 6 +-
.../TimedTransactionalSpringRunnerTests.java | 4 +-
.../context/junit4/aci/annotation/BarConfig.java | 34 +
.../context/junit4/aci/annotation/FooConfig.java | 34 +
...nitializerConfiguredViaMetaAnnotationTests.java | 92 ++
.../BootstrapTestUtilsContextInitializerTests.java | 66 +-
.../BootstrapTestUtilsMergedConfigTests.java | 33 +-
.../ContextLoaderUtilsContextHierarchyTests.java | 10 +-
.../support/DelegatingSmartContextLoaderTests.java | 13 +-
.../support/TestPropertySourceUtilsTests.java | 145 ++-
...onfigTransactionalTestNGSpringContextTests.java | 30 +-
...creteTransactionalTestNGSpringContextTests.java | 30 +-
...estExecutionListenerTestNGIntegrationTests.java | 6 +-
.../testng/web/TestNGSpringContextWebTests.java | 24 +-
.../PrimaryTransactionManagerTests.java | 122 ++
.../TransactionalTestExecutionListenerTests.java | 166 ++-
.../web/ServletTestExecutionListenerTests.java | 110 +-
.../web/WebAppConfigurationBootstrapWithTests.java | 78 ++
...cketServletServerContainerFactoryBeanTests.java | 67 +
.../test/util/MetaAnnotationUtilsTests.java | 119 +-
.../test/util/ReflectionTestUtilsTests.java | 105 +-
.../test/util/subpackage/LegacyEntity.java | 34 +-
.../util/subpackage/LegacyEntityException.java | 32 +
.../test/util/subpackage/PersistentEntity.java | 7 +-
.../test/util/subpackage/Person.java | 84 +-
.../test/util/subpackage/PersonEntity.java | 96 ++
.../web/client/DefaultRequestExpectationTests.java | 99 ++
.../client/MockClientHttpRequestFactoryTests.java | 102 --
.../web/client/MockRestServiceServerTests.java | 110 ++
.../SimpleRequestExpectationManagerTests.java | 173 +++
.../UnorderedRequestExpectationManagerTests.java | 133 ++
.../client/match/ContentRequestMatchersTests.java | 36 +-
.../client/match/MockRestRequestMatchersTests.java | 3 -
.../test/web/client/samples/SampleAsyncTests.java | 39 +-
.../test/web/client/samples/SampleTests.java | 38 +-
.../HeaderRequestMatchersIntegrationTests.java | 1 -
.../htmlunit/DelegatingWebConnectionTests.java | 3 +-
.../htmlunit/HtmlUnitRequestBuilderTests.java | 32 +-
.../MockMvcConnectionBuilderSupportTests.java | 85 +-
.../htmlunit/MockMvcWebClientBuilderTests.java | 97 +-
.../htmlunit/MockMvcWebConnectionTests.java | 3 +-
.../htmlunit/MockWebResponseBuilderTests.java | 28 +-
.../MockMvcHtmlUnitDriverBuilderTests.java | 43 +-
.../MockHttpServletRequestBuilderTests.java | 41 +-
.../result/JsonPathResultMatchersTests.java | 44 +-
.../servlet/result/StatusResultMatchersTests.java | 6 +-
.../context/AsyncControllerJavaConfigTests.java | 8 +-
.../servlet/samples/context/PersonController.java | 15 +-
.../web/servlet/samples/standalone/AsyncTests.java | 70 +-
.../samples/standalone/ViewResolutionTests.java | 11 +-
.../resultmatchers/ContentAssertionTests.java | 10 +-
.../resultmatchers/HandlerAssertionTests.java | 74 +-
.../resultmatchers/HeaderAssertionTests.java | 142 +-
.../resultmatchers/XpathAssertionTests.java | 2 +-
spring-test/src/test/resources/log4j.properties | 3 +
.../endpoint/AbstractMessageEndpointFactory.java | 2 +-
.../endpoint/GenericMessageEndpointManager.java | 2 +-
.../jca/work/WorkManagerTaskExecutor.java | 21 +-
...licationListenerMethodTransactionalAdapter.java | 15 +-
...AbstractFallbackTransactionAttributeSource.java | 50 +-
.../interceptor/DefaultTransactionAttribute.java | 2 +-
.../interceptor/RuleBasedTransactionAttribute.java | 2 +-
.../interceptor/TransactionAspectSupport.java | 34 +-
.../transaction/jta/JtaTransactionManager.java | 16 +
.../transaction/jta/JtaTransactionObject.java | 4 +-
.../support/DefaultTransactionDefinition.java | 2 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../transaction/config/spring-tx-4.3.xsd | 247 ++++
...enceExceptionTranslationPostProcessorTests.java | 5 +-
.../AnnotationTransactionAttributeSourceTests.java | 94 +-
.../EnableTransactionManagementTests.java | 1 +
.../transaction/config/AnnotationDrivenTests.java | 12 +-
.../transaction/config/NoSynch.java | 31 +
.../config/NoSynchTransactionManager.java | 32 +
.../config/SynchTransactionManager.java | 29 +
.../config/TransactionManagerConfiguration.java | 4 +-
...ionListenerMethodTransactionalAdapterTests.java | 20 +-
.../org/springframework/http/CacheControl.java | 45 +-
.../java/org/springframework/http/HttpHeaders.java | 238 +++-
.../java/org/springframework/http/HttpMethod.java | 2 +-
.../java/org/springframework/http/HttpRange.java | 49 +-
.../java/org/springframework/http/HttpStatus.java | 38 +-
.../java/org/springframework/http/MediaType.java | 87 +-
.../org/springframework/http/RequestEntity.java | 74 +-
.../org/springframework/http/ResponseEntity.java | 102 +-
.../client/AsyncClientHttpRequestExecution.java | 47 +
.../client/AsyncClientHttpRequestInterceptor.java | 71 +
.../http/client/ClientHttpRequestExecution.java | 13 +-
.../HttpComponentsClientHttpRequestFactory.java | 21 +-
.../client/InterceptingAsyncClientHttpRequest.java | 117 ++
.../InterceptingAsyncClientHttpRequestFactory.java | 59 +
.../http/client/Netty4ClientHttpResponse.java | 2 +
.../http/client/OkHttp3AsyncClientHttpRequest.java | 102 ++
.../http/client/OkHttp3ClientHttpRequest.java | 71 +
.../client/OkHttp3ClientHttpRequestFactory.java | 155 +++
.../http/client/OkHttp3ClientHttpResponse.java | 82 ++
.../http/client/OkHttpAsyncClientHttpRequest.java | 102 ++
.../http/client/OkHttpClientHttpRequest.java | 89 +-
.../client/OkHttpClientHttpRequestFactory.java | 48 +-
.../http/client/OkHttpClientHttpResponse.java | 3 +-
.../SimpleBufferingAsyncClientHttpRequest.java | 6 +-
.../client/SimpleBufferingClientHttpRequest.java | 9 +-
.../http/client/SimpleClientHttpResponse.java | 17 +-
.../SimpleStreamingAsyncClientHttpRequest.java | 4 +-
.../client/SimpleStreamingClientHttpRequest.java | 4 +-
.../support/BasicAuthorizationInterceptor.java | 66 +
.../support/InterceptingAsyncHttpAccessor.java | 68 +
.../converter/AbstractHttpMessageConverter.java | 41 +-
.../http/converter/FormHttpMessageConverter.java | 78 +-
.../ObjectToStringHttpMessageConverter.java | 2 +-
.../converter/ResourceHttpMessageConverter.java | 42 +-
.../ResourceRegionHttpMessageConverter.java | 190 +++
.../http/converter/StringHttpMessageConverter.java | 14 +-
.../feed/AbstractWireFeedHttpMessageConverter.java | 2 +-
.../json/AbstractJackson2HttpMessageConverter.java | 126 +-
.../converter/json/GsonHttpMessageConverter.java | 7 +-
.../json/Jackson2ObjectMapperBuilder.java | 94 +-
.../json/Jackson2ObjectMapperFactoryBean.java | 27 +-
.../json/MappingJackson2HttpMessageConverter.java | 5 +-
.../converter/json/SpringHandlerInstantiator.java | 47 +
.../protobuf/ProtobufHttpMessageConverter.java | 36 +-
.../xml/Jaxb2RootElementHttpMessageConverter.java | 6 +-
.../MappingJackson2XmlHttpMessageConverter.java | 8 +-
.../converter/xml/SourceHttpMessageConverter.java | 17 +-
.../http/server/ServletServerHttpRequest.java | 2 +-
.../http/server/ServletServerHttpResponse.java | 7 +-
.../HttpComponentsHttpInvokerRequestExecutor.java | 22 +-
.../httpinvoker/HttpInvokerServiceExporter.java | 28 +-
.../remoting/jaxws/SimpleJaxWsServiceExporter.java | 6 +-
.../web/HttpSessionRequiredException.java | 25 +-
.../web/accept/ContentNegotiationManager.java | 16 +
.../accept/HeaderContentNegotiationStrategy.java | 15 +-
.../PathExtensionContentNegotiationStrategy.java | 72 +-
...letPathExtensionContentNegotiationStrategy.java | 26 +
.../springframework/web/bind/WebDataBinder.java | 48 +-
.../web/bind/annotation/CrossOrigin.java | 10 +-
.../web/bind/annotation/DeleteMapping.java | 90 ++
.../web/bind/annotation/GetMapping.java | 88 ++
.../web/bind/annotation/ModelAttribute.java | 24 +-
.../web/bind/annotation/PatchMapping.java | 90 ++
.../web/bind/annotation/PostMapping.java | 90 ++
.../web/bind/annotation/PutMapping.java | 90 ++
.../web/bind/annotation/RequestAttribute.java | 66 +
.../web/bind/annotation/RequestMapping.java | 16 +-
.../web/bind/annotation/ResponseStatus.java | 6 +-
.../web/bind/annotation/RestController.java | 14 +-
.../web/bind/annotation/RestControllerAdvice.java | 103 ++
.../web/bind/annotation/SessionAttribute.java | 74 ++
.../support/HandlerMethodInvocationException.java | 2 +
.../annotation/support/HandlerMethodInvoker.java | 2 +
.../annotation/support/HandlerMethodResolver.java | 2 +
.../web/bind/support/WebRequestDataBinder.java | 7 +-
.../web/client/AsyncRestTemplate.java | 173 +--
.../web/client/DefaultResponseErrorHandler.java | 2 +-
.../web/client/HttpMessageConverterExtractor.java | 2 +-
.../web/client/HttpStatusCodeException.java | 79 +-
.../web/client/RestClientResponseException.java | 109 ++
.../springframework/web/client/RestTemplate.java | 65 +-
.../web/client/UnknownHttpStatusCodeException.java | 69 +-
.../web/context/annotation/ApplicationScope.java | 64 +
.../web/context/annotation/RequestScope.java | 64 +
.../web/context/annotation/SessionScope.java | 64 +
.../web/context/annotation/package-info.java | 4 +
.../context/request/FacesRequestAttributes.java | 14 +-
.../context/request/ServletRequestAttributes.java | 52 +-
.../web/context/request/ServletWebRequest.java | 123 +-
.../web/context/request/WebRequest.java | 40 +-
.../async/DeferredResultProcessingInterceptor.java | 2 +-
.../async/StandardServletAsyncWebRequest.java | 2 +-
.../web/context/request/async/WebAsyncManager.java | 3 +-
.../context/support/ServletContextResource.java | 4 +-
.../web/cors/CorsConfiguration.java | 3 +-
.../web/filter/AbstractRequestLoggingFilter.java | 25 +
.../web/filter/CharacterEncodingFilter.java | 92 +-
.../web/filter/ForwardedHeaderFilter.java | 225 ++++
.../web/filter/ShallowEtagHeaderFilter.java | 44 +-
.../web/method/ControllerAdviceBean.java | 7 +-
.../springframework/web/method/HandlerMethod.java | 47 +-
.../web/method/HandlerMethodSelector.java | 2 +-
.../AbstractCookieValueMethodArgumentResolver.java | 4 +-
.../AbstractNamedValueMethodArgumentResolver.java | 78 +-
.../annotation/ExceptionHandlerMethodResolver.java | 20 +-
.../annotation/ModelAttributeMethodProcessor.java | 67 +-
.../web/method/annotation/ModelFactory.java | 12 +-
.../RequestHeaderMethodArgumentResolver.java | 4 +-
.../RequestParamMethodArgumentResolver.java | 142 +-
.../annotation/SessionAttributesHandler.java | 11 +-
.../HandlerMethodArgumentResolverComposite.java | 22 +
.../web/method/support/ModelAndViewContainer.java | 47 +-
.../commons/CommonsFileUploadSupport.java | 2 +-
.../web/multipart/support/MultipartFilter.java | 6 +-
.../support/MultipartResolutionDelegate.java | 199 +++
.../RequestPartServletServerHttpRequest.java | 30 +-
.../web/util/AbstractUriTemplateHandler.java | 138 ++
.../web/util/ContentCachingResponseWrapper.java | 2 +-
.../web/util/DefaultUriTemplateHandler.java | 148 ++-
.../web/util/HierarchicalUriComponents.java | 21 +
.../org/springframework/web/util/HtmlUtils.java | 9 +-
.../org/springframework/web/util/UriTemplate.java | 2 +-
.../web/util/UriTemplateHandler.java | 20 +-
.../org/springframework/web/util/UriUtils.java | 27 +-
.../springframework/web/util/UrlPathHelper.java | 10 +-
.../org/springframework/web/util/WebUtils.java | 14 +-
.../springframework/http/CacheControlTests.java | 15 +-
.../org/springframework/http/HttpHeadersTests.java | 74 +-
.../org/springframework/http/HttpRangeTests.java | 47 +-
.../org/springframework/http/HttpStatusTests.java | 3 +-
.../org/springframework/http/MediaTypeTests.java | 4 +-
.../springframework/http/RequestEntityTests.java | 15 +-
.../springframework/http/ResponseEntityTests.java | 20 +-
.../BufferedSimpleHttpRequestFactoryTests.java | 15 +-
.../OkHttp3AsyncClientHttpRequestFactoryTests.java | 40 +
.../OkHttp3ClientHttpRequestFactoryTests.java | 40 +
.../OkHttpAsyncClientHttpRequestFactoryTests.java | 2 +-
.../http/client/SimpleClientHttpResponseTests.java | 128 ++
.../BasicAuthorizationInterceptorTests.java | 78 ++
.../converter/FormHttpMessageConverterTests.java | 2 +-
.../ResourceHttpMessageConverterTests.java | 67 +-
.../ResourceRegionHttpMessageConverterTests.java | 142 ++
.../converter/StringHttpMessageConverterTests.java | 87 +-
.../feed/AtomFeedHttpMessageConverterTests.java | 16 +-
.../feed/RssChannelHttpMessageConverterTests.java | 17 +-
.../json/Jackson2ObjectMapperBuilderTests.java | 57 +-
.../json/Jackson2ObjectMapperFactoryBeanTests.java | 4 +-
.../json/SpringHandlerInstantiatorTests.java | 12 +-
.../server/ServletServerHttpResponseTests.java | 13 +-
.../mock/web/test/MockHttpServletRequest.java | 4 +-
.../mock/web/test/MockHttpServletResponse.java | 4 +-
.../mock/web/test/MockServletContext.java | 11 +-
.../remoting/jaxws/JaxWsSupportTests.java | 6 +-
.../ContentNegotiationManagerFactoryBeanTests.java | 18 +-
.../HeaderContentNegotiationStrategyTests.java | 32 +-
.../bind/support/WebRequestDataBinderTests.java | 34 +-
.../client/AsyncRestTemplateIntegrationTests.java | 188 ++-
.../web/client/RestTemplateIntegrationTests.java | 70 +-
.../web/client/RestTemplateTests.java | 37 +-
.../request/ServletRequestAttributesTests.java | 16 +-
.../request/ServletWebRequestHttpMethodsTests.java | 47 +-
.../web/context/request/SessionScopeTests.java | 10 +
.../async/StandardServletAsyncWebRequestTests.java | 2 +-
.../request/async/WebAsyncManagerTests.java | 16 +-
.../web/context/support/Spr8510Tests.java | 15 +-
.../web/cors/CorsConfigurationTests.java | 6 +-
.../web/cors/DefaultCorsProcessorTests.java | 4 +-
.../web/filter/CharacterEncodingFilterTests.java | 24 +-
.../web/filter/ForwardedHeaderFilterTests.java | 241 ++++
.../web/filter/ShallowEtagHeaderFilterTests.java | 43 +-
.../ModelAttributeMethodProcessorTests.java | 198 +--
.../web/method/annotation/ModelFactoryTests.java | 180 +--
.../RequestHeaderMethodArgumentResolverTests.java | 121 +-
.../RequestParamMethodArgumentResolverTests.java | 105 +-
.../web/util/DefaultUriTemplateHandlerTests.java | 115 +-
.../web/util/Log4jWebConfigurerTests.java | 6 +-
.../springframework/web/util/UriTemplateTests.java | 74 +-
.../springframework/web/util/UriUtilsTests.java | 21 +-
.../http/converter/byterangeresource.txt | 1 +
.../web/util/HtmlCharacterEntityReferences.dtd | 10 +-
.../portlet/context/PortletContextResource.java | 2 +-
.../portlet/context/PortletRequestAttributes.java | 73 +-
.../context/PortletRequestHandledEvent.java | 2 +-
.../handler/SimplePortletPostProcessor.java | 38 +-
.../web/portlet/mvc/PortletWrappingController.java | 11 +-
.../annotation/AnnotationMethodHandlerAdapter.java | 14 +-
.../web/portlet/ServletWrappingPortletContext.java | 7 +-
.../context/PortletRequestAttributesTests.java | 31 +-
.../context/XmlPortletApplicationContextTests.java | 2 +-
.../mvc/PortletWrappingControllerTests.java | 6 +-
.../web/portlet/util/PortletUtilsTests.java | 5 +-
.../view/tiles2/AbstractSpringPreparerFactory.java | 5 +-
.../view/tiles2/SimpleSpringPreparerFactory.java | 5 +-
.../view/tiles2/SpringBeanPreparerFactory.java | 5 +-
.../servlet/view/tiles2/SpringLocaleResolver.java | 3 +
...ringWildcardServletTilesApplicationContext.java | 3 +
.../web/servlet/view/tiles2/TilesConfigurer.java | 3 +
.../web/servlet/view/tiles2/TilesView.java | 5 +-
.../web/servlet/view/tiles2/TilesViewResolver.java | 3 +
.../web/servlet/view/tiles2/package-info.java | 5 +-
.../src/test/resources/jasperreports.properties | 1 -
.../web/servlet/DispatcherServlet.java | 23 +-
.../web/servlet/FrameworkServlet.java | 11 +-
.../web/servlet/HandlerInterceptor.java | 8 +-
.../web/servlet/LocaleResolver.java | 10 +-
.../springframework/web/servlet/ModelAndView.java | 41 +-
.../AnnotationDrivenBeanDefinitionParser.java | 9 +-
.../web/servlet/config/MvcNamespaceUtils.java | 19 +
.../config/ResourcesBeanDefinitionParser.java | 24 +-
.../config/ViewResolversBeanDefinitionParser.java | 22 +-
.../annotation/ResourceChainRegistration.java | 11 +-
.../config/annotation/ResourceHandlerRegistry.java | 10 +
.../config/annotation/ViewResolverRegistry.java | 30 +-
.../annotation/WebMvcConfigurationSupport.java | 107 +-
.../config/annotation/WebMvcConfigurer.java | 12 +-
.../config/annotation/WebMvcConfigurerAdapter.java | 8 +
.../annotation/WebMvcConfigurerComposite.java | 11 +-
.../handler/AbstractHandlerExceptionResolver.java | 13 +-
.../servlet/handler/AbstractHandlerMapping.java | 28 +-
.../handler/AbstractHandlerMethodMapping.java | 13 +-
.../servlet/handler/AbstractUrlHandlerMapping.java | 27 +-
.../servlet/handler/BeanNameUrlHandlerMapping.java | 8 +-
.../servlet/handler/HandlerInterceptorAdapter.java | 7 +-
.../handler/HandlerMappingIntrospector.java | 187 +++
.../servlet/handler/MatchableHandlerMapping.java | 42 +
.../web/servlet/handler/RequestMatchResult.java | 67 +
.../handler/SimpleMappingExceptionResolver.java | 5 +-
.../handler/SimpleServletPostProcessor.java | 10 +-
.../servlet/i18n/AcceptHeaderLocaleResolver.java | 81 +-
.../web/servlet/i18n/CookieLocaleResolver.java | 60 +-
.../web/servlet/i18n/LocaleChangeInterceptor.java | 43 +-
.../web/servlet/mvc/AbstractController.java | 29 +-
.../servlet/mvc/ParameterizableViewController.java | 6 +
.../servlet/mvc/ServletForwardingController.java | 7 +-
.../web/servlet/mvc/ServletWrappingController.java | 25 +-
.../web/servlet/mvc/WebContentInterceptor.java | 3 +-
.../annotation/AnnotationMethodHandlerAdapter.java | 25 +-
.../annotation/ServletAnnotationMappingUtils.java | 8 +-
.../mvc/condition/AbstractMediaTypeExpression.java | 20 +-
.../mvc/condition/AbstractRequestCondition.java | 2 +-
.../mvc/condition/ConsumesRequestCondition.java | 38 +-
.../mvc/condition/HeadersRequestCondition.java | 9 +-
.../mvc/condition/ProducesRequestCondition.java | 40 +-
.../servlet/mvc/condition/RequestCondition.java | 35 +-
.../condition/RequestMethodsRequestCondition.java | 78 +-
.../web/servlet/mvc/method/RequestMappingInfo.java | 89 +-
.../method/RequestMappingInfoHandlerMapping.java | 330 +++--
.../AbstractMessageConverterMethodProcessor.java | 53 +-
.../CompletionStageReturnValueHandler.java | 5 +-
.../method/annotation/DeferredResultAdapter.java | 36 +
.../DeferredResultMethodReturnValueHandler.java | 125 +-
.../ExceptionHandlerExceptionResolver.java | 15 +-
.../annotation/HttpEntityMethodProcessor.java | 48 +-
.../annotation/JsonViewResponseBodyAdvice.java | 4 +-
.../ListenableFutureReturnValueHandler.java | 5 +-
.../MatrixVariableMapMethodArgumentResolver.java | 36 +-
.../MatrixVariableMethodArgumentResolver.java | 6 +-
.../ModelAndViewMethodReturnValueHandler.java | 3 +-
.../method/annotation/MvcUriComponentsBuilder.java | 23 +-
.../PathVariableMethodArgumentResolver.java | 4 +-
.../RequestAttributeMethodArgumentResolver.java | 59 +
.../annotation/RequestMappingHandlerAdapter.java | 91 +-
.../annotation/RequestMappingHandlerMapping.java | 45 +-
.../RequestPartMethodArgumentResolver.java | 159 +--
.../RequestResponseBodyMethodProcessor.java | 20 +-
.../annotation/ResponseBodyEmitterAdapter.java | 39 +
.../ResponseBodyEmitterReturnValueHandler.java | 81 +-
.../annotation/ResponseEntityExceptionHandler.java | 12 +-
.../ServletCookieValueMethodArgumentResolver.java | 4 +-
.../annotation/ServletInvocableHandlerMethod.java | 23 +
.../SessionAttributeMethodArgumentResolver.java | 59 +
.../servlet/mvc/method/annotation/SseEmitter.java | 6 +-
.../StreamingResponseBodyReturnValueHandler.java | 12 +-
.../multiaction/AbstractUrlMethodNameResolver.java | 2 +
.../InternalPathMethodNameResolver.java | 6 +-
.../mvc/multiaction/MethodNameResolver.java | 2 +
.../mvc/multiaction/MultiActionController.java | 2 +
.../NoSuchRequestHandlingMethodException.java | 2 +
.../multiaction/ParameterMethodNameResolver.java | 2 +
.../multiaction/PropertiesMethodNameResolver.java | 2 +
.../AbstractControllerUrlHandlerMapping.java | 2 +
.../support/AnnotationControllerTypePredicate.java | 2 +
.../support/ControllerBeanNameHandlerMapping.java | 2 +
.../support/ControllerClassNameHandlerMapping.java | 7 +-
.../mvc/support/ControllerTypePredicate.java | 6 +-
.../support/DefaultHandlerExceptionResolver.java | 12 +-
.../resource/CssLinkResourceTransformer.java | 21 +-
.../resource/ResourceHttpRequestHandler.java | 456 ++++---
.../web/servlet/resource/ResourceTransformer.java | 6 +-
.../resource/ResourceUrlEncodingFilter.java | 8 +-
.../web/servlet/resource/ResourceUrlProvider.java | 26 +-
.../servlet/resource/WebJarsResourceResolver.java | 24 +-
...notationConfigDispatcherServletInitializer.java | 5 +-
.../web/servlet/support/RequestContext.java | 17 +-
.../web/servlet/support/RequestContextUtils.java | 2 +-
.../support/ServletUriComponentsBuilder.java | 18 +-
.../web/servlet/support/WebContentGenerator.java | 109 +-
.../web/servlet/tags/form/CheckboxTag.java | 2 +-
.../web/servlet/tags/form/FormTag.java | 6 +-
.../view/DefaultRequestToViewNameTranslator.java | 26 +-
.../servlet/view/InternalResourceViewResolver.java | 13 +
.../web/servlet/view/RedirectView.java | 62 +-
.../web/servlet/view/UrlBasedViewResolver.java | 28 +-
.../servlet/view/freemarker/FreeMarkerView.java | 10 +-
.../view/freemarker/FreeMarkerViewResolver.java | 18 +
.../web/servlet/view/groovy/GroovyMarkupView.java | 2 +-
.../view/groovy/GroovyMarkupViewResolver.java | 18 +
.../JasperReportsMultiFormatView.java | 2 +-
.../servlet/view/json/AbstractJackson2View.java | 2 +-
.../servlet/view/json/MappingJackson2JsonView.java | 2 +-
.../servlet/view/script/ScriptTemplateView.java | 62 +-
.../view/script/ScriptTemplateViewResolver.java | 18 +
.../view/tiles3/AbstractSpringPreparerFactory.java | 2 +-
.../view/tiles3/SimpleSpringPreparerFactory.java | 2 +-
.../view/tiles3/SpringBeanPreparerFactory.java | 2 +-
.../web/servlet/view/tiles3/package-info.java | 2 +-
.../web/servlet/view/velocity/VelocityConfig.java | 2 +
.../servlet/view/velocity/VelocityConfigurer.java | 5 +-
.../servlet/view/velocity/VelocityLayoutView.java | 2 +
.../view/velocity/VelocityLayoutViewResolver.java | 2 +
.../servlet/view/velocity/VelocityToolboxView.java | 2 +
.../web/servlet/view/velocity/VelocityView.java | 2 +
.../view/velocity/VelocityViewResolver.java | 2 +
.../servlet/view/xml/MappingJackson2XmlView.java | 4 +-
.../web/servlet/view/xslt/XsltView.java | 11 +-
.../src/main/resources/META-INF/spring-form.tld | 5 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../web/servlet/config/spring-mvc-4.3.xsd | 1374 ++++++++++++++++++++
.../web/servlet/DispatcherServletTests.java | 3 +-
.../AnnotationDrivenBeanDefinitionParserTests.java | 63 +-
.../web/servlet/config/MvcNamespaceTests.java | 27 +-
.../annotation/InterceptorRegistryTests.java | 2 +-
.../annotation/ResourceHandlerRegistryTests.java | 7 +-
.../annotation/ViewResolutionIntegrationTests.java | 4 +-
.../annotation/ViewResolverRegistryTests.java | 4 +-
.../WebMvcConfigurationSupportExtensionTests.java | 76 +-
.../WebMvcConfigurationSupportTests.java | 141 +-
.../handler/HandlerMappingIntrospectorTests.java | 188 +++
.../servlet/handler/MappedInterceptorTests.java | 9 +-
.../PathMatchingUrlHandlerMappingTests.java | 2 +-
.../i18n/AcceptHeaderLocaleResolverTests.java | 78 ++
.../servlet/i18n/CookieLocaleResolverTests.java | 54 +-
.../mvc/ParameterizableViewControllerTests.java | 13 +-
.../ResponseStatusExceptionResolverTests.java | 8 +-
.../ServletAnnotationControllerTests.java | 17 +-
...riTemplateServletAnnotationControllerTests.java | 21 +-
.../condition/ProducesRequestConditionTests.java | 14 +-
.../RequestMethodsRequestConditionTests.java | 118 +-
.../RequestMappingInfoHandlerMappingTests.java | 313 +++--
.../mvc/method/RequestMappingInfoTests.java | 253 ++--
...ractRequestAttributesArgumentResolverTests.java | 182 +++
.../mvc/method/annotation/CrossOriginTests.java | 90 +-
.../DeferredResultReturnValueHandlerTests.java | 197 +++
.../ExceptionHandlerExceptionResolverTests.java | 75 +-
.../HttpEntityMethodProcessorMockTests.java | 228 ++--
.../annotation/HttpEntityMethodProcessorTests.java | 53 +-
...rixVariablesMapMethodArgumentResolverTests.java | 6 +-
.../annotation/MvcUriComponentsBuilderTests.java | 35 +-
...equestAttributeMethodArgumentResolverTests.java | 45 +
...questMappingHandlerAdapterIntegrationTests.java | 69 +-
.../RequestMappingHandlerMappingTests.java | 88 +-
.../RequestPartMethodArgumentResolverTests.java | 192 ++-
...equestResponseBodyMethodProcessorMockTests.java | 93 +-
.../RequestResponseBodyMethodProcessorTests.java | 210 ++-
...ResponseBodyEmitterReturnValueHandlerTests.java | 63 +-
...vletAnnotationControllerHandlerMethodTests.java | 178 ++-
.../ServletInvocableHandlerMethodTests.java | 9 +
...essionAttributeMethodArgumentResolverTests.java | 45 +
...reamingResponseBodyReturnValueHandlerTests.java | 40 +-
.../DefaultHandlerExceptionResolverTests.java | 1 +
.../resource/ResourceHttpRequestHandlerTests.java | 207 ++-
.../servlet/resource/ResourceUrlProviderTests.java | 65 +-
.../resource/VersionResourceResolverTests.java | 8 +-
.../resource/WebJarsResourceResolverTests.java | 26 +-
.../web/servlet/support/FlashMapManagerTests.java | 2 +-
.../servlet/support/WebContentGeneratorTests.java | 132 ++
.../web/servlet/tags/form/OptionTagTests.java | 6 +-
.../servlet/tags/form/PasswordInputTagTests.java | 3 +-
.../web/servlet/view/RedirectViewTests.java | 203 ++-
.../view/freemarker/FreeMarkerViewTests.java | 4 +-
.../JasperReportsMultiFormatViewTests.java | 10 +-
.../view/json/MappingJackson2JsonViewTests.java | 33 +-
.../view/script/ScriptTemplateViewTests.java | 58 +-
.../web/servlet/config/mvc-config-resources.xml | 1 +
.../config/mvc-config-view-controllers-minimal.xml | 7 +-
.../servlet/config/mvc-config-view-controllers.xml | 7 +-
...-config-view-resolution-content-negotiation.xml | 37 +-
.../mvc-config-view-resolution-custom-order.xml | 8 +-
.../servlet/config/mvc-config-view-resolution.xml | 17 +-
.../web/socket/WebSocketHttpHeaders.java | 2 +-
.../adapter/jetty/JettyWebSocketSession.java | 21 +-
.../client/standard/StandardWebSocketClient.java | 4 +-
.../config/MessageBrokerBeanDefinitionParser.java | 32 +-
.../annotation/EnableWebSocketMessageBroker.java | 4 +-
.../annotation/WebMvcStompEndpointRegistry.java | 19 +-
.../WebMvcStompWebSocketEndpointRegistration.java | 2 +-
.../ConcurrentWebSocketSessionDecorator.java | 70 +-
.../socket/messaging/DefaultSimpUserRegistry.java | 134 +-
.../web/socket/messaging/SessionConnectEvent.java | 2 +-
.../WebSocketAnnotationMethodMessageHandler.java | 26 +-
.../standard/AbstractStandardUpgradeStrategy.java | 18 +-
.../AbstractTyrusRequestUpgradeStrategy.java | 8 +-
.../ServletServerContainerFactoryBean.java | 13 +-
.../standard/UndertowRequestUpgradeStrategy.java | 369 +++---
.../standard/WebLogicRequestUpgradeStrategy.java | 3 +-
.../server/support/AbstractHandshakeHandler.java | 18 +-
.../socket/sockjs/client/AbstractXhrTransport.java | 9 +-
.../socket/sockjs/client/UndertowXhrTransport.java | 8 +-
.../sockjs/frame/Jackson2SockJsMessageCodec.java | 4 +-
.../session/AbstractHttpSockJsSession.java | 16 +-
.../transport/session/PollingSockJsSession.java | 1 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../web/socket/config/spring-websocket-4.0.xsd | 2 +-
.../web/socket/config/spring-websocket-4.1.xsd | 2 +-
.../web/socket/config/spring-websocket-4.2.xsd | 2 +-
.../web/socket/config/spring-websocket-4.3.xsd | 931 +++++++++++++
.../web/socket/config/spring-websocket.gif | Bin 0 -> 1025 bytes
.../socket/AbstractWebSocketIntegrationTests.java | 13 +-
.../web/socket/ContextLoaderTestUtils.java | 3 +-
.../web/socket/WebSocketHandshakeTests.java | 158 +++
.../web/socket/WebSocketIntegrationTests.java | 161 ---
.../adapter/jetty/JettyWebSocketSessionTests.java | 20 +-
.../standard/StandardWebSocketSessionTests.java | 22 +-
.../MessageBrokerBeanDefinitionParserTests.java | 22 +-
.../annotation/WebSocketConfigurationTests.java | 4 +-
.../ConcurrentWebSocketSessionDecoratorTests.java | 82 +-
.../client/RestTemplateXhrTransportTests.java | 2 +-
.../handler/HttpSendingTransportHandlerTests.java | 4 +-
.../websocket-config-broker-customchannels.xml | 4 +-
src/asciidoc/appendix.adoc | 4 +-
src/asciidoc/appx-spring-form-tld.adoc | 5 -
src/asciidoc/core-aop.adoc | 62 +-
src/asciidoc/core-beans.adoc | 247 +++-
src/asciidoc/core-expressions.adoc | 25 +-
src/asciidoc/core-resources.adoc | 2 +-
src/asciidoc/core-validation.adoc | 4 +-
src/asciidoc/data-access.adoc | 31 +-
src/asciidoc/index-docinfo.xml | 2 +-
src/asciidoc/integration.adoc | 88 +-
src/asciidoc/overview.adoc | 4 +-
src/asciidoc/testing.adoc | 930 +++++++------
src/asciidoc/web-cors.adoc | 42 +-
src/asciidoc/web-mvc.adoc | 494 ++++---
src/asciidoc/web-portlet.adoc | 10 +-
src/asciidoc/web-view.adoc | 27 +-
src/asciidoc/web-websocket.adoc | 76 +-
src/asciidoc/web.adoc | 2 +-
src/asciidoc/whats-new.adoc | 128 +-
src/eclipse/org.eclipse.jdt.ui.prefs | 2 +-
...BeanDefinitionScannerScopeIntegrationTests.java | 89 +-
...AndTransactionalAnnotationIntegrationTests.java | 2 +-
...nableTransactionManagementIntegrationTests.java | 3 +-
1404 files changed, 47807 insertions(+), 14089 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list