[libspring-java] 01/03: Merge tag 'upstream/4.3.5'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Dec 23 08:17: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 609b5368f70bc387fe8155439a1303a51f6f068b
Merge: 784eb05 7b2b015
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Dec 23 09:09:47 2016 +0100
Merge tag 'upstream/4.3.5'
Upstream version 4.3.5
build.gradle | 24 +-
gradle.properties | 2 +-
.../aop/aspectj/AspectJExpressionPointcut.java | 55 ++--
.../aop/framework/CglibAopProxy.java | 3 +-
.../aop/framework/JdkDynamicAopProxy.java | 3 +-
.../org/springframework/beans/PropertyMatches.java | 35 +--
.../factory/NoSuchBeanDefinitionException.java | 2 +-
.../AutowiredAnnotationBeanPostProcessor.java | 4 -
.../AbstractAutowireCapableBeanFactory.java | 32 +-
.../beans/factory/support/AbstractBeanFactory.java | 30 +-
.../beans/factory/support/AutowireUtils.java | 12 +-
.../factory/support/BeanDefinitionReaderUtils.java | 35 +--
.../support/DefaultListableBeanFactory.java | 52 ++--
.../GenericTypeAwareAutowireCandidateResolver.java | 27 +-
.../beans/factory/support/RootBeanDefinition.java | 2 +-
.../factory/support/StaticListableBeanFactory.java | 8 +-
.../factory/DefaultListableBeanFactoryTests.java | 1 +
.../AutowiredAnnotationBeanPostProcessorTests.java | 107 ++++++-
.../InjectAnnotationBeanPostProcessorTests.java | 22 +-
.../context/ConfigurableApplicationContext.java | 6 +
.../annotation/AnnotatedBeanDefinitionReader.java | 30 ++
.../AnnotationConfigApplicationContext.java | 19 +-
.../ConfigurationClassBeanDefinitionReader.java | 2 +-
.../annotation/ConfigurationClassParser.java | 17 +-
.../ConfigurationClassPostProcessor.java | 68 +----
.../context/annotation/ConfigurationCondition.java | 4 +-
.../context/annotation/ImportRegistry.java | 4 +-
.../event/ApplicationListenerMethodAdapter.java | 8 +-
.../event/GenericApplicationListenerAdapter.java | 8 +-
.../context/i18n/LocaleContextHolder.java | 64 +++-
.../support/ConversionServiceFactoryBean.java | 12 +-
.../context/support/GenericApplicationContext.java | 2 +
.../datetime/joda/JodaTimeContextHolder.java | 5 +-
.../datetime/standard/DateTimeContextHolder.java | 5 +-
.../standard/DateTimeFormatterRegistrar.java | 48 +--
...10DateTimeFormatAnnotationFormatterFactory.java | 28 +-
.../support/FormattingConversionService.java | 9 +-
.../springframework/jmx/export/MBeanExporter.java | 26 +-
.../jmx/support/ConnectorServerFactoryBean.java | 3 +-
.../support/ScriptFactoryPostProcessor.java | 6 +-
.../org/springframework/validation/DataBinder.java | 33 +-
.../config/ExpressionCachingIntegrationTests.java | 28 +-
.../ConfigurationClassPostProcessorTests.java | 93 +++++-
.../annotation/configuration/Spr10668Tests.java | 28 +-
.../context/i18n/LocaleContextHolderTests.java | 14 +-
.../datetime/standard/DateTimeFormattingTests.java | 34 ++-
.../jmx/export/MBeanExporterTests.java | 129 +++++---
.../validation/DataBinderTests.java | 109 ++++++-
.../java/org/springframework/asm/ClassReader.java | 3 +-
.../java/org/springframework/core/Conventions.java | 2 +-
.../org/springframework/core/ResolvableType.java | 62 ++--
.../core/annotation/AnnotatedElementUtils.java | 40 +--
.../core/annotation/AnnotationUtils.java | 38 ++-
.../org/springframework/core/convert/Property.java | 4 +-
.../core/convert/TypeDescriptor.java | 99 +++---
.../support/CollectionToStringConverter.java | 12 +-
.../core/convert/support/ConversionUtils.java | 9 +-
.../convert/support/DefaultConversionService.java | 24 ++
.../convert/support/GenericConversionService.java | 34 +--
.../convert/support/ObjectToOptionalConverter.java | 10 +-
.../core/env/AbstractPropertyResolver.java | 50 ++-
.../core/env/ConfigurableEnvironment.java | 23 +-
.../org/springframework/core/env/Environment.java | 6 +-
.../core/env/PropertySourcesPropertyResolver.java | 2 +-
.../PathMatchingResourcePatternResolver.java | 38 ++-
.../java/org/springframework/util/MimeType.java | 12 +-
.../org/springframework/util/MimeTypeUtils.java | 46 ++-
.../ComposedRepeatableAnnotationsTests.java | 2 +-
.../core/convert/TypeDescriptorTests.java | 31 +-
.../converter/DefaultConversionServiceTests.java | 24 +-
.../org/springframework/util/MimeTypeTests.java | 10 +
.../util/xml/AbstractStaxHandlerTestCase.java | 12 +-
.../util/xml/StaxEventHandlerTests.java | 5 +-
.../util/xml/StaxStreamHandlerTests.java | 5 +-
.../expression/EvaluationException.java | 37 ++-
.../expression/ExpressionException.java | 57 ++--
.../springframework/expression/ParseException.java | 8 +-
.../expression/spel/SpelEvaluationException.java | 40 +--
.../expression/spel/SpelMessage.java | 43 ++-
.../expression/spel/SpelParseException.java | 26 +-
.../spel/support/StandardTypeConverter.java | 7 +-
.../expression/spel/SpelReproTests.java | 20 +-
.../expression/spel/standard/SpelParserTests.java | 65 ++--
.../jdbc/core/BeanPropertyRowMapper.java | 2 +-
.../springframework/jdbc/core/JdbcTemplate.java | 8 +-
.../springframework/jdbc/support/JdbcUtils.java | 45 ++-
.../jdbc/support/SQLErrorCodesFactory.java | 129 ++++----
.../jdbc/core/AbstractRowMapperTests.java | 30 +-
.../jdbc/core/BeanPropertyRowMapperTests.java | 24 +-
.../test/{SpacePerson.java => DatePerson.java} | 15 +-
.../jdbc/core/test/SpacePerson.java | 11 +-
.../converter/GenericMessageConverter.java | 4 +-
.../AbstractNamedValueMethodArgumentResolver.java | 5 +-
.../support/PayloadArgumentResolver.java | 20 +-
.../handler/invocation/InvocableHandlerMethod.java | 2 +-
.../messaging/simp/stomp/DefaultStompSession.java | 2 +-
.../messaging/simp/stomp/StompEncoder.java | 65 +++-
.../simp/user/MultiServerUserRegistry.java | 10 +
.../messaging/simp/user/SimpUserRegistry.java | 19 +-
.../simp/user/UserSessionRegistryAdapter.java | 5 +
.../support/PayloadArgumentResolverTests.java | 31 +-
.../simp/user/MultiServerUserRegistryTests.java | 13 +-
.../simp/user/UserRegistryMessageHandlerTests.java | 10 +-
.../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 7 +-
...ernateEntityManagerFactoryIntegrationTests.java | 16 +-
.../java/org/springframework/oxm/Marshaller.java | 6 +-
.../java/org/springframework/oxm/Unmarshaller.java | 6 +-
.../oxm/xstream/CatchAllConverter.java | 24 +-
.../web/client/match/MockRestRequestMatchers.java | 95 ++++--
.../servlet/htmlunit/HtmlUnitRequestBuilder.java | 7 +
.../request/MockHttpServletRequestBuilder.java | 9 +-
.../MockMultipartHttpServletRequestBuilder.java | 8 +-
.../servlet/request/MockMvcRequestBuilders.java | 54 ++--
.../client/match/MockRestRequestMatchersTests.java | 35 ++-
.../htmlunit/HtmlUnitRequestBuilderTests.java | 15 +-
.../transaction/annotation/Transactional.java | 26 +-
.../interceptor/DefaultTransactionAttribute.java | 15 +-
.../EnableTransactionManagementTests.java | 75 ++++-
.../org/springframework/http/ResponseEntity.java | 4 +-
.../http/client/Netty4ClientHttpRequest.java | 8 +-
.../client/Netty4ClientHttpRequestFactory.java | 76 ++---
.../client/OkHttp3ClientHttpRequestFactory.java | 21 +-
.../client/OkHttpClientHttpRequestFactory.java | 15 +-
.../client/SimpleClientHttpRequestFactory.java | 5 +-
.../json/AbstractJackson2HttpMessageConverter.java | 28 +-
.../httpinvoker/HttpInvokerClientInterceptor.java | 21 +-
.../web/bind/annotation/GetMapping.java | 10 +-
.../web/client/AsyncRestOperations.java | 52 ++--
.../web/client/AsyncRestTemplate.java | 26 +-
.../springframework/web/client/RestOperations.java | 117 +++++--
.../springframework/web/client/RestTemplate.java | 99 ++++--
.../web/context/request/async/DeferredResult.java | 93 ++++--
.../web/filter/ForwardedHeaderFilter.java | 67 +++-
.../AbstractNamedValueMethodArgumentResolver.java | 15 +-
.../web/method/annotation/ModelFactory.java | 84 +++---
.../RequestParamMethodArgumentResolver.java | 7 +-
.../web/multipart/MultipartFile.java | 7 +-
.../commons/CommonsFileUploadSupport.java | 33 +-
.../multipart/commons/CommonsMultipartFile.java | 23 +-
.../web/util/HierarchicalUriComponents.java | 4 +-
.../org/springframework/web/util/UriTemplate.java | 14 +-
.../springframework/http/ResponseEntityTests.java | 19 +-
.../AbstractAsyncHttpRequestFactoryTestCase.java | 2 +-
.../client/AbstractHttpRequestFactoryTestCase.java | 11 +-
.../http/client/AbstractJettyServerTestCase.java | 202 -------------
.../http/client/AbstractMockWebServerTestCase.java | 95 ++++++
.../MappingJackson2HttpMessageConverterTests.java | 14 +
.../web/client/AbstractJettyServerTestCase.java | 336 ---------------------
.../web/client/AbstractMockWebServerTestCase.java | 275 +++++++++++++++++
.../client/AsyncRestTemplateIntegrationTests.java | 30 +-
.../web/client/RestTemplateIntegrationTests.java | 69 ++++-
.../web/client/RestTemplateTests.java | 66 ++++
.../web/filter/ForwardedHeaderFilterTests.java | 156 ++++++++++
.../web/servlet/ResourceServlet.java | 43 +--
...ractMessageConverterMethodArgumentResolver.java | 77 +++--
.../AbstractMessageConverterMethodProcessor.java | 7 +-
.../ExceptionHandlerExceptionResolver.java | 13 +-
.../RedirectAttributesMethodArgumentResolver.java | 10 +-
.../RequestPartMethodArgumentResolver.java | 25 +-
.../RequestResponseBodyMethodProcessor.java | 19 +-
.../annotation/ServletInvocableHandlerMethod.java | 2 +-
.../resource/ResourceUrlEncodingFilter.java | 18 +-
.../web/servlet/resource/ResourceUrlProvider.java | 16 +-
.../servlet/resource/VersionResourceResolver.java | 9 +-
.../web/servlet/ResourceServletTests.java | 61 ++++
.../ExceptionHandlerExceptionResolverTests.java | 31 ++
.../RequestMappingHandlerMappingTests.java | 12 +-
...equestResponseBodyMethodProcessorMockTests.java | 111 ++++---
.../RequestResponseBodyMethodProcessorTests.java | 24 +-
.../resource/ResourceUrlEncodingFilterTests.java | 61 ++--
.../servlet/resource/ResourceUrlProviderTests.java | 11 +-
.../web/socket/WebSocketMessage.java | 5 +-
.../socket/adapter/AbstractWebSocketSession.java | 7 +-
.../adapter/jetty/JettyWebSocketSession.java | 103 ++++++-
.../socket/messaging/DefaultSimpUserRegistry.java | 5 +
.../socket/messaging/StompSubProtocolHandler.java | 68 +++--
.../server/jetty/JettyRequestUpgradeStrategy.java | 253 +++++++++++-----
.../transport/session/AbstractSockJsSession.java | 19 +-
.../session/WebSocketServerSockJsSession.java | 32 +-
.../socket/AbstractWebSocketIntegrationTests.java | 5 +-
.../web/socket/JettyWebSocketTestServer.java | 36 ++-
.../web/socket/TomcatWebSocketTestServer.java | 23 +-
.../web/socket/UndertowTestServer.java | 43 ++-
.../web/socket/WebSocketTestServer.java | 22 +-
.../annotation/WebSocketConfigurationTests.java | 5 +-
.../messaging/DefaultSimpUserRegistryTests.java | 2 +
.../messaging/StompSubProtocolHandlerTests.java | 61 +++-
.../transport/session/SockJsSessionTests.java | 14 +-
src/asciidoc/core-expressions.adoc | 27 +-
src/asciidoc/data-access.adoc | 324 ++++++--------------
src/asciidoc/integration.adoc | 20 +-
src/asciidoc/web-websocket.adoc | 150 +++++++--
192 files changed, 4406 insertions(+), 2524 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