From fe6da39e1bf1fae0f5c725c9ffb7b28f386f9eec Mon Sep 17 00:00:00 2001 From: clove506 Date: Thu, 10 Oct 2019 14:21:16 +0800 Subject: [PATCH 1/2] Remove boxing See gh-18552 --- .../AbstractDataSourcePoolMetadataTests.java | 14 +++++++------- .../CommonsDbcp2DataSourcePoolMetadataTests.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java index c8023ad258..61ff661ab8 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java @@ -42,12 +42,12 @@ abstract class AbstractDataSourcePoolMetadataTests) (connection) -> null); - assertThat(getDataSourceMetadata().getActive()).isEqualTo(Integer.valueOf(0)); - assertThat(getDataSourceMetadata().getUsage()).isEqualTo(Float.valueOf(0)); + assertThat(getDataSourceMetadata().getActive()).isEqualTo(0); + assertThat(getDataSourceMetadata().getUsage()).isEqualTo((float) 0); } @Test void getPoolSizeOneConnection() { JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSourceMetadata().getDataSource()); jdbcTemplate.execute((ConnectionCallback) (connection) -> { - assertThat(getDataSourceMetadata().getActive()).isEqualTo(Integer.valueOf(1)); - assertThat(getDataSourceMetadata().getUsage()).isEqualTo(Float.valueOf(0.5F)); + assertThat(getDataSourceMetadata().getActive()).isEqualTo(1); + assertThat(getDataSourceMetadata().getUsage()).isEqualTo(0.5F); return null; }); } @@ -73,7 +73,7 @@ abstract class AbstractDataSourcePoolMetadataTests) (connection) -> null); - assertThat(getDataSourceMetadata().getIdle()).isEqualTo(Integer.valueOf(1)); + assertThat(getDataSourceMetadata().getIdle()).isEqualTo(1); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java index 2207eb82a6..d2a175774c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java @@ -61,7 +61,7 @@ class CommonsDbcp2DataSourcePoolMetadataTests @Test void getPoolUsageWithUnlimitedPool() { DataSourcePoolMetadata unlimitedDataSource = createDataSourceMetadata(0, -1); - assertThat(unlimitedDataSource.getUsage()).isEqualTo(Float.valueOf(-1F)); + assertThat(unlimitedDataSource.getUsage()).isEqualTo(-1F); } @Override From 40bd98a3f43e39a709e9624b6da6443327670c4e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 11 Oct 2019 10:35:19 -0500 Subject: [PATCH 2/2] Polish "Remove boxing" See gh-18552 --- .../jdbc/metadata/AbstractDataSourcePoolMetadataTests.java | 4 ++-- .../metadata/CommonsDbcp2DataSourcePoolMetadataTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java index 61ff661ab8..d2b6f35848 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java @@ -56,7 +56,7 @@ abstract class AbstractDataSourcePoolMetadataTests) (connection) -> null); assertThat(getDataSourceMetadata().getActive()).isEqualTo(0); - assertThat(getDataSourceMetadata().getUsage()).isEqualTo((float) 0); + assertThat(getDataSourceMetadata().getUsage()).isEqualTo(0f); } @Test @@ -64,7 +64,7 @@ abstract class AbstractDataSourcePoolMetadataTests) (connection) -> { assertThat(getDataSourceMetadata().getActive()).isEqualTo(1); - assertThat(getDataSourceMetadata().getUsage()).isEqualTo(0.5F); + assertThat(getDataSourceMetadata().getUsage()).isEqualTo(0.5f); return null; }); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java index d2a175774c..4652be4105 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java @@ -61,7 +61,7 @@ class CommonsDbcp2DataSourcePoolMetadataTests @Test void getPoolUsageWithUnlimitedPool() { DataSourcePoolMetadata unlimitedDataSource = createDataSourceMetadata(0, -1); - assertThat(unlimitedDataSource.getUsage()).isEqualTo(-1F); + assertThat(unlimitedDataSource.getUsage()).isEqualTo(-1f); } @Override