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 23ac8f8c0379e449b5ab5d56bf7eeb5376b26207 Merge: c25d747 c3df6b7 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 26 09:12:56 2016 +0200 Merge tag 'upstream/4.3.3' Upstream version 4.3.3 CONTRIBUTING.md | 9 +- build.gradle | 32 +-- gradle.properties | 2 +- .../tests/aop/interceptor/NopInterceptor.java | 23 +- .../tests/sample/beans/SerializablePerson.java | 31 ++- .../beans/AbstractNestablePropertyAccessor.java | 2 +- .../org/springframework/beans/PropertyValue.java | 26 +- .../beans/TypeConverterSupport.java | 2 +- .../springframework/beans/factory/BeanFactory.java | 31 ++- .../springframework/beans/factory/NamedBean.java | 10 +- .../factory/NoSuchBeanDefinitionException.java | 8 +- .../factory/UnsatisfiedDependencyException.java | 11 +- .../annotation/BeanFactoryAnnotationUtils.java | 22 +- ...alifierAnnotationAutowireCandidateResolver.java | 17 +- .../factory/config/AutowireCapableBeanFactory.java | 62 +++-- .../beans/factory/config/NamedBeanHolder.java | 63 +++++ .../AbstractAutowireCapableBeanFactory.java | 21 +- .../support/DefaultListableBeanFactory.java | 283 +++++++++++++-------- .../GenericTypeAwareAutowireCandidateResolver.java | 31 ++- .../beans/factory/support/RootBeanDefinition.java | 63 ++++- .../beans/propertyeditors/FileEditor.java | 9 +- .../beans/propertyeditors/PathEditor.java | 31 ++- .../factory/DefaultListableBeanFactoryTests.java | 20 +- .../AutowiredAnnotationBeanPostProcessorTests.java | 93 ++++++- .../factory/annotation/LookupAnnotationTests.java | 24 +- .../beans/factory/support/BeanDefinitionTests.java | 4 +- .../beans/propertyeditors/FileEditorTests.java | 11 +- .../beans/propertyeditors/PathEditorTests.java | 28 ++ .../tests/sample/beans/TestBean.java | 4 +- .../interceptor/AbstractCacheInterceptor.java | 2 +- .../cache/annotation/CacheEvict.java | 4 +- .../springframework/cache/annotation/CachePut.java | 12 +- .../cache/annotation/Cacheable.java | 8 +- .../cache/interceptor/AbstractCacheInvoker.java | 29 ++- .../cache/interceptor/CacheAspectSupport.java | 2 +- .../cache/interceptor/CacheEvaluationContext.java | 28 +- .../springframework/context/annotation/Bean.java | 37 ++- .../annotation/ComponentScanAnnotationParser.java | 43 +--- .../context/annotation/Configuration.java | 37 ++- .../annotation/ConfigurationClassParser.java | 32 +-- .../ConfigurationClassPostProcessor.java | 3 + .../context/annotation/ParserStrategyUtils.java | 65 +++++ .../event/ApplicationListenerMethodAdapter.java | 93 +++---- .../expression/MethodBasedEvaluationContext.java | 53 ++-- .../context/support/GenericApplicationContext.java | 22 +- .../context/support/LiveBeansView.java | 30 ++- .../format/annotation/DateTimeFormat.java | 2 +- .../format/datetime/DateFormatter.java | 4 +- .../support/FormatterPropertyEditorAdapter.java | 6 +- .../support/FormattingConversionService.java | 8 +- .../ScheduledAnnotationBeanPostProcessor.java | 44 ++-- .../scheduling/support/CronSequenceGenerator.java | 7 +- .../config/ScriptBeanDefinitionParser.java | 21 +- .../scripting/groovy/GroovyScriptEvaluator.java | 38 ++- .../scripting/groovy/GroovyScriptFactory.java | 68 ++++- .../ConfigurationClassProcessingTests.java | 112 +++++--- .../event/AnnotationDrivenEventListenerTests.java | 10 +- .../context/event/test/EventCollector.java | 14 +- .../MethodBasedEvaluationContextTests.java | 53 ++-- .../EnableMBeanExportConfigurationTests.java | 4 +- .../scheduling/annotation/AsyncExecutionTests.java | 1 + .../groovy/GroovyScriptEvaluatorTests.java | 21 ++ .../scripting/groovy/GroovyScriptFactoryTests.java | 2 + .../scripting/groovy/MyBytecodeProcessor.java | 25 +- .../scripting/groovy/MyImportCustomizer.java | 18 +- .../scripting/groovy/groovy-with-xsd.xml | 27 +- .../org/springframework/core/ResolvableType.java | 11 +- .../core/annotation/OrderUtils.java | 8 +- .../core/env/AbstractEnvironment.java | 19 +- .../core/env/PropertySourcesPropertyResolver.java | 10 +- .../org/springframework/util/AntPathMatcher.java | 3 + .../org/springframework/util/MimeTypeUtils.java | 2 +- .../java/org/springframework/util/StringUtils.java | 5 +- .../springframework/core/ResolvableTypeTests.java | 27 +- .../core/style/ToStringCreatorTests.java | 39 ++- .../springframework/util/MethodInvokerTests.java | 14 +- .../org/springframework/util/StringUtilsTests.java | 58 ++--- .../expression/spel/support/ReflectionHelper.java | 4 +- .../jdbc/core/StatementCreatorUtils.java | 28 +- .../jdbc/core/StatementCreatorUtilsTests.java | 3 +- .../jdbc/object/GenericSqlQueryTests.java | 8 +- .../jdbc/object/GenericSqlQueryTests-context.xml | 4 +- .../AbstractPollingMessageListenerContainer.java | 14 +- .../jms/support/SimpleJmsHeaderMapper.java | 41 +-- .../converter/MappingJackson2MessageConverter.java | 4 +- .../messaging/core/GenericMessagingTemplate.java | 12 +- .../support/MessageMethodArgumentResolver.java | 25 +- .../messaging/simp/SimpMessageHeaderAccessor.java | 2 + .../simp/broker/SimpleBrokerMessageHandler.java | 9 +- .../config/AbstractMessageBrokerConfiguration.java | 2 +- .../simp/stomp/ConnectionLostException.java | 4 +- .../messaging/simp/stomp/DefaultStompSession.java | 4 +- .../messaging/simp/stomp/Reactor2StompCodec.java | 29 ++- .../simp/stomp/Reactor2TcpStompClient.java | 6 +- .../simp/stomp/StompBrokerRelayMessageHandler.java | 2 +- .../messaging/simp/stomp/StompCommand.java | 85 +++---- .../messaging/simp/stomp/StompHeaderAccessor.java | 23 +- .../messaging/simp/stomp/StompHeaders.java | 25 +- .../simp/user/MultiServerUserRegistry.java | 28 +- .../messaging/tcp/reactor/Reactor2TcpClient.java | 10 +- .../tcp/reactor/Reactor2TcpConnection.java | 9 +- .../MappingJackson2MessageConverterTests.java | 31 ++- .../core/GenericMessagingTemplateTests.java | 11 +- .../MessageMethodArgumentResolverTests.java | 57 ++++- .../SendToMethodReturnValueHandlerTests.java | 118 +++++---- .../SubscriptionMethodReturnValueHandlerTests.java | 5 +- .../broker/SimpleBrokerMessageHandlerTests.java | 23 +- .../messaging/simp/stomp/StompCommandTests.java | 100 ++++++++ .../hibernate5/HibernateExceptionTranslator.java | 9 +- .../orm/hibernate5/HibernateTemplate.java | 14 +- .../orm/hibernate5/LocalSessionFactoryBuilder.java | 41 ++- .../LocalContainerEntityManagerFactoryBean.java | 15 ++ .../DefaultPersistenceUnitManager.java | 2 + .../PersistenceAnnotationBeanPostProcessor.java | 27 +- .../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 18 +- ...stractEntityManagerFactoryIntegrationTests.java | 4 +- .../orm/jpa/hibernate/hibernate-manager.xml | 6 + .../springframework/oxm/jaxb/Jaxb2Marshaller.java | 6 +- .../mock/http/MockHttpInputMessage.java | 9 +- .../mock/http/client/MockClientHttpRequest.java | 29 ++- .../mock/http/client/MockClientHttpResponse.java | 17 +- .../springframework/mock/web/MockAsyncContext.java | 4 +- .../jdbc/SqlScriptsTestExecutionListener.java | 100 ++++---- .../test/context/support/ActiveProfilesUtils.java | 36 ++- .../springframework/test/util/AopTestUtils.java | 10 +- .../test/util/JsonPathExpectationsHelper.java | 66 +++-- .../test/web/client/DefaultRequestExpectation.java | 4 +- .../client/MockMvcClientHttpRequestFactory.java | 6 +- .../test/web/client/RequestMatcher.java | 4 +- .../web/client/match/ContentRequestMatchers.java | 1 + .../web/client/match/JsonPathRequestMatchers.java | 26 +- .../web/client/match/XpathRequestMatchers.java | 11 +- .../client/response/DefaultResponseCreator.java | 35 +-- .../client/response/MockRestResponseCreators.java | 6 +- .../servlet/htmlunit/HtmlUnitRequestBuilder.java | 41 +-- .../servlet/htmlunit/MockWebResponseBuilder.java | 2 +- .../request/MockHttpServletRequestBuilder.java | 5 +- .../servlet/setup/StandaloneMockMvcBuilder.java | 26 +- .../servlet/setup/StubWebApplicationContext.java | 18 +- .../test/util/JsonPathExpectationsHelperTests.java | 17 +- .../client/match/XpathRequestMatchersTests.java | 18 +- .../web/client/response/ResponseCreatorsTests.java | 1 + .../ContentRequestMatchersIntegrationTests.java | 5 +- .../HeaderRequestMatchersIntegrationTests.java | 9 +- .../JsonPathRequestMatchersIntegrationTests.java | 9 +- .../XmlContentRequestMatchersIntegrationTests.java | 8 +- .../XpathRequestMatchersIntegrationTests.java | 14 +- .../htmlunit/HtmlUnitRequestBuilderTests.java | 14 + .../web/servlet/samples/standalone/AsyncTests.java | 62 ++--- .../setup/StandaloneMockMvcBuilderTests.java | 30 +-- .../dao/support/DataAccessUtils.java | 12 +- ...licationListenerMethodTransactionalAdapter.java | 24 +- .../interceptor/TransactionAspectSupport.java | 23 +- .../java/org/springframework/http/HttpHeaders.java | 85 ++++++- .../java/org/springframework/http/HttpRange.java | 17 +- .../java/org/springframework/http/MediaType.java | 7 +- .../http/client/SimpleClientHttpResponse.java | 4 +- .../ResourceRegionHttpMessageConverter.java | 2 +- .../json/AbstractJackson2HttpMessageConverter.java | 10 +- .../MappingMediaTypeFileExtensionResolver.java | 4 + .../web/bind/annotation/PathVariable.java | 25 +- .../web/context/request/ServletWebRequest.java | 278 ++++++++++---------- .../async/AsyncRequestTimeoutException.java | 21 +- .../TimeoutCallableProcessingInterceptor.java | 14 +- ...TimeoutDeferredResultProcessingInterceptor.java | 18 +- .../web/cors/CorsConfiguration.java | 95 ++++--- .../web/filter/HttpPutFormContentFilter.java | 15 +- .../commons/CommonsMultipartResolver.java | 7 +- .../web/util/UriComponentsBuilder.java | 18 +- .../org/springframework/http/HttpHeadersTests.java | 19 ++ .../ObjectToStringHttpMessageConverterTests.java | 9 +- .../Jaxb2CollectionHttpMessageConverterTests.java | 9 +- .../ContentNegotiationManagerFactoryBeanTests.java | 3 +- .../client/AsyncRestTemplateIntegrationTests.java | 16 +- .../web/client/RestTemplateIntegrationTests.java | 13 +- .../request/ServletWebRequestHttpMethodsTests.java | 19 +- .../request/async/WebAsyncManagerTimeoutTests.java | 20 +- .../web/cors/DefaultCorsProcessorTests.java | 154 ++++++----- .../RequestPartServletServerHttpRequestTests.java | 25 +- .../multipart/CommonsPortletMultipartResolver.java | 7 +- .../annotation/DelegatingWebMvcConfiguration.java | 61 +++-- .../config/annotation/ResourceHandlerRegistry.java | 53 ++-- .../config/annotation/ViewControllerRegistry.java | 3 + .../annotation/WebMvcConfigurationSupport.java | 164 ++++++------ .../config/annotation/WebMvcConfigurer.java | 170 ++++++------- .../config/annotation/WebMvcConfigurerAdapter.java | 50 ++-- .../annotation/WebMvcConfigurerComposite.java | 104 ++++---- .../servlet/handler/AbstractHandlerMapping.java | 17 +- .../annotation/HttpEntityMethodProcessor.java | 77 ++---- .../PathVariableMethodArgumentResolver.java | 17 +- .../annotation/ResponseEntityExceptionHandler.java | 29 ++- .../support/DefaultHandlerExceptionResolver.java | 24 ++ .../resource/ResourceHttpRequestHandler.java | 89 +++---- .../springframework/web/servlet/tags/UrlTag.java | 4 +- .../tags/form/AbstractHtmlElementBodyTag.java | 10 +- .../web/servlet/view/groovy/GroovyMarkupView.java | 31 +-- .../jasperreports/AbstractJasperReportsView.java | 4 +- .../servlet/view/script/ScriptTemplateView.java | 28 +- .../servlet/view/tiles3/SpringLocaleResolver.java | 7 +- .../web/servlet/config/MvcNamespaceTests.java | 25 +- .../DelegatingWebMvcConfigurationTests.java | 23 +- .../annotation/ResourceHandlerRegistryTests.java | 2 +- .../WebMvcConfigurationSupportTests.java | 10 +- .../HttpEntityMethodProcessorMockTests.java | 22 +- ...dViewResolverMethodReturnValueHandlerTests.java | 5 +- .../PathVariableMethodArgumentResolverTests.java | 94 ++++++- .../annotation/RequestPartIntegrationTests.java | 19 +- .../RequestResponseBodyMethodProcessorTests.java | 28 ++ .../ResponseEntityExceptionHandlerTests.java | 8 +- ...vletAnnotationControllerHandlerMethodTests.java | 9 +- .../DefaultHandlerExceptionResolverTests.java | 10 + .../resource/ResourceHttpRequestHandlerTests.java | 50 ++-- .../servlet/resource/ResourceUrlProviderTests.java | 1 + .../servlet/view/groovy/GroovyMarkupViewTests.java | 29 +-- .../view/script/ScriptTemplateViewTests.java | 95 ++++--- .../web/servlet/view/groovy/i18n_es.tpl | 2 +- .../web/socket/WebSocketExtension.java | 105 ++++---- .../socket/client/jetty/JettyWebSocketClient.java | 8 +- .../web/socket/handler/BinaryWebSocketHandler.java | 12 +- .../web/socket/handler/TextWebSocketHandler.java | 10 +- .../socket/messaging/StompSubProtocolHandler.java | 78 ++++-- .../AbstractTyrusRequestUpgradeStrategy.java | 2 +- .../standard/ServerEndpointRegistration.java | 5 +- .../standard/TomcatRequestUpgradeStrategy.java | 5 +- .../socket/sockjs/client/JettyXhrTransport.java | 11 +- .../transport/session/AbstractSockJsSession.java | 109 ++++---- .../web/socket/TomcatWebSocketTestServer.java | 6 +- .../messaging/StompSubProtocolHandlerTests.java | 36 ++- .../transport/session/SockJsSessionTests.java | 2 +- src/asciidoc/core-beans.adoc | 44 ++-- src/asciidoc/core-expressions.adoc | 4 +- src/asciidoc/core-resources.adoc | 18 +- src/asciidoc/core-validation.adoc | 2 +- src/asciidoc/integration.adoc | 41 ++- src/asciidoc/testing.adoc | 1 + src/asciidoc/web-mvc.adoc | 16 +- src/asciidoc/whats-new.adoc | 12 +- 237 files changed, 4006 insertions(+), 2533 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
