Skip to content

Commit 044d914

Browse files
committed
slight improvements to error messages when driver class missing
1 parent a9fb252 commit 044d914

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionCreator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected Connection makeConnection(String url, Properties connectionProps) {
3434
return DriverManager.getConnection( url, connectionProps );
3535
}
3636
catch (SQLException e) {
37-
throw convertSqlException( "Error calling DriverManager.getConnection()", e );
37+
throw convertSqlException( "Error calling JDBC 'DriverManager.getConnection()'", e );
3838
}
3939
}
4040
}

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ void synchronizationFailed(
517517
void unableToObtainConnectionMetadata(SQLException error);
518518

519519
@LogMessage(level = WARN)
520-
@Message(value = "Could not obtain connection to query metadata", id = 342)
520+
@Message(value = "Could not obtain connection to query JDBC database metadata", id = 342)
521521
void unableToObtainConnectionToQueryMetadata(@Cause Exception e);
522522

523523
@LogMessage(level = ERROR)

hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.lang.invoke.MethodHandles;
88
import java.sql.SQLException;
99

10+
import org.hibernate.cfg.JdbcSettings;
1011
import org.jboss.logging.BasicLogger;
1112
import org.jboss.logging.Logger;
1213
import org.jboss.logging.annotations.Cause;
@@ -45,7 +46,11 @@ public interface ConnectionInfoLogger extends BasicLogger {
4546
void logConnectionInfoDetails(String databaseConnectionInfo);
4647

4748
@LogMessage(level = WARN)
48-
@Message(id = 10001006, value = "No JDBC Driver class was specified by property `jakarta.persistence.jdbc.driver`, `hibernate.driver` or `javax.persistence.jdbc.driver`")
49+
@Message(id = 10001006,
50+
value = "No JDBC Driver class was specified by property '"
51+
+ JdbcSettings.JAKARTA_JDBC_DRIVER + "', '"
52+
+ JdbcSettings.JPA_JDBC_DRIVER + "', or '"
53+
+ JdbcSettings.DRIVER + "'")
4954
void jdbcDriverNotSpecified();
5055

5156
@LogMessage(level = DEBUG)

hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
/**
1414
* @author Yanming Zhou
1515
*/
16-
@SuppressWarnings("unchecked")
1716
public class SimpleBeanContainer implements BeanContainer {
1817

1918
public static final long INITIAL_VALUE = 23L;
2019

2120
@Override
21+
@SuppressWarnings("unchecked")
2222
public <B> ContainedBean<B> getBean(
2323
Class<B> beanType,
2424
LifecycleOptions lifecycleOptions,

0 commit comments

Comments
 (0)