Commit Graph

1758 Commits

Author SHA1 Message Date
Moritz Halbritter
d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson
9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson
7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson
6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Stephane Nicoll
2dcb849c0f Merge branch '3.0.x'
Closes gh-34939
2023-04-11 16:39:00 +02:00
Stephane Nicoll
320db790e7 Merge branch '2.7.x' into 3.0.x
Closes gh-34938
2023-04-11 16:38:46 +02:00
Stephane Nicoll
4b8829364e Polish "Use removeIf rather than Iterator-based removal"
See gh-34762
2023-04-11 16:32:26 +02:00
SeasonPan
0d13e31827 Use removeIf rather than Iterator-based removal
See gh-34762
2023-04-11 16:20:43 +02:00
Stephane Nicoll
6876556b60 Upgrade to Json Path 2.8.0
Closes gh-34878
2023-04-06 16:25:23 +02:00
Phillip Webb
3dbc3a1943 Merge branch '3.0.x' 2023-03-23 23:01:32 -07:00
Mortitz Halbritter
42187e7bff Polish 2023-03-23 23:00:58 -07:00
Phillip Webb
da925242f3 Polish 'Add SanitizableData.withSanitizedValue method'
See gh-34615
2023-03-15 15:17:52 -07:00
Rohan Goyal
f789c9a56e Add SanitizableData.withSanitizedValue method
See gh-34615
2023-03-15 15:10:51 -07:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
abilan
dbbc0de25b Remove hints for Spring Integration Graph
Related to spring-projects/spring-integration#3994

Spring Integration's `IntegrationGraphServer` can be used without
actuator or even Spring Boot at all. It is more natural to have
respective reflection hints exposed by Spring Integration itself.
See related GH issue and its fix which just does a migration of the
remove code from `IntegrationGraphEndpoint`.

See gh-33924
2023-02-14 19:44:34 +00:00
Moritz Halbritter
81c8574bca Merge branch '2.7.x' into 3.0.x
Closes gh-34070
2023-02-06 10:38:57 +01:00
Moritz Halbritter
33288493aa Remove exception field from Health class
Closes gh-34030
2023-02-06 10:38:26 +01:00
Moritz Halbritter
0a080736d8 Merge branch '2.7.x' into 3.0.x
Closes gh-34017
2023-01-31 10:50:30 +01:00
Johnny Lim
5eeb429e44 Polish
See gh-33966
2023-01-31 10:48:30 +01:00
Krzysztof Krason
d3efd7e091 Use try with close
See gh-33987
2023-01-26 20:36:38 -08:00
Krzysztof Krason
0e68cae57f Use instanceof patterns
See gh-33987
2023-01-26 20:36:25 -08:00
Krzysztof Krason
6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Moritz Halbritter
f72f3579d0 Merge branch '2.7.x'
Closes gh-33919
2023-01-20 09:37:54 +01:00
Johnny Lim
ebde850031 Add Javadoc since to OperationParameter.getAnnotation()
See gh-33914
2023-01-20 09:36:57 +01:00
Phillip Webb
71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb
7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter
94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter
e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2023-01-18 16:56:42 +01:00
Phillip Webb
a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb
a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter
6dd7ac0821 Merge branch '2.7.x'
Closes gh-33856
2023-01-17 14:34:37 +01:00
Moritz Halbritter
d7852cb176 Log failing calls to health indicators
See gh-33774
2023-01-17 14:33:53 +01:00
Moritz Halbritter
f08842019e Merge branch '2.7.x'
Closes gh-33841
2023-01-16 11:34:31 +01:00
Moritz Halbritter
96175a8e50 Use OperationParameter consistently
Closes gh-31240
2023-01-16 11:23:21 +01:00
Moritz Halbritter
52760f6b78 Merge branch '2.7.x'
Closes gh-33756
2023-01-11 13:42:11 +01:00
Moritz Halbritter
0c65c41adf Polish 2023-01-11 11:29:58 +01:00
Moritz Halbritter
c5b5449a07 Fix assertions in ThreadDumpEndpointTests 2023-01-11 10:48:57 +01:00
Phillip Webb
a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Phillip Webb
1621cfd578 Merge branch '2.7.x' 2023-01-09 15:44:44 -08:00
Phillip Webb
232807d388 Increase block timeout 2023-01-09 15:17:47 -08:00
Krzysztof Krason
cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb
e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Scott Frederick
fead976952 Adapt to changes in Couchbase client
See gh-33588
2022-12-21 11:48:39 -06:00
Moritz Halbritter
08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter
725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Phillip Webb
93f8dc76ab Fix Neo4jReactiveHealthIndicator NoSuchElementException
Update `Neo4jReactiveHealthIndicator` to ensure that `result.records()`
is called before `result.consume()`. Prior to this commit, the indicator
used `zipWith` to merge records with a summary. This worked with the
previous RxJava based driver, but fails with the Reactor based driver
due to a `NoSuchElementException: Source was empty` error.

Fixes gh-33428
2022-11-30 21:03:49 -08:00
Phillip Webb
8849f72ac5 Merge branch '2.7.x' 2022-11-30 21:01:25 -08:00
Phillip Webb
06c6dafee2 Add Neo4jReactiveHealthIndicatorIntegrationTests
Add a full integration test for `Neo4jReactiveHealthIndicator`
to ensure that it works against a real server.

See gh-33428
2022-11-30 21:01:12 -08:00
Phillip Webb
8481004420 Polish 2022-11-30 21:01:12 -08:00
Johnny Lim
6027508cf7 Polish
See gh-33108
2022-11-16 10:00:36 +01:00
Brian Clozel
932f7d705f Start building against Spring Framework 6.0.0 SNAPSHOTs
See gh-33136
2022-11-14 16:40:30 +01:00
Phillip Webb
3d2071d044 Migrate endpoints to return OperationResponseBody types
Update types returned from endpoints to implement the
`OperationResponseBody` interface. This ensures that they will be
serialized using the isolated actuator `ObjectMapper`.

See gh-20291
2022-11-09 22:17:16 -08:00
Phillip Webb
1f8493fb29 Support isolated actuator ObjectMapper
Add `OperationResponseBody` tagging interface that can be used
to trigger the use of an isolated ObjectMapper specifically for
actuator responses.

The isolated mapper is provided by an `EndpointObjectMapper`
bean which is auto-configured unless specifically disabled
by the user.

WebMVC, WebFlux and Jersey integrations have been updated
to provide a link between the `OperationResponseBody` type
and the endpoint `ObjectMapper`.

See gh-20291
2022-11-09 22:17:13 -08:00
Andy Wilkinson
3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059
Closes gh-33050
2022-11-08 11:01:15 +00:00
Andy Wilkinson
b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2022-11-07 17:33:38 +00:00
Phillip Webb
179aa987ee Unify actuator descriptor class names
Update actuator endpoints to consistently use `...Descriptor` for
JSON support classes.

Closes gh-33022
2022-11-05 20:15:35 -07:00
Andy Wilkinson
9472cb2db7 Polish 2022-11-04 17:44:50 +00:00
Andy Wilkinson
edecebb641 Upgrade to Neo4j Java Driver 5.2.0
Closes gh-33008
2022-11-04 17:23:01 +00:00
Phillip Webb
9856286a2d Refine actuator httpexhanges naming
See gh-32885
2022-10-28 12:50:59 -07:00
Andy Wilkinson
29f7a596fe Polish 2022-10-28 08:57:00 +01:00
Phillip Webb
3e50836b1a Rename httptrace endpoint and related classes to httpexchanges
Rename `/actuator/httptrace` to `/actuator/httpexchanges` to better
describe its purpose and to remove confusion with distribute tracing.

This change also takes the opportunity to improve the code by making
the `HttpExchange` class (previously `HttpTrace`) fully immutable.

Closes gh-32885

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-10-27 16:34:42 -07:00
Johnny Lim
5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Phillip Webb
a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb
4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Phillip Webb
c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Phillip Webb
d7ac20cd6c Update copyright year of changed files 2022-10-25 15:47:30 -07:00
Andy Wilkinson
99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson
b7fb345709 Revert workaround for multiple ImportRuntimeHints
Closes gh-32830
2022-10-24 10:20:50 +01:00
Johnny Lim
fc61690675 Add missing @Test to sanitizeLists()
See gh-32792
2022-10-21 12:05:44 +01:00
Sébastien Deleuze
4e131bd627 Provide a workaround to allow multiple @ImportRuntimeHints
Provide a workaround for spring-projects/spring-framework#29361 so
that multiple `@ImportRuntimeHints` can be used in a type hierarchy.

The commit should cover Actuator web endpoint use cases with the
exception of Cloud Foundry endpoints which are not possible due to
package access issues.

See gh-29361
2022-10-20 17:12:58 -07:00
Brian Clozel
685fa900f8 Auto-configure Observation instrumentation for WebFlux
Prior to this commit, Spring Boot would offer a specific Metrics
instrumentation for WebFlux applications through a `WebFilter` and
custom Tag providers.

As of Spring Framework 6.0, the Observation instrumentation is done
directly in WebFlux, also with a `WebFilter`. While this allows both
metrics and traces, some features cannot be supported in the same way
with this new infrastructure.
The former `WebFilter` has been removed and the Tagging infrastructure
deprecated in favor of custom Observation conventions. This commit
provides an adapter layer so that developers can refactor their custom
tagging solution to the convention way, during the deprecation phase,
without losing any feature.

Closes gh-32539
2022-10-20 15:29:31 +02:00
Brian Clozel
9948fc3e39 Use GraphQL Observation instrumentation
This commit migrates the existing metrics support (added in #29140) to
the new `Observation` instrumentation contributed in
spring-projects/spring-graphql#501.

We cannot have a smoother migration path here as the instrumentation
does not use the same context information for metadata extraction.

Closes gh-32794
2022-10-19 22:06:40 +02:00
Madhura Bhave
ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
Brian Clozel
b2fe807d47 Move MVC metrics to Observation auto-configuration
This commit moves the entire Metrics auto-configuration for Spring MVC
to the new `Observation` API and the instrumentation contributed in
Spring Framework.

Closes gh-32538
2022-10-19 19:33:31 +02:00
Phillip Webb
07dd388b58 Merge branch '2.7.x'
Closes gh-32776
2022-10-18 15:51:27 -07:00
Phillip Webb
8dec296dfd Merge branch '2.6.x' into 2.7.x
Closes gh-32775
2022-10-18 15:49:51 -07:00
Phillip Webb
de111dba5c Polish 'Add DataSize serializer for configprops endpoint'
See gh-32645
2022-10-18 15:46:56 -07:00
Guirong Hu
3b25132e38 Add DataSize serializer for configprops endpoint
See gh-32645
2022-10-18 15:46:33 -07:00
Phillip Webb
e3df6c5b6f Move @ConstructorBinding annotation and support add default support
Relocate `@ConstructorBinding` from the `boot.context.properties`
package to `boot.context.properties.bind` and update the
`DefaultBindConstructorProvider` to support it.

Closes gh-32660
2022-10-18 00:59:45 -07:00
Brian Clozel
5cee828546 Fix javadoc warnings in HTTP Observation support 2022-10-17 23:06:30 +02:00
Brian Clozel
cbca457eff Adapt to HTTP Observation changes in Framework
This commit adapts to the renames/package changes in the HTTP
Observation support in Spring Framework.

See spring-projects/spring-framework#29334
2022-10-17 22:46:06 +02:00
Andy Wilkinson
7852c45a77 Generate reflection hints for loggers endpoint's responses
Some of the types that are returned are hidden behind a
Map<String, Object> so the operation annotations already been marked
as reflective isn't sufficient.

This commit uses `@RegisterReflectionForBinding` to register the
types that are used as (nested) values in the response maps.

Closes gh-32486
2022-10-12 15:56:22 +01:00
Stephane Nicoll
cbf24bd1cd Upgrade to Elasticsearch Client 8.4.3
Closes gh-32671
2022-10-11 12:42:17 +02:00
Johnny Lim
73fd760137 Polish HTTP client observability changes
See gh-32484
See gh-32518

Closes gh-32636
2022-10-07 19:05:14 +02:00
Brian Clozel
d25fc73dae Upgrade to Neo4J Java Driver 5.0.0
Closes gh-32620
2022-10-06 19:46:31 +02:00
Andy Wilkinson
7c4e46e538 Allow thread dump endpoint to call ThreadMXBean in a native image
Closes gh-31680
2022-10-04 17:09:22 +01:00
Phillip Webb
e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2022-10-04 00:29:22 -07: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
Brian Clozel
5b092f5d80 Polish
See gh-32518
2022-09-30 12:52:22 +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
Brian Clozel
eac50a8f0c Auto-configure Observation support for RestTemplate
Prior to this commit, Spring Boot would auto-configure a customizer that
instruments `RestTemplate` through a `RestTemplateBuilder`. This would
install a request interceptor that instrumented client exchanges for
producing metrics.

As of spring-projects/spring-framework#28341, the instrumentation is
done at the `RestTemplate` level directly using the `Observation` API.
The `Tag` (now `KeyValue`) extraction, observation name and
instrumentation behavior now lives in the Spring Framework project.

This commit updates the auto-configuration to switch from Boot-specific
Metrics instrumentation to a generic Observation instrumentation.
As a migration path, some configuration properties are deprecated in
favor of the new `management.observations.*` namespace.

Closes gh-32484
2022-09-27 22:19:01 +02:00
Stephane Nicoll
bac1bfcd1c Merge branch '2.7.x'
Closes gh-32514
2022-09-27 08:41:35 +02:00
Stephane Nicoll
eb4b0a3f3c Merge branch '2.6.x' into 2.7.x
Closes gh-32513
2022-09-27 08:41:20 +02:00
Stephane Nicoll
8f598f876b Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator"
See gh-32505
2022-09-27 08:34:22 +02:00
Mico Piira
f51c4c3df0 Use non-blocking API in CouchbaseReactiveHealthIndicator
See gh-32505
2022-09-27 08:31:57 +02:00
Andy Wilkinson
5cb68eab1e Remove HotSpot specifics from HeapDumper strategy interface
Closes gh-27533
2022-09-16 12:53:43 +01:00
Madhura Bhave
b44a7e242c Support Mongo's Stable API in MongoHealthIndicator
Closes gh-30849
2022-09-15 16:48:22 -07:00
Stephane Nicoll
26cec61f32 Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29135
2022-09-12 15:39:03 +02:00
Andy Wilkinson
aafceb3868 Merge branch '2.7.x'
Closes gh-32285
2022-09-09 16:47:06 +01:00
Andy Wilkinson
f17df7bf30 Merge branch '2.6.x' into 2.7.x
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson
23c2f73b3f Update tests to allow them to run on Java 19
Closes gh-32280
2022-09-09 16:46:14 +01:00
Phillip Webb
46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Johnny Lim
2273191c03 Polish
See gh-32215
2022-09-07 08:48:08 +02:00
Andy Wilkinson
25e6c533d9 Polish "Add path to DiskSpaceHealthIndicator's details and log message"
See gh-31998
2022-09-05 13:16:12 +01:00
rreich
36f9230f01 Add path to DiskSpaceHealthIndicator's details and log message
See gh-31998
2022-09-05 13:15:56 +01:00
Andy Wilkinson
795ea289db Adapt to BindingReflectionHintsRegistrar moving package 2022-09-02 19:46:02 +01:00
Andy Wilkinson
cf8e84d406 Adapt to BindingReflectionHintsRegistrar moving into spring-core 2022-09-02 17:34:29 +01:00
Phillip Webb
44f1949c5e Polish hint API calls 2022-09-01 19:43:43 -07:00
Madhura Bhave
47effdcade Support role-based sanitization for actuator endpoints
Closes gh-32156
2022-08-24 16:03:58 -07:00
Stephane Nicoll
24a52aa66d Annotate actuator internal infrastructure with @Reflective
This commit simplifies the registration of hints for the infrastructure
of the Actuator that is invoked via reflection.
2022-08-17 17:25:06 +02:00
Stephane Nicoll
6d2d67b0bc Merge branch '2.7.x'
Closes gh-32050
2022-08-10 09:16:15 +02:00
Vedran Pavic
0e6cf07ec9 Polish LogFileWebEndpoint
See gh-32049
2022-08-10 09:12:57 +02:00
Andy Wilkinson
ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave
0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Johnny Lim
6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Brian Clozel
38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Phillip Webb
22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Phillip Webb
e08c16dfd6 Polish 2022-07-29 12:10:02 +01:00
Phillip Webb
b68e43f5fd Merge branch '2.7.x' 2022-07-27 19:23:05 +01:00
Phillip Webb
2382e8322b Merge branch '2.6.x' into 2.7.x 2022-07-27 19:22:45 +01:00
Phillip Webb
2709f77ab9 Collect to named contributors to LinkedHashMap
Update `NamedContributorsMapAdapter` to collect items to a
`LinkedHashMap` rather than a `HashMap`.

See gh-31676
2022-07-27 18:46:42 +01:00
Stephane Nicoll
c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2022-07-27 09:23:39 +02:00
Stephane Nicoll
53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2022-07-27 09:23:05 +02:00
Stephane Nicoll
9cb614c626 Migrate Hazelcast 3 sanity tests to Hazelcast 4
Closes gh-31881
2022-07-27 09:09:35 +02:00
Adrian Bob
aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2022-07-27 08:16:48 +02:00
Stephane Nicoll
782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2022-07-27 08:15:53 +02:00
Phillip Webb
94ca5b5b53 Merge branch '2.7.x'
Closes gh-31880
2022-07-26 18:16:44 +01:00
Phillip Webb
bfc703a40d Merge branch '2.6.x' into 2.7.x
Closes gh-31879
2022-07-26 18:16:13 +01:00
Phillip Webb
59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2022-07-26 18:15:32 +01:00
Guirong Hu
c530f12cc3 Call the value adapter during NamedContributorsMapAdapter construction
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.

See gh-31676
2022-07-26 18:15:32 +01:00
Phillip Webb
7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Vedran Pavic
f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2022-07-20 15:44:00 +01:00
Andy Wilkinson
1acc7857e6 Merge branch '2.7.x'
Closes gh-31807
2022-07-20 10:52:30 +01:00
Andy Wilkinson
84efc89d76 Merge branch '2.6.x' into 2.7.x
Closes gh-31806
2022-07-20 10:52:00 +01:00
Andy Wilkinson
bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function
Closes gh-31784
2022-07-20 10:42:56 +01:00
Andy Wilkinson
f29eed89ca Reinstate merge of pull request #31713 from dreis2211
This reverts commit 8deef6cb42.
2022-07-19 19:57:24 +01:00
Andy Wilkinson
8deef6cb42 Revert "Merge pull request #31713 from dreis2211"
This reverts commit 590bfd8a5c, reversing
changes made to 993e1bf5f2.
2022-07-19 17:29:14 +01:00
Andy Wilkinson
5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Moritz Halbritter
0291388f2a Polish 2022-07-19 14:26:00 +02:00
Moritz Halbritter
13c920b2a9 Add AOT support for ReactiveHealthEndpointWebExtension
See gh-31530
2022-07-19 14:24:20 +02:00
Stephane Nicoll
51cba6ec72 Polish "Add AOT support for actuator"
See gh-31671
2022-07-19 13:02:49 +02:00
Moritz Halbritter
584b7d1343 Add AOT support for actuator
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.

See gh-31671
2022-07-19 13:02:48 +02:00
dreis2211
5adccb7857 Fix deprecations in javadocs
See gh-31713
2022-07-18 14:31:21 +02:00
Andy Wilkinson
3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Madhura Bhave
7c56a45d3e Drop support for String path matching for MVC endpoints
Closes gh-31700
2022-07-13 14:03:32 -07:00
Stephane Nicoll
8e3aaf1cf4 Merge branch '2.7.x'
Closes gh-31707
2022-07-13 14:12:28 +02:00
Stephane Nicoll
3e4a5703c6 Merge branch '2.6.x' into 2.7.x
Closes gh-31706
2022-07-13 14:11:44 +02:00
Stephane Nicoll
628a7b0c5c Update copyright year of changed files
See gh-31516
2022-07-13 14:08:22 +02:00
“Jakub
ed7b333138 Add missing descriptions for HTTP Server and Data repositories metrics
See gh-31516
2022-07-13 13:55:36 +02:00
Stephane Nicoll
9cace34a19 Merge branch '2.7.x'
Closes gh-31705
2022-07-13 13:50:36 +02:00
Stephane Nicoll
b8647551cb Merge branch '2.6.x' into 2.7.x
Closes gh-31704
2022-07-13 13:50:17 +02:00
Johnny Lim
b17cb9b92b Polish gh-31231
See gh-31540
2022-07-13 13:49:13 +02:00
Madhura Bhave
d66e108703 Revert actuator changes related to path pattern parsing
See gh-31547
2022-07-12 15:25:41 -07:00
Madhura Bhave
7954f5e566 Adapt to change in default strategy for URL path matching in Spring MVC
Closes gh-31547
2022-07-12 09:59:44 -07:00
Andy Wilkinson
efc5391496 Adapt to deprecations in Framework's scheduling APIs
See gh-31241
2022-07-08 17:53:55 +01:00
Moritz Halbritter
d58f33f1ce Polish AbstractExposableEndpoint 2022-07-08 16:16:53 +02:00
Moritz Halbritter
96c0e4783b Polish ShutdownEndpoint 2022-07-08 16:14:04 +02:00
Moritz Halbritter
8639552405 Start building against Micrometer Tracing 1.0.0-M6 snapshots
See gh-31657
2022-07-08 14:01:13 +02:00
Andy Wilkinson
7f00378eaf Polish "Start building against Spring Data 2022.0.0-M5 snapshots"
See gh-31582
2022-07-07 16:32:13 +01:00
Andy Wilkinson
e9136e023b Adapt to trailing slashes no longer being matched by default
See gh-31563
2022-07-07 14:16:20 +01:00
Andy Wilkinson
97d96eebdf Adapt ControllerEndpointHandlerMapping to PathPatternParser default
See gh-31547
2022-07-07 14:15:23 +01:00
dreis2211
458f989cf3 Use switch expressions where appropriate
See gh-31527
2022-06-24 16:19:28 +01:00
Andy Wilkinson
631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
dreis2211
5db04da275 Use pattern matching for instanceof where appropriate
See gh-31475
2022-06-20 17:55:36 +01:00
Phillip Webb
85dcbf6100 Merge branch '2.7.x'
Closes gh-31385
2022-06-14 09:38:36 -07:00
Phillip Webb
e0947459b6 Merge branch '2.6.x' into 2.7.x
Closes gh-31384
2022-06-14 09:38:05 -07:00
Phillip Webb
9f8a262e6b Log a warning when a health indicator takes too long to run
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
2022-06-14 09:32:07 -07:00
Stephane Nicoll
b0f5fb51fc Adapt to deprecation of NestedServletException 2022-06-14 17:45:31 +02:00
Andy Wilkinson
bf56665718 Polish "Add PUT shutdown operation for Prometheus Push Gateway"
See gh-31104
2022-05-26 20:04:09 +01:00
Mattia Cansirro Cortorillo
0f99c43198 Add PUT shutdown operation for Prometheus Push Gateway
See gh-31104
2022-05-26 19:58:53 +01:00
Andy Wilkinson
4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson
5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31 Merge branch '2.6.x' into 2.7.x
Closes gh-31174
2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11
Closes gh-31054
2022-05-18 11:33:55 +01:00
Phillip Webb
ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Scott Frederick
8a1c8b5c2c Fix deprecation warning
See gh-30978
2022-05-17 19:25:24 -05:00
Scott Frederick
8e38e28e94 Merge branch '2.7.x' 2022-05-17 18:47:13 -05:00
Scott Frederick
03deb1d067 Merge branch '2.6.x' into 2.7.x
Closes gh-31089
2022-05-17 18:46:59 -05:00
Scott Frederick
f395cfa255 Merge branch '2.5.x' into 2.6.x
Closes gh-31088
2022-05-17 18:46:38 -05:00
Scott Frederick
50e27333d2 Tolerate failures when recording WebClient metrics
Fixes gh-30978
2022-05-17 18:45:37 -05:00
Andy Wilkinson
3892b56a32 Adapt to breaking changes in Couchbase Driver 3.3
See gh-31031
2022-05-13 15:34:11 +01:00
Andy Wilkinson
c2a3652709 Merge branch '2.7.x' 2022-05-12 11:53:46 +01:00
Andy Wilkinson
7e88daf288 Update messages for APIs deprecated in 2.7
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.

See gh-30903
2022-05-12 11:12:09 +01:00
Andy Wilkinson
69a88b1938 fixup! Upgrade to Couchbase Client 3.3.0 2022-05-10 19:04:11 +01:00
Andy Wilkinson
3db1715694 Merge branch '2.7.x' 2022-05-06 18:15:38 +01:00