HHH-19653 more improvements to JDBC connection log info

Author: gavinking

hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java

@@ -166,25 +166,25 @@ public boolean supportsAggressiveRelease() {
 
 	@Override
 	public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
-		final AgroalConnectionPoolConfiguration acpc =
-				agroalDataSource.getConfiguration().connectionPoolConfiguration();
-		final AgroalConnectionFactoryConfiguration acfc = acpc.connectionFactoryConfiguration();
+		final var poolConfig = agroalDataSource.getConfiguration().connectionPoolConfiguration();
+		final var connectionConfig = poolConfig.connectionFactoryConfiguration();
 		return new DatabaseConnectionInfoImpl(
 				AgroalConnectionProvider.class,
-				acfc.jdbcUrl(),
+				connectionConfig.jdbcUrl(),
 				// Attempt to resolve the driver name from the dialect,
 				// in case it wasn't explicitly set and access to the
 				// database metadata is allowed
-				acfc.connectionProviderClass() != null
-						? acfc.connectionProviderClass().toString()
+				connectionConfig.connectionProviderClass() != null
+						? connectionConfig.connectionProviderClass().toString()
 						: extractDriverNameFromMetadata(),
 				dialect.getVersion(),
-				Boolean.toString( acfc.autoCommit() ),
-				acfc.jdbcTransactionIsolation() != null && acfc.jdbcTransactionIsolation().isDefined()
-						? toIsolationNiceName( acfc.jdbcTransactionIsolation().level() )
+				Boolean.toString( connectionConfig.autoCommit() ),
+				connectionConfig.jdbcTransactionIsolation() != null
+					&& connectionConfig.jdbcTransactionIsolation().isDefined()
+						? toIsolationNiceName( connectionConfig.jdbcTransactionIsolation().level() )
 						: toIsolationNiceName( getIsolation( agroalDataSource ) ),
-				acpc.minSize(),
-				acpc.maxSize(),
+				poolConfig.minSize(),
+				poolConfig.maxSize(),
 				getFetchSize( agroalDataSource )
 		);
 	}

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

@@ -157,36 +157,16 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 
 	@Override
 	public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect, ExtractedDatabaseMetaData metaData) {
-		final String url;
-		final String driver;
-		final String isolationLevel;
-		final Integer fetchSize;
-		if ( metaData != null ) {
-			url = metaData.getUrl();
-			driver = metaData.getDriver();
-			isolationLevel =
-					toIsolationNiceName( metaData.getTransactionIsolation() )
-							+ " [default " + toIsolationNiceName( metaData.getDefaultTransactionIsolation() ) + "]";
-			final int defaultFetchSize = metaData.getDefaultFetchSize();
-			fetchSize = defaultFetchSize == -1 ? null : defaultFetchSize;
-		}
-		else {
-			url = null;
-			driver = null;
-			isolationLevel = null;
-			fetchSize = null;
-		}
-
 		return new DatabaseConnectionInfoImpl(
 				DatasourceConnectionProviderImpl.class,
-				url,
-				driver,
+				metaData == null ? null : metaData.getUrl(),
+				metaData == null ? null : metaData.getDriver(),
 				dialect.getVersion(),
 				null,
-				isolationLevel,
+				metaData == null ? null : isolationString( metaData ),
 				null,
 				null,
-				fetchSize
+				metaData != null ? fetchSize( metaData ) : null
 		) {
 			@Override
 			public String toInfoString() {
@@ -196,4 +176,14 @@ public String toInfoString() {
 			}
 		};
 	}
+
+	private static Integer fetchSize(ExtractedDatabaseMetaData metaData) {
+		final int defaultFetchSize = metaData.getDefaultFetchSize();
+		return defaultFetchSize == -1 ? null : defaultFetchSize;
+	}
+
+	private String isolationString(ExtractedDatabaseMetaData metaData) {
+		return toIsolationNiceName( metaData.getTransactionIsolation() )
+			   + " [default " + toIsolationNiceName( metaData.getDefaultTransactionIsolation() ) + "]";
+	}
 }