root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity
48,707 Commits 23 Branches 345 Tags 287 MiB
Commit Graph

765 Commits

Author SHA1 Message Date
Moritz Halbritter 6697db257c Merge branch '3.2.x' 
Closes gh-40614
 2024-05-02 11:56:21 +02:00
Moritz Halbritter 2183b47e62 Merge branch '3.1.x' into 3.2.x 
Closes gh-40612
 2024-05-02 11:53:21 +02:00
Moritz Halbritter 1534bc8ad2 Polish "Avoid using OkHttp3ClientHttpRequestFactory in test" 
See gh-40611
 2024-05-02 11:45:23 +02:00
Stéphane Nicoll 20042576e9 Avoid using OkHttp3ClientHttpRequestFactory in test 
See gh-40611
 2024-05-02 11:45:20 +02:00
Phillip Webb 6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07:00
Phillip Webb 38af8cd362 Merge branch '3.1.x' into 3.2.x 2024-04-18 12:52:54 -07:00
Phillip Webb 20db2b54c7 Update copyright year of changed files 2024-04-18 12:52:29 -07:00
Scott Frederick 813507b791 Merge branch '3.2.x' 
Closes gh-40166
 2024-04-03 16:32:13 -05:00
Scott Frederick 1c2a43d1e6 Merge branch '3.1.x' into 3.2.x 
Closes gh-40165
 2024-04-03 16:30:41 -05:00
Felix 8a42935dad Apply instanceof pattern matching 
See gh-40085
 2024-04-03 16:30:01 -05:00
Moritz Halbritter 35b39d3a44 Make spring-test available to compile classpath of consumers of spring-boot-test 
Closes gh-39901
 2024-03-26 13:45:51 +01:00
Andy Wilkinson 102215ee96 Upgrade to HttpClient5 5.3.1 
Closes gh-39703
 2024-02-22 10:10:05 +00:00
Phillip Webb f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb 12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Scott Frederick 51991d6f41 Merge branch '3.2.x' 
Closes gh-39536
 2024-02-13 13:11:50 -06:00
Scott Frederick 720e9cef16 Make RestTemplateBuilder more compatible with RestClient.Builder 
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.

With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.

Fixes gh-39317
 2024-02-13 13:10:55 -06:00
Moritz Halbritter 7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter 4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter 8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Moritz Halbritter acf758aea9 Merge branch '3.2.x' 2024-01-25 11:06:36 +01:00
Moritz Halbritter c47430d842 Merge branch '3.1.x' into 3.2.x 2024-01-25 11:06:25 +01:00
Moritz Halbritter df755db1f3 Ensure that remaining mocks are closed before initializing a test 
Closes gh-39271
 2024-01-25 10:57:45 +01:00
Moritz Halbritter 9146ce5515 Merge branch '3.2.x' 2024-01-25 10:19:49 +01:00
Moritz Halbritter 36b70d7b16 Merge branch '3.1.x' into 3.2.x 2024-01-25 10:19:37 +01:00
Moritz Halbritter 930669888a Add more integration tests for MockitoTestExecutionListener 2024-01-25 10:18:59 +01:00
Phillip Webb 8f1a330dd5 Update copyright header of cleaned up code 
See gh-39259
 2024-01-23 10:18:50 -08:00
Tobias Lippert def7523398 Inline redundant if statements 
See gh-39259
 2024-01-23 09:07:35 -08:00
Tobias Lippert 9cdd0c3776 Remove unnecessary semicolons 
See gh-39259
 2024-01-23 09:07:29 -08:00
Moritz Halbritter 43296d019e Merge branch '3.2.x' 
Closes gh-39273
 2024-01-23 09:27:25 +01:00
Moritz Halbritter 46304a7821 Merge branch '3.1.x' into 3.2.x 
Closes gh-39272
 2024-01-23 09:24:29 +01:00
Moritz Halbritter c87d5eeb28 Ensure that remaining mocks are closed before initializing a test 
Closes gh-39271
 2024-01-23 09:17:17 +01:00
Andy Wilkinson 17e9f0cb8e Merge branch '3.2.x' 
Closes gh-39093
 2024-01-11 11:36:38 +00:00
Andy Wilkinson 7087897507 Merge branch '3.1.x' into 3.2.x 
Closes gh-39091
 2024-01-11 10:33:57 +00:00
Andy Wilkinson 45c32854a5 Fix Checkstyle upgrade 
Closes gh-38746
 2024-01-10 15:37:38 +00:00
Andy Wilkinson 28490738ae Revert "Upgrade to HttpClient5 5.3" 
This reverts commit 31f3f31ac1.

See gh-39007
 2024-01-05 11:40:41 +00:00
Andy Wilkinson 31f3f31ac1 Upgrade to HttpClient5 5.3 
Closes gh-39007
 2024-01-04 17:32:10 +00:00
Andy Wilkinson a1c7c0bccc Upgrade to AssertJ 3.25.1 
Closes gh-38997
 2024-01-04 17:26:35 +00:00
Phillip Webb 246a0e6f21 Merge branch '3.1.x' 
Closes gh-38878
 2023-12-19 23:10:49 -08:00
Yanming Zhou 8cb8999772 Ban call of URLEncoder.encode/URLDecoder.decode(String,String) 
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.

See gh-38740
 2023-12-19 23:10:18 -08:00
Phillip Webb 5354ad15b3 Merge branch '3.1.x' 
Closes gh-38877
 2023-12-19 22:51:48 -08:00
Yanming Zhou 8599e5a986 Remove unnecessary `toString()` calls 
See gh-38739
 2023-12-19 22:38:34 -08:00
Yanming Zhou 84f7c2dba9 Remove unnecessary `final` modifiers 
See gh-38739
 2023-12-19 22:38:14 -08:00
Moritz Halbritter 6330190913 Merge branch '3.1.x' 
Closes gh-38728
 2023-12-11 09:44:19 +01:00
Yanming Zhou ebfbc0ef05 Cleanup kotlin sources 
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible

See gh-38708
 2023-12-11 09:23:42 +01:00
Moritz Halbritter 4a851c1c90 Merge branch '3.1.x' 2023-11-08 09:53:53 +01:00
Moritz Halbritter 357c2124c4 Merge branch '3.0.x' into 3.1.x 2023-11-08 09:53:40 +01:00
Moritz Halbritter 0a6b723098 Merge branch '2.7.x' into 3.0.x 2023-11-08 09:53:29 +01:00
Moritz Halbritter 66ed4fe519 Remove system property dependency from MockBeanContextCachingTests 
Now this test can be run regardless of the
'spring.test.context.cache.maxSize' system property value.

See gh-38236
 2023-11-08 09:49:35 +01:00
Phillip Webb 690cfa220a Provide a way to create custom ApplicationContextFactory 
Update `SpringBootContextLoader` so that `getApplicationContextFactory`
is now a protected that may be overridden to provide a custom
`ApplicationContextFactory` instance.

Closes gh-38205
 2023-11-07 11:53:10 -08:00
Phillip Webb d638bbb0ba Merge branch '3.1.x' 
Closes gh-37967
 2023-10-19 21:25:44 -07:00