Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,753 Commits 23 Branches 0 Tags
2c39345794f5e1d34f80e9c00a9c21de2ca14da8
Commit Graph

39753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
2c39345794 Merge branch '2.7.x' 2022-09-30 21:18:20 -07:00
Phillip Webb
0e98a577fe Merge branch '2.6.x' into 2.7.x 2022-09-30 21:18:09 -07:00
Phillip Webb
75f4d9e3fd Fix empty @DefaultValue annotation test failures on Java 17 
See gh-32559
 2022-09-30 21:16:48 -07:00
Phillip Webb
bf96816654 Merge branch '2.7.x' 
Closes gh-32564
 2022-09-30 20:16:53 -07:00
Phillip Webb
1eb0dd5e39 Merge branch '2.6.x' into 2.7.x 
Closes gh-32563
 2022-09-30 20:16:36 -07:00
Phillip Webb
efc431bdc4 Support empty @DefaultValue annotations on aggregates and optional 
Update `ValueObjectBinder` to allow an empty `@DefaultValue` to be
used on map, collection, arrays and optional types.

Closes gh-32559
 2022-09-30 18:21:54 -07:00
Scott Frederick
d25a99692f Replace Spring Boot TestCompiler with Spring Framework's version 
See gh-31266
 2022-09-30 15:58:11 -05:00
Phillip Webb
8b2fd6a05a Fix formatting 2022-09-30 12:00:14 -07:00
Phillip Webb
63f6d872e0 Test addAotGeneratedInitializerIfNecessary logic 
Closes gh-32555
 2022-09-30 11:24:04 -07:00
Andy Wilkinson
522cb1c0ea Polish deprecation warnings 
See gh-32541
 2022-09-30 18:51:37 +01:00
Andy Wilkinson
dbcb291b7a Polish 
See gh-32541
 2022-09-30 18:31:01 +01:00
Andy Wilkinson
bcb5e84129 Avoid using reflection when creating composite health contributors 
Closes gh-32541
 2022-09-30 17:03:02 +01:00
Stephane Nicoll
e2dd0ef9a4 Adapt AotProcessor to changes in Spring Framework 
Closes gh-32560
 2022-09-30 16:47:03 +02:00
Andy Wilkinson
51df7813a5 Remove code deprecated in 2.x and add since and forRemoval attributes 
Closes gh-32548
Closes gh-32549
 2022-09-30 14:39:05 +01:00
Andy Wilkinson
03b3a772c9 Adapt to PathMatchingResourcePatternResolver's behavior being reverted 
See spring-projects/spring-framework#29163
 2022-09-30 13:08:10 +01:00
Brian Clozel
5b092f5d80 Polish 
See gh-32518
 2022-09-30 12:52:22 +02:00
Brian Clozel
7f7ecdc7ac Fix documentation build 
See gh-32518
 2022-09-30 12:18:41 +02:00
Brian Clozel
ceb1e5d223 Polish 
See gh-32518
 2022-09-30 12:16:55 +02:00
Brian Clozel
8b4a20d6cd Use Observation infrastructure for instrumenting WebClient 
As of spring-projects/spring-framework#28341, `WebClient` is
instrumented directly for `Observation`.
This commit removes the custom `ExchangeFilterFunction` that previously
instrumented the client for metrics.

As a result, the relevant tag providers are now deprecated and adapted
as `ObservationConvention` for the time being.

Closes gh-32518
 2022-09-30 11:24:35 +02:00
Stephane Nicoll
f0e40bb00d Avoid NoSuchMethodError by assigning ApplicationContextInitializer 
See gh-32555
 2022-09-30 10:54:35 +02:00
Phillip Webb
7a5b61fd19 Replace AotApplicationContextInitializer with Framework version 2022-09-29 16:37:26 -07:00
Andy Wilkinson
7eb8abbda8 Adapt to PathMatchingResourcePatternResolver now matching root dir 
See spring-projects/spring-framework#29163
 2022-09-29 18:55:42 +02:00
Brian Clozel
a0735eb3fb Migrate remaining usage of httpclient API 
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.

Closes gh-32461
 2022-09-29 18:55:42 +02:00
Brian Clozel
cc169e7623 Adapt TestRestTemplate to httpclient5 changes 
This commit adapts the `TestRestTemplate` implementation to the
httpclient5 API since httpclient 4.x is now unsupported in Spring
Framework.

See gh-32461
 2022-09-29 18:55:42 +02:00
Brian Clozel
3ac034e18a Fail when setReadTimeout on httpclient5 request factory 
Prior to this commit, the `RestTemplateBuilder` would offer a generic
`setReadTimeout` method to configure the read timeout on the underlying
`ClientHttpRequestFactory`. This would be done in a reflective fashion,
considering that all implementations align with this behavior.

This option cannot be provided for HttpClient5 at the
`ClientHttpRequestFactory` level anymore, so this has been deprecated
in Spring Framework 6.0 and will log a warning. In order to align with
our existing behavior (throwing exceptions if the option cannot be set),
this commit ensures that exceptions are also thrown if the method is
marked as deprecated.

See gh-32461
 2022-09-29 18:55:41 +02:00
Brian Clozel
58f3054624 Adapt RestTemplate factory auto-detection 
This commit adapts the auto-detection of `ClientHttpRequestFactory` to
look for an httpclient5 class.

See gh-32461
 2022-09-29 18:55:41 +02:00
Brian Clozel
5fb2a50ad0 Adapt build dependencies to httpclient5 
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.

See gh-32461
 2022-09-29 18:55:41 +02:00
Stephane Nicoll
3702c71fc1 Adapt to Spring AOT changes 2022-09-29 18:55:41 +02:00
Stephane Nicoll
d478a020df Start building against Spring Framework 6.0.0-RC1 snapshots 
See gh-32550
 2022-09-29 18:55:26 +02:00
Scott Frederick
2e4529df27 Remove image banner smoke test 
See gh-28883
 2022-09-29 09:59:27 -05:00
Stephane Nicoll
f9e53d81b2 Merge pull request #32534 from dreis2211 
* pr/32534:
  Use ByteArrayOutputStream.toString where possible

Closes gh-32534
 2022-09-29 15:03:34 +02:00
dreis2211
65ef8fc51a Use ByteArrayOutputStream.toString where possible 
See gh-32534
 2022-09-29 15:03:24 +02:00
Andy Wilkinson
a036b30822 Merge branch '2.7.x' 2022-09-29 12:52:51 +01:00
Andy Wilkinson
c31d99d3a0 Merge branch '2.6.x' into 2.7.x 2022-09-29 12:52:37 +01:00
Andy Wilkinson
8a93abfaaa Improve diagnostics when run does not produce expected logging 2022-09-29 12:52:02 +01:00
Andy Wilkinson
17953eeb33 Merge branch '2.7.x' 
Closes gh-32544
 2022-09-29 11:41:15 +01:00
Andy Wilkinson
3ef633b096 Merge branch '2.6.x' into 2.7.x 
Closes gh-32543
 2022-09-29 11:39:42 +01:00
Andy Wilkinson
84a25c7dcf Configure Log4j2 classpath overrides consistently 
Closes gh-32537
 2022-09-29 11:25:21 +01:00
Andy Wilkinson
f10d696c46 Merge branch '2.7.x' 
Closes gh-32536
 2022-09-29 10:04:45 +01:00
Andy Wilkinson
9f5b7db553 Merge branch '2.6.x' into 2.7.x 
Closes gh-32535
 2022-09-29 10:04:19 +01:00
Andy Wilkinson
be48f37a83 Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp 
Closes gh-32533
 2022-09-29 10:03:52 +01:00
Stephane Nicoll
fa0fcb3a41 Merge pull request #32526 from dreis2211 
* pr/32526:
  Remove unused MockReactiveWebServerFactory

Closes gh-32526
 2022-09-29 09:33:41 +02:00
dreis2211
388134713e Remove unused MockReactiveWebServerFactory 
See gh-32526
 2022-09-29 09:33:29 +02:00
Stephane Nicoll
9359760ee5 Merge pull request #32519 from dreis2211 
* pr/32519:
  Avoid usage of StringBuffer where possible

Closes gh-32519
 2022-09-29 09:32:59 +02:00
dreis2211
f0b4a65546 Avoid usage of StringBuffer where possible 
See gh-32519
 2022-09-29 09:29:10 +02:00
Andy Wilkinson
0bfa9cd704 Upgrade to Logback 1.4 and SLF4J 2.0 
Closes gh-12649
 2022-09-28 21:14:08 +01:00
Andy Wilkinson
05d2f3cc8e Merge pull request #32528 from marcingrzejszczak 
* gh-32528:
  Polish "Break cycles between Zipkin senders and HTTP client observation"
  Break cycles between Zipkin senders and HTTP client observation

Closes gh-32528
 2022-09-28 20:33:41 +01:00
Andy Wilkinson
574242b44f Polish "Break cycles between Zipkin senders and HTTP client observation" 
See gh-32528
 2022-09-28 20:28:11 +01:00
Marcin Grzejszczak
b41ed44b60 Break cycles between Zipkin senders and HTTP client observation 
Previously, RestTemplateBuilder and WebClient.Builder beans were used
to create the HTTP client for sending out spans. Those same beans are
also instrumented for observability which results in a cycle.

This commit breaks the cycle by not using the application-web
builders to create the RestTemplate and WebClient's used by the Zipkin
senders. Instead, builders are created inline, with new callbacks
being introduced to allow the user to customize these Zipkin-specific
builders.

See gh-32528
 2022-09-28 20:11:44 +01:00
Andy Wilkinson
13c638ba39 Merge pull request #32529 from marcingrzejszczak 
* gh-32529:
  Polish "Prefer WebClient to RestTemplate for Zipkin's Sender"
  Prefer WebClient to RestTemplate for Zipkin's Sender

Closes gh-32529
 2022-09-28 19:07:40 +01:00