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 2abef5ee0e3c25a6933c9a1e3b2cd1bb3bb3dde4 Merge: 722b933 3b27273 Author: Emmanuel Bourg <[email protected]> Date: Thu May 11 16:57:50 2017 +0200 Merge tag 'upstream/4.3.6' Upstream version 4.3.6 build.gradle | 53 +- gradle.properties | 2 +- .../aop/aspectj/AspectJExpressionPointcut.java | 17 +- .../aspectj/AspectJExpressionPointcutAdvisor.java | 27 +- .../annotation/AbstractAspectJAdvisorFactory.java | 46 +- .../AnnotationAwareAspectJAutoProxyCreator.java | 8 +- .../aspectj/annotation/AspectJProxyFactory.java | 44 +- .../aop/aspectj/annotation/AspectMetadata.java | 21 +- .../BeanFactoryAspectJAdvisorsBuilder.java | 99 +-- .../ReflectiveAspectJAdvisorFactory.java | 32 +- .../autoproxy/AbstractAutoProxyCreator.java | 49 +- .../autoproxy/DefaultAdvisorAutoProxyCreator.java | 29 +- .../aop/support/ControlFlowPointcut.java | 29 +- .../aop/scope/ScopedProxyAutowireTests.java | 14 +- .../aop/config/TopLevelAopTagTests-context.xml | 6 +- ...copedProxyAutowireTests-scopedAutowireFalse.xml | 18 +- ...ScopedProxyAutowireTests-scopedAutowireTrue.xml | 18 +- .../factory/groovy/GroovyBeanDefinitionReader.java | 20 +- .../beans/AbstractNestablePropertyAccessor.java | 341 +++++----- .../beans/PropertyAccessException.java | 14 +- .../springframework/beans/factory/FactoryBean.java | 47 +- .../beans/factory/config/BeanDefinition.java | 114 ++-- .../beans/factory/config/DependencyDescriptor.java | 33 +- .../beans/factory/config/ListFactoryBean.java | 6 +- .../beans/factory/config/MapFactoryBean.java | 9 +- .../beans/factory/config/SetFactoryBean.java | 6 +- .../AbstractAutowireCapableBeanFactory.java | 91 ++- .../factory/support/AbstractBeanDefinition.java | 168 +++-- .../beans/factory/support/AbstractBeanFactory.java | 258 ++++---- .../factory/support/BeanDefinitionBuilder.java | 16 +- .../beans/factory/support/ChildBeanDefinition.java | 9 +- .../support/DefaultListableBeanFactory.java | 32 +- .../factory/support/GenericBeanDefinition.java | 5 +- .../support/MergedBeanDefinitionPostProcessor.java | 18 +- .../beans/factory/support/RootBeanDefinition.java | 4 +- .../AutowiredAnnotationBeanPostProcessorTests.java | 398 +++++++++++- .../cache/concurrent/ConcurrentMapCache.java | 13 +- .../org/springframework/context/MessageSource.java | 18 +- .../AnnotationConfigApplicationContext.java | 2 +- .../context/annotation/AutoProxyRegistrar.java | 3 + .../annotation/ClassPathBeanDefinitionScanner.java | 41 +- ...lassPathScanningCandidateComponentProvider.java | 165 ++--- .../annotation/ComponentScanAnnotationParser.java | 6 +- .../ComponentScanBeanDefinitionParser.java | 9 +- .../context/annotation/Configuration.java | 13 +- .../annotation/ConfigurationClassEnhancer.java | 13 +- .../annotation/ConfigurationClassParser.java | 46 +- .../ConfigurationClassPostProcessor.java | 5 - .../event/SimpleApplicationEventMulticaster.java | 11 +- .../context/support/AbstractMessageSource.java | 68 +- .../support/GenericXmlApplicationContext.java | 10 +- .../context/support/MessageSourceSupport.java | 16 +- .../format/datetime/DateFormatter.java | 7 +- .../format/datetime/DateFormatterRegistrar.java | 17 +- .../DateTimeFormatAnnotationFormatterFactory.java | 4 +- .../jmx/access/MBeanClientInterceptor.java | 10 +- .../ScheduledAnnotationBeanPostProcessor.java | 59 +- .../beanvalidation/SpringValidatorAdapter.java | 4 +- .../java/example/profilescan/DevComponent.java | 4 +- .../profilescan/ProfileAnnotatedComponent.java | 17 + .../profilescan/ProfileMetaAnnotatedComponent.java | 5 +- ...otatedComponent.java => SomeAbstractClass.java} | 11 +- .../java/example/scannable/FooServiceImpl.java | 15 +- .../ClassPathBeanDefinitionScannerTests.java | 47 +- .../ConfigurationClassPostProcessorTests.java | 160 ++++- .../annotation/EnableAspectJAutoProxyTests.java | 9 +- .../context/annotation/Spr15042Tests.java | 61 ++ .../annotation/EnableSchedulingTests.java | 10 +- .../SpringValidatorAdapterTests.java | 47 +- .../org/springframework/asm/AnnotationVisitor.java | 2 +- .../java/org/springframework/asm/ClassReader.java | 73 ++- .../java/org/springframework/asm/ClassWriter.java | 73 ++- .../java/org/springframework/asm/CurrentFrame.java | 56 ++ .../main/java/org/springframework/asm/Frame.java | 114 +++- .../main/java/org/springframework/asm/Item.java | 3 +- .../main/java/org/springframework/asm/Label.java | 5 +- .../org/springframework/asm/MethodVisitor.java | 19 +- .../java/org/springframework/asm/MethodWriter.java | 692 +++------------------ .../main/java/org/springframework/asm/Opcodes.java | 18 +- .../main/java/org/springframework/asm/Type.java | 89 +-- .../springframework/core/CollectionFactory.java | 6 +- .../java/org/springframework/core/ControlFlow.java | 4 +- .../springframework/core/ControlFlowFactory.java | 16 +- .../java/org/springframework/core/Conventions.java | 10 +- .../java/org/springframework/core/ErrorCoded.java | 4 +- .../core/GenericCollectionTypeResolver.java | 4 +- .../springframework/core/GenericTypeResolver.java | 3 +- .../LocalVariableTableParameterNameDiscoverer.java | 2 +- .../org/springframework/core/MethodParameter.java | 3 +- .../core/PrioritizedParameterNameDiscoverer.java | 15 +- .../org/springframework/core/ResolvableType.java | 26 +- .../StandardReflectionParameterNameDiscoverer.java | 3 +- .../core/convert/TypeDescriptor.java | 7 +- .../convert/converter/ConvertingComparator.java | 6 +- .../classreading/CachingMetadataReaderFactory.java | 6 +- .../util/InvalidMimeTypeException.java | 5 +- .../util/LinkedCaseInsensitiveMap.java | 139 ++++- .../springframework/util/LinkedMultiValueMap.java | 27 +- .../org/springframework/util/MimeTypeUtils.java | 25 +- .../java/org/springframework/util/StringUtils.java | 23 +- .../springframework/util/WeakReferenceMonitor.java | 4 +- .../util/comparator/CompoundComparator.java | 6 +- .../org/springframework/core/ControlFlowTests.java | 6 +- .../core/GenericCollectionTypeResolverTests.java | 54 +- .../util/LinkedCaseInsensitiveMapTests.java | 35 +- .../metadata/GenericTableMetaDataProvider.java | 139 +++-- .../jdbc/datasource/init/ScriptUtils.java | 6 +- .../incrementer/MySQLMaxValueIncrementer.java | 90 ++- .../jdbc/core/JdbcTemplateQueryTests.java | 6 +- .../JmsListenerAnnotationBeanPostProcessor.java | 22 +- .../jms/config/AbstractJmsListenerEndpoint.java | 8 +- .../jms/config/JmsListenerEndpointRegistrar.java | 8 +- .../jms/config/MethodJmsListenerEndpoint.java | 7 +- .../springframework/jms/core/BrowserCallback.java | 14 +- .../springframework/jms/core/ProducerCallback.java | 10 +- .../springframework/jms/core/SessionCallback.java | 16 +- .../listener/adapter/MessageListenerAdapter.java | 19 +- .../messaging/MessagingException.java | 8 +- .../messaging/handler/HandlerMethod.java | 14 +- .../AbstractMethodArgumentResolutionException.java | 39 +- .../AbstractNamedValueMethodArgumentResolver.java | 5 +- .../support/MethodArgumentNotValidException.java | 29 +- .../MethodArgumentTypeMismatchException.java | 14 +- .../handler/invocation/InvocableHandlerMethod.java | 69 +- .../MethodArgumentResolutionException.java} | 34 +- .../simp/stomp/Reactor2TcpStompClient.java | 114 ++-- .../simp/stomp/StompBrokerRelayMessageHandler.java | 155 +++-- .../messaging/simp/stomp/StompClientSupport.java | 5 + .../messaging/support/MessageHeaderAccessor.java | 5 - .../messaging/tcp/reactor/Reactor2TcpClient.java | 2 +- .../DefaultMessageHandlerMethodFactoryTests.java | 15 +- .../support/HeaderMethodArgumentResolverTests.java | 35 +- .../simp/stomp/StompHeaderAccessorTests.java | 17 +- .../messaging/simp/user/TestSimpSession.java | 12 +- .../messaging/simp/user/TestSimpSubscription.java | 15 +- .../messaging/simp/user/TestSimpUser.java | 13 +- spring-oxm/oxm.gradle | 3 +- .../mock/web/MockHttpServletRequest.java | 42 +- .../mock/web/MockSessionCookieConfig.java | 4 +- .../client/AbstractRequestExpectationManager.java | 16 +- .../test/web/client/DefaultRequestExpectation.java | 1 + .../test/web/client/ExpectedCount.java | 13 +- .../request/MockHttpServletRequestBuilder.java | 449 ++++++------- .../test/web/client/samples/SampleTests.java | 33 +- .../MockHttpServletRequestBuilderTests.java | 69 +- .../java/org/springframework/http/HttpStatus.java | 8 +- .../java/org/springframework/http/MediaType.java | 29 +- .../client/Netty4ClientHttpRequestFactory.java | 16 +- .../http/client/support/HttpAccessor.java | 28 +- .../http/converter/ActivationMediaTypeFactory.java | 76 +++ .../converter/ResourceHttpMessageConverter.java | 59 +- .../ResourceRegionHttpMessageConverter.java | 23 +- .../feed/RssChannelHttpMessageConverter.java | 4 +- .../springframework/web/client/RestOperations.java | 15 + .../web/filter/AbstractRequestLoggingFilter.java | 6 +- .../web/filter/ForwardedHeaderFilter.java | 2 +- .../web/filter/HiddenHttpMethodFilter.java | 23 +- .../web/filter/HttpPutFormContentFilter.java | 20 +- .../springframework/web/method/HandlerMethod.java | 14 +- .../web/method/support/InvocableHandlerMethod.java | 59 +- .../support/MultipartResolutionDelegate.java | 6 +- .../StandardMultipartHttpServletRequest.java | 16 +- .../support/StandardServletMultipartResolver.java | 7 +- .../web/util/ContentCachingRequestWrapper.java | 45 +- .../springframework/web/util/CookieGenerator.java | 13 +- .../web/util/HierarchicalUriComponents.java | 71 +-- .../springframework/web/util/UriComponents.java | 34 +- .../org/springframework/web/util/UriUtils.java | 38 +- .../ResourceRegionHttpMessageConverterTests.java | 29 +- .../mock/web/test/MockHttpServletRequest.java | 42 +- .../mock/web/test/MockSessionCookieConfig.java | 4 +- .../WebRequestDataBinderIntegrationTests.java | 22 +- .../web/filter/ForwardedHeaderFilterTests.java | 25 +- .../web/filter/RequestLoggingFilterTests.java | 8 +- .../support/InvocableHandlerMethodTests.java | 6 +- .../util/ContentCachingRequestWrapperTests.java | 64 +- .../web/servlet/DispatcherServlet.java | 18 +- .../AnnotationDrivenBeanDefinitionParser.java | 4 +- .../annotation/WebMvcConfigurationSupport.java | 5 +- .../web/servlet/i18n/CookieLocaleResolver.java | 23 +- .../web/servlet/mvc/WebContentInterceptor.java | 43 +- .../web/servlet/view/feed/AbstractRssFeedView.java | 7 +- .../servlet/i18n/CookieLocaleResolverTests.java | 76 ++- .../web/servlet/tags/form/CheckboxTagTests.java | 4 +- .../web/servlet/tags/form/CheckboxesTagTests.java | 4 +- .../servlet/tags/form/RadioButtonsTagTests.java | 4 +- .../web/socket/WebSocketSession.java | 20 +- .../socket/adapter/AbstractWebSocketSession.java | 3 +- .../adapter/jetty/JettyWebSocketSession.java | 32 +- .../adapter/standard/StandardWebSocketSession.java | 24 +- .../config/MessageBrokerBeanDefinitionParser.java | 14 +- .../sockjs/client/AbstractClientSockJsSession.java | 108 ++-- .../sockjs/client/XhrClientSockJsSession.java | 10 +- .../web/socket/sockjs/frame/SockJsFrame.java | 69 +- .../MessageBrokerBeanDefinitionParserTests.java | 8 +- src/asciidoc/core-beans.adoc | 104 +++- src/asciidoc/overview.adoc | 73 ++- src/asciidoc/web-mvc.adoc | 2 +- src/asciidoc/web-websocket.adoc | 11 +- src/asciidoc/whats-new.adoc | 11 +- .../AopNamespaceHandlerScopeIntegrationTests.java | 25 +- ...AndTransactionalAnnotationIntegrationTests.java | 71 ++- 202 files changed, 4653 insertions(+), 3117 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
