spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 10:59:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51599
This commit is contained in:
Andy Wilkinson
2026-09-07 08:26:42 +01:00
parent 58c321c8b8 4396a31e23
commit ea613dc511
149 changed files with 5 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetrics.java
-1
View File
@@ -65,7 +65,6 @@ public class DataSourcePoolMetrics implements MeterBinder {
}
@Override
@SuppressWarnings("NullAway") // Lambda isn't detected with the correct nullability
public void bindTo(MeterRegistry registry) {
if (this.metadataProvider.getDataSourcePoolMetadata(this.dataSource) != null) {
bindPoolMetadata(registry, "active",
module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProviderTests.java
-7
View File
@@ -38,31 +38,24 @@ import static org.mockito.BDDMockito.given;
class CompositeDataSourcePoolMetadataProviderTests {
@Mock
@SuppressWarnings("NullAway.Init")
private DataSourcePoolMetadataProvider firstProvider;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSourcePoolMetadata first;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSource firstDataSource;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSourcePoolMetadataProvider secondProvider;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSourcePoolMetadata second;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSource secondDataSource;
@Mock
@SuppressWarnings("NullAway.Init")
private DataSource unknownDataSource;
@BeforeEach