move logging to JdbcEnvironmentInitiator to JdbcLogging

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java

@@ -117,4 +117,25 @@ public interface JdbcLogging extends BasicLogger {
 					"""
 	)
 	void connectionProviderDisablesAutoCommitEnabled();
+
+	@LogMessage(level = DEBUG)
+	@Message(value = """
+			Database:
+				name: %s
+				version: %s
+				major: %s
+				minor: %s""",
+			id = 100017)
+	void logDatabaseInfo(String name, String version, int major, int minor);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = """
+			Driver:
+				name: %s
+				version: %s
+				major: %s
+				minor: %s
+				JDBC version: %s.%s""",
+			id = 100018)
+	void logDriverInfo(String name, String version, int major, int minor, int jdbcMajor, int jdbcMinor);
 }

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java

@@ -49,6 +49,8 @@
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER;
+
 import static java.lang.Integer.parseInt;
 import static org.hibernate.cfg.AvailableSettings.CONNECTION_HANDLING;
 import static org.hibernate.cfg.AvailableSettings.DIALECT_DB_MAJOR_VERSION;
@@ -430,29 +432,20 @@ private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException
 
 	private static void logDatabaseAndDriver(DatabaseMetaData dbmd) throws SQLException {
 		if ( log.isDebugEnabled() ) {
-			log.debugf(
-					"Database ->\n"
-							+ "	   name: %s\n"
-							+ "	version: %s\n"
-							+ "	  major: %s\n"
-							+ "	  minor: %s",
+			JDBC_MESSAGE_LOGGER.logDatabaseInfo(
 					dbmd.getDatabaseProductName(),
 					dbmd.getDatabaseProductVersion(),
 					dbmd.getDatabaseMajorVersion(),
 					dbmd.getDatabaseMinorVersion()
 			);
-			log.debugf(
-					"Driver ->\n"
-							+ "	   name: %s\n"
-							+ "	version: %s\n"
-							+ "	  major: %s\n"
-							+ "	  minor: %s",
+			JDBC_MESSAGE_LOGGER.logDriverInfo(
 					dbmd.getDriverName(),
 					dbmd.getDriverVersion(),
 					dbmd.getDriverMajorVersion(),
-					dbmd.getDriverMinorVersion()
+					dbmd.getDriverMinorVersion(),
+					dbmd.getJDBCMajorVersion(),
+					dbmd.getJDBCMinorVersion()
 			);
-			log.debugf( "JDBC version: %s.%s", dbmd.getJDBCMajorVersion(), dbmd.getJDBCMinorVersion() );
 		}
 	}