diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java index bbac56f6e6..a8b87b760e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,4 +48,12 @@ public class CannotGetJdbcConnectionException extends DataAccessResourceFailureE super(msg, ex); } + /** + * Constructor for CannotGetJdbcConnectionException. + * @param msg the detail message + * @param ex the root cause IllegalStateException + */ + public CannotGetJdbcConnectionException(String msg, IllegalStateException ex) { + super(msg, ex); + } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java index 6df9612eca..2b213e0d57 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java @@ -83,7 +83,7 @@ public abstract class DataSourceUtils { throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex); } catch (IllegalStateException ex) { - throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection: " + ex.getMessage()); + throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java new file mode 100644 index 0000000000..399b6894bc --- /dev/null +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java @@ -0,0 +1,61 @@ +/* + * Copyright 2002-2022 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.jdbc.datasource; + +import java.sql.SQLException; + +import javax.sql.DataSource; + +import org.junit.jupiter.api.Test; + +import org.springframework.jdbc.CannotGetJdbcConnectionException; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.BDDMockito.when; +import static org.mockito.Mockito.mock; + +/** + * Tests for {@link DataSourceUtils}. + * + * @author Kevin Schoenfeld + * @author Stephane Nicoll + */ +class DataSourceUtilsTests { + + @Test + void testConnectionNotAcquiredExceptionIsPropagated() throws SQLException { + DataSource dataSource = mock(DataSource.class); + when(dataSource.getConnection()).thenReturn(null); + assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) + .isInstanceOf(CannotGetJdbcConnectionException.class) + .hasMessageStartingWith("Failed to obtain JDBC Connection") + .hasCauseInstanceOf(IllegalStateException.class); + } + + @Test + void testConnectionSQLExceptionIsPropagated() throws SQLException { + DataSource dataSource = mock(DataSource.class); + when(dataSource.getConnection()).thenThrow(new SQLException("my dummy exception")); + assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) + .isInstanceOf(CannotGetJdbcConnectionException.class) + .hasMessageStartingWith("Failed to obtain JDBC Connection") + .cause().isInstanceOf(SQLException.class) + .hasMessage("my dummy exception"); + } + +} +