1225 Commits

Author SHA1 Message Date
Andy Wilkinson
5163bdab22 Merge branch '2.5.x'
Closes gh-27489
2021-07-26 11:26:39 +01:00
Andy Wilkinson
a71d19bce7 Merge branch '2.4.x' into 2.5.x
Closes gh-27488
2021-07-26 11:26:08 +01:00
Andy Wilkinson
388068cdff Polish "Sanitize URIs with non-alpha characters in their schemes"
See gh-27482
2021-07-26 11:13:58 +01:00
Billy Tobon
bafa9c4784 Sanitize URIs with non-alpha characters in their schemes
See gh-27482
2021-07-26 11:03:18 +01:00
Andy Wilkinson
355226c21e Merge branch '2.5.x'
Closes gh-27474
2021-07-23 13:09:37 +01:00
Andy Wilkinson
eaca9c7a83 Merge branch '2.4.x' into 2.5.x
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca Increase response timeout for server-bound WebTestClients
Closes gh-27472
2021-07-23 13:06:25 +01:00
Phillip Webb
7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
Andy Wilkinson
37f690323f Polish
Closes gh-27432
2021-07-21 11:55:38 +01:00
Andy Wilkinson
bb26b7bdf5 Polish
Closes gh-27431
2021-07-21 11:53:10 +01:00
izeye
734293d491 Polish
See gh-27418
2021-07-21 11:17:43 +01:00
Andy Wilkinson
c211c971f1 Polishing
Closes gh-27429
2021-07-21 11:07:15 +01:00
Andy Wilkinson
4a533e14c3 Merge branch '2.4.x' into 2.5.x
Closes gh-27428
2021-07-21 11:06:40 +01:00
dreis2211
4d0c98011e Polishing
See gh-27417
2021-07-21 11:05:59 +01:00
Andy Wilkinson
6f0b23502e Merge branch '2.5.x'
Closes gh-27347
2021-07-15 11:51:48 +01:00
Andy Wilkinson
d4159130a5 Merge branch '2.4.x' into 2.5.x
Closes gh-27346
2021-07-15 11:50:51 +01:00
Andy Wilkinson
7a23a12ce0 Fix configprops endpoint's handling of config tree values
Fixes gh-27327
2021-07-15 11:50:40 +01:00
Andy Wilkinson
e1049a55ff Avoid retrieving values from Record beyond session boundary
See gh-27294
2021-07-14 19:42:10 +01:00
Andy Wilkinson
9f9c89a357 Polish "Use server version from database in Neo4j health details"
See gh-27294
2021-07-14 17:40:43 +01:00
Gerrit Meier
f7fd0ac527 Use server version from database in Neo4j health details
See gh-27294
2021-07-14 17:37:40 +01:00
Andy Wilkinson
8db63db564 Merge branch '2.5.x'
Closes gh-27333
2021-07-14 17:19:59 +01:00
Andy Wilkinson
9a81d2fe09 Merge branch '2.4.x' into 2.5.x
Closes gh-27332
2021-07-14 17:19:39 +01:00
Andy Wilkinson
c005e1de9a Rename test classes to match our naming conventions
Closes gh-27331
2021-07-14 17:19:11 +01:00
Stephane Nicoll
dc5acb0019 Remove deprecated code flagged for removal
Closes gh-27303
2021-07-14 11:50:01 +02:00
Madhura Bhave
111ea31036 Merge branch '2.5.x' into main 2021-07-13 15:19:24 -07:00
Madhura Bhave
ed22e4a897 Merge branch '2.4.x' into 2.5.x 2021-07-13 15:18:40 -07:00
Madhura Bhave
23b377e1a1 Fix typo 2021-07-13 15:18:17 -07:00
Andy Wilkinson
9b82836f0e Merge branch '2.5.x'
Closes gh-27305
2021-07-13 14:56:36 +01:00
Andy Wilkinson
685b78f504 Merge branch '2.4.x' into 2.5.x
Closes gh-27304
2021-07-13 14:56:26 +01:00
Andy Wilkinson
49baacbc1c Polish "Mark Redis as down when cluster_state is fail"
See gh-27300
2021-07-13 14:56:01 +01:00
Hoan Vu Hong
f31141de09 Mark Redis as down when cluster_state is fail
See gh-27300
2021-07-13 14:35:59 +01:00
Andy Wilkinson
d21f8df1ad Polish "Auto-configure Jetty connection and SSL metrics"
See gh-26418
2021-07-13 14:01:15 +01:00
bono007
e6c43a32c8 Auto-configure Jetty connection and SSL metrics
See gh-26418
2021-07-13 14:01:15 +01:00
Stephane Nicoll
c16ef0a006 Upgrade to Neo4j Java Driver 4.3.3
Closes gh-27278
2021-07-12 09:13:10 +02:00
Phillip Webb
2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Andy Wilkinson
d635e1e779 Merge branch '2.4.x' into 2.5.x
Closes gh-26923
2021-06-16 08:28:05 +01:00
Andy Wilkinson
fe078c8afc Avoid capturing URI template when interceptor won't use it
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.

This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.

Fixes gh-26915
2021-06-16 08:27:51 +01:00
Andy Wilkinson
866f1e34c1 Merge branch '2.4.x' into 2.5.x
Closes gh-26873
2021-06-11 19:53:05 +01:00
Andy Wilkinson
37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test
Closes gh-26855
2021-06-11 19:48:34 +01:00
Andy Wilkinson
c5728c9560 Merge branch '2.4.x'
Closes gh-26827
2021-06-09 09:13:21 +01:00
Andy Wilkinson
303edac6bb Merge branch '2.3.x' into 2.4.x
Closes gh-26826
2021-06-09 09:13:06 +01:00
Andy Wilkinson
d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
2021-06-09 09:12:37 +01:00
Phillip Webb
850088de32 Merge branch '2.4.x'
Closes gh-26823
2021-06-08 18:17:33 -07:00
Phillip Webb
d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
2021-06-08 18:17:18 -07:00
Phillip Webb
1f6983c4c9 Make CompositeHealth.getDetails() public
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
2021-06-08 18:17:09 -07:00
Stephane Nicoll
5ac5038176 Merge branch '2.4.x' 2021-06-04 17:49:52 +02:00
Stephane Nicoll
aea8597114 Merge branch '2.3.x' into 2.4.x 2021-06-04 17:49:40 +02:00
Stephane Nicoll
6490edc16d Polish 2021-06-04 17:46:42 +02:00
Andy Wilkinson
b9abcba778 Merge branch '2.4.x'
Closes gh-26596
2021-05-19 13:38:20 +01:00