Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,624 Commits 18 Branches 0 Tags
e78aa6b8f8a18a94de05dac5a04e38e2fefb6007
Commit Graph

21624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rossen Stoyanchev
90ccabd60b Merge branch '5.2.x' 2020-05-27 19:12:57 +01:00
Rossen Stoyanchev
c0c3c01afd Fix race condition in WriteResultPublisher 
between subscription and error from the Publish

Closes gh-25096
 2020-05-27 19:11:29 +01:00
Rossen Stoyanchev
955f77bf5d Add error message to MockServerHttpRequest 
Closes gh-25109
 2020-05-27 18:57:02 +01:00
Rossen Stoyanchev
e9a9883aa9 Optimal initialization of empty request mapping conditions 
Closes gh-25143
 2020-05-27 18:57:02 +01:00
Sam Brannen
cc061ca716 Merge branch '5.2.x' 2020-05-27 16:30:22 +02:00
Sam Brannen
3cbc297fc6 Polish contribution 
See gh-25137
 2020-05-27 16:29:34 +02:00
limo520
d6cab259c3 Fix URI pattern example in webflux.adoc 
Closes gh-25137
 2020-05-27 16:14:47 +02:00
Sam Brannen
763f7b9be8 Make TaskExecutor and TaskScheduler tests more robust 2020-05-27 15:25:39 +02:00
Sam Brannen
c4ef002392 Stop to writing to STD_OUT in tests 2020-05-27 15:21:17 +02:00
Sam Brannen
83b564781f Upgrade to Gradle 6.4.1 2020-05-27 13:22:25 +02:00
Juergen Hoeller
929244215c Merge branch '5.2.x' 
# Conflicts:
#	build.gradle
 2020-05-26 23:37:53 +02:00
Juergen Hoeller
ae8d0d4a12 Upgrade to Groovy 2.5.12, Caffeine 2.8.4, Apache Johnzon 1.2.6 2020-05-26 23:35:58 +02:00
Juergen Hoeller
27d5fdc5aa Polishing 2020-05-26 23:35:38 +02:00
Juergen Hoeller
1dea55dc20 WebSphereUowTransactionManager sets timeout for actual transaction only 
Closes gh-25132
 2020-05-26 23:34:36 +02:00
Juergen Hoeller
dfa948c2ca Introduce AutowireCandidateResolver.cloneIfNecessary() method 
Closes gh-25131
 2020-05-26 23:33:39 +02:00
Juergen Hoeller
f9aae8dd5a Consistently determine minimum number of arguments from specified index 
Closes gh-25130
 2020-05-26 23:33:02 +02:00
Yanming Zhou
94f1d77e22 Polish StringHttpMessageConverter.getContentTypeCharset() 
Closes gh-25126
 2020-05-26 18:26:21 +02:00
Juergen Hoeller
67533a1b29 Upgrade to Groovy 3.0.4, RxJava 3.0.4, Undertow 2.1.1, EclipseLink 2.7.7, Caffeine 2.8.4, Apache Johnzon 1.2.6, Protobuf 3.12.1 2020-05-26 14:20:01 +02:00
Juergen Hoeller
9bf7ff23c0 Introduce EntityManager initialization callbacks 
JpaVendorAdapter.postProcessEntityManager and EntityManagerFactoryInfo.createNativeEntityManager SPI, plus convenient setEntityManagerInitializer configuration options.

Closes gh-25125
 2020-05-26 14:19:47 +02:00
Sam Brannen
a853a58c62 Avoid duplicate addition of void.class in ClassUtils 
This commit avoids duplicate addition of void.class to the temporary
primitiveTypes Set in the static initialization block in ClassUtils.

Closes gh-25128
 2020-05-26 11:19:33 +02:00
Sam Brannen
5392ac2e07 Add dependency on BouncyCastle for JDK 15+ 
With a recent upgrade to an early access build for JDK 15,
ServerHttpsRequestIntegrationTests began failing since Netty's
SelfSignedCertificate could not be properly initialized.

This commit adds a test fixture dependency on BouncyCastle which is now
needed by Netty's SelfSignedCertificate on JDK 15 or higher, since JDK 15
no longer supports the javax.security.cert.X509Certificate.

See: https://bugs.openjdk.java.net/browse/JDK-8241039
 2020-05-25 17:30:27 +02:00
Rossen Stoyanchev
b5d9f27ca4 Merge branch '5.2.x' 2020-05-24 21:20:12 +01:00
Rossen Stoyanchev
4f65ba4e74 Simplify creation of HttpContext for Apache HttpClient 
Closes gh-25066
 2020-05-24 21:09:49 +01:00
Rossen Stoyanchev
23a66e016e UriBuilder javadoc update 
Closes gh-25055
 2020-05-24 21:09:13 +01:00
Rossen Stoyanchev
c3e55d537e DefaultResponseErrorHandler javadoc update 
Closes gh-25067
 2020-05-23 10:41:35 +01:00
Rossen Stoyanchev
d7a29bbcef DefaultClientResponseBuilder copies logPrefix 
Closes gh-25069
 2020-05-23 10:41:07 +01:00
Rossen Stoyanchev
8204055924 MockServerHttpRequest accepts custom HTTP method 
Closes gh-25109
 2020-05-23 10:40:25 +01:00
Juergen Hoeller
399453d9f1 Merge branch '5.2.x' 
# Conflicts:
#	spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
#	spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
 2020-05-22 17:16:09 +02:00
Juergen Hoeller
cd9ee98ff8 Upgrade to Jetty 9.4.29, Hibernate ORM 5.4.16, WebJars Locator 0.45 2020-05-22 17:08:02 +02:00
Juergen Hoeller
4018b462f1 JdbcOperations polishing (backported from master) 2020-05-22 16:35:34 +02:00
Juergen Hoeller
d7161f5e5e Polishing 2020-05-22 16:23:46 +02:00
Juergen Hoeller
e5c079edfc Introduce serializeToByteArray/deserializeFromByteArray on (De)Serializer 
Closes gh-25117
 2020-05-22 16:22:59 +02:00
Juergen Hoeller
807ded24c4 Avoid ClassCastException on IllegalArgumentException from sync invocation 
Closes gh-25110
 2020-05-22 16:12:49 +02:00
Brian Clozel
593928a9f3 Upgrade JDK 15 CI image to JDK 15 build 24 2020-05-22 15:41:38 +02:00
Sam Brannen
59443bfe18 Merge branch '5.2.x' 2020-05-20 14:28:56 +02:00
Sam Brannen
4f2b6473ac Honor attributes configured in ServerRequest.from() builder 
Prior to this commit, if attributes were configured in the builder
returned by `ServerRequest.from(...)`, those attributes were not
available in the `ServerRequest` built by the builder. In addition, any
attributes in the original `ServerRequest` supplied to
`ServerRequest.from(...)` were also ignored.

This commit addresses this issue by ensuring that the attributes
configured via DefaultServerRequestBuilder are used as the attributes
in the resulting `ServerRequest`.

This commit also polishes the Javadoc in `ServerRequest` and
`ClientResponse` and avoids the use of lambda expressions in the
constructors for `DefaultServerRequestBuilder` and
`DefaultClientResponseBuilder`.

Closes gh-25106
 2020-05-20 14:10:44 +02:00
Brian Clozel
7c2471e3cc Polish 
Closes gh-24204
 2020-05-19 16:45:23 +02:00
Rohit Pandey
8da5627c6c Fix ExceptionHandlerExceptionResolver.setResponseBodyAdvice behaviour 
Prior to this commit, calling the `setResponseBodyAdvice` method would
clear all existing `ResponseBodyAdvice` instances present in the list
before adding provided one.
This behavior is inconsistent with the Javadoc and other
implementations.

This brings the method in line with the existing documentation.

See gh-24204
 2020-05-19 16:28:57 +02:00
Sam Brannen
da071c1fce Remove unused code 2020-05-19 15:59:17 +02:00
Sam Brannen
59cab5e7d9 Polishing 2020-05-19 15:54:34 +02:00
Juergen Hoeller
d56ca04162 Introduce queryForStream on JdbcTemplate and NamedParameterJdbcTemplate 
Closes gh-18474
 2020-05-19 14:08:52 +02:00
Rossen Stoyanchev
5ca7928153 Use Servlet 4 mapping type if available 
See gh-25100
 2020-05-19 10:34:15 +01:00
Rossen Stoyanchev
23233c3041 Shared read-only instance of UrlPathHelper 
In many places UrlPathHelper is created and used without any
customizations, in some cases repeatedly. This commit adds a
shared read-only UrlPathHelper instance with default settings.

See gh-25100
 2020-05-19 10:34:15 +01:00
Sam Brannen
92f7587a40 Upgrade to JDK 15 build 23 on CI server 2020-05-19 09:23:58 +02:00
Juergen Hoeller
16f1414e5c Merge branch '5.2.x' 
# Conflicts:
#	build.gradle
 2020-05-18 20:18:31 +02:00
Juergen Hoeller
b5b718f1e5 Upgrade to AssertJ 3.16.1, Log4J 2.13.3, Vavr 0.10.3, JAMon 2.82, Joda-Time 2.10.6, Caffeine 2.8.3, OkHttp 3.14.9, OpenPDF 1.3.17, HtmlUnit 2.40 2020-05-18 20:09:37 +02:00
Juergen Hoeller
9631db71c4 Direct exposure of StringBuilder instead of intermediate String 
Closes gh-25024
 2020-05-18 20:09:24 +02:00
Juergen Hoeller
9999414b3b Merge branch '5.2.x' 2020-05-18 14:24:33 +02:00
Juergen Hoeller
c35b21b49f Consistent not-null assertions for configured interceptors 
Closes gh-25088
 2020-05-18 14:23:05 +02:00
Juergen Hoeller
06cfd80c1c Avoid full synchronization in refreshable getBeanFactory() implementation 
Closes gh-25081
 2020-05-18 14:22:24 +02:00