clean up formatters and remove TypeConfigurationWrapperOptions

It's wrong to build a WrapperOptions from a TypeConfiguration

hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java

@@ -45,14 +45,8 @@ public class H2DurationIntervalSecondJdbcType implements JdbcType {
 
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return (appender, value, dialect, wrapperOptions) -> dialect.appendIntervalLiteral(
+		return (appender, value, dialect, wrapperOptions) ->
-				appender,
+				dialect.appendIntervalLiteral( appender, javaType.unwrap( value, Duration.class, wrapperOptions ) );
-				javaType.unwrap(
-						value,
-						Duration.class,
-						wrapperOptions
-				)
-		);
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java

@@ -63,9 +63,11 @@ public class OracleEnumJdbcType implements JdbcType {
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
 		@SuppressWarnings("unchecked")
 		final Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) javaType.getJavaType();
-		return (appender, value, dialect, wrapperOptions)
+		return (appender, value, dialect, wrapperOptions) -> {
-				-> appender.appendSql( dialect.getEnumTypeDeclaration( enumClass )
+			appender.appendSql( dialect.getEnumTypeDeclaration( enumClass ) );
-						+ "." + ((Enum<?>) value).name() );
+			appender.appendSql( '.' );
+			appender.appendSql( ((Enum<?>) value).name() );
+		};
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java

@@ -64,9 +64,12 @@ public class PostgreSQLEnumJdbcType implements JdbcType {
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
 		@SuppressWarnings("unchecked")
 		final Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) javaType.getJavaType();
-		return (appender, value, dialect, wrapperOptions)
+		return (appender, value, dialect, wrapperOptions) -> {
-				-> appender.appendSql( "'" + ((Enum<?>) value).name() + "'::"
+			appender.appendSql( "'" );
-						+ dialect.getEnumTypeDeclaration( enumClass ) );
+			appender.appendSql( ((Enum<?>) value).name() );
+			appender.appendSql( "'::" );
+			appender.appendSql( dialect.getEnumTypeDeclaration( enumClass ) );
+		};
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java

@@ -70,14 +70,8 @@ public class PostgreSQLIntervalSecondJdbcType implements AdjustableJdbcType {
 
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return (appender, value, dialect, wrapperOptions) -> dialect.appendIntervalLiteral(
+		return (appender, value, dialect, wrapperOptions) ->
-				appender,
+				dialect.appendIntervalLiteral( appender, javaType.unwrap( value, Duration.class, wrapperOptions ) );
-				javaType.unwrap(
-						value,
-						Duration.class,
-						wrapperOptions
-				)
-		);
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java

@@ -23,7 +23,7 @@ import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * A set of operations providing support for aggregate column types
- * in a certain {@link Dialect SQL dialect}.
+ * in a certain {@linkplain Dialect SQL dialect}.
  *
  * @since 6.2
  */

hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect.aggregate;
 
+import org.hibernate.HibernateException;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.model.relational.Namespace;
@@ -37,7 +38,6 @@ import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.StructJdbcType;
 import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
-import org.hibernate.type.internal.TypeConfigurationWrapperOptions;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.util.LinkedHashMap;
@@ -76,26 +76,15 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 
 	public static AggregateSupport valueOf(Dialect dialect) {
 		final DatabaseVersion version = dialect.getVersion();
-		switch ( version.getMajor() ) {
+		return switch ( version.getMajor() ) {
-			case 12:
+			case 12, 13, 14, 15, 16, 17 -> V12_INSTANCE;
-			case 13:
+			case 18 -> V18_INSTANCE;
-			case 14:
+			case 19, 20 -> V19_INSTANCE;
-			case 15:
+			case 21, 22 -> V21_INSTANCE;
-			case 16:
+			default -> version.isSameOrAfter( 23 )
-			case 17:
-				return V12_INSTANCE;
-			case 18:
-				return V18_INSTANCE;
-			case 19:
-			case 20:
-				return V19_INSTANCE;
-			case 21:
-			case 22:
-				return V21_INSTANCE;
-		}
-		return version.isSameOrAfter( 23 )
 					? OracleAggregateSupport.V23_INSTANCE
 					: OracleAggregateSupport.LEGACY_INSTANCE;
+		};
 	}
 
 	@Override
@@ -132,7 +121,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 								final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) column.getJdbcMapping().getJdbcType()
 										.getJdbcLiteralFormatter( column.getJdbcMapping().getMappedJavaType() );
 								final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-								final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+								final WrapperOptions wrapperOptions = getWrapperOptions( typeConfiguration );
 								final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
 								final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
 								return template.replace(
@@ -242,7 +231,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 						final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) column.getJdbcMapping().getJdbcType()
 								.getJdbcLiteralFormatter( column.getJdbcMapping().getMappedJavaType() );
 						final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-						final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+						final WrapperOptions wrapperOptions = getWrapperOptions( typeConfiguration );
 						final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
 						final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
 						return template.replace(
@@ -318,6 +307,15 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
+	private static WrapperOptions getWrapperOptions(TypeConfiguration typeConfiguration) {
+		try {
+			return typeConfiguration.getSessionFactory().getWrapperOptions();
+		}
+		catch (HibernateException e) {
+			return null;
+		}
+	}
+
 	private static String xmlExtractArguments(String aggregateParentReadExpression, String xpathFragment) {
 		final String extractArguments;
 		int separatorIndex;
@@ -433,7 +431,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 						final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) jdbcMapping.getJdbcType()
 								.getJdbcLiteralFormatter( jdbcMapping.getMappedJavaType() );
 						final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-						final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+						final WrapperOptions wrapperOptions = getWrapperOptions( typeConfiguration );
 						final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
 						final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
 						return "decode(" + customWriteExpression + "," + trueLiteral + ",'true'," + falseLiteral + ",'false')";
@@ -458,7 +456,7 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 				final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) jdbcMapping.getJdbcType()
 						.getJdbcLiteralFormatter( jdbcMapping.getMappedJavaType() );
 				final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-				final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+				final WrapperOptions wrapperOptions = getWrapperOptions( typeConfiguration );
 				final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
 				final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
 				return "decode(" + customWriteExpression + "," + trueLiteral + ",'true'," + falseLiteral + ",'false')";

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java

@@ -31,9 +31,9 @@ public interface JdbcLiteralFormatter<T> extends Serializable {
 	 * @return the SQL literal as a string
 	 */
 	default String toJdbcLiteral(T value, Dialect dialect, WrapperOptions wrapperOptions) {
-		final StringBuilder sb = new StringBuilder();
+		final StringBuilder result = new StringBuilder();
-		appendJdbcLiteral( new StringBuilderSqlAppender( sb ), value, dialect, wrapperOptions );
+		appendJdbcLiteral( new StringBuilderSqlAppender( result ), value, dialect, wrapperOptions );
-		return sb.toString();
+		return result.toString();
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java

@@ -118,7 +118,8 @@ public interface JdbcType extends Serializable {
 	 */
 	// todo (6.0) : move to {@link org.hibernate.metamodel.mapping.JdbcMapping}?
 	default <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return (appender, value, dialect, wrapperOptions) -> appender.appendSql( value.toString() );
+		return (appender, value, dialect, wrapperOptions) ->
+				appender.appendSql( value.toString() );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java

@@ -23,11 +23,10 @@ public class JdbcLiteralFormatterArray<T> extends BasicJdbcLiteralFormatter<T> {
 
 	@Override
 	public void appendJdbcLiteral(SqlAppender appender, Object value, Dialect dialect, WrapperOptions wrapperOptions) {
-		dialect.appendArrayLiteral(
+		dialect.appendArrayLiteral( appender, unwrapArray( value, wrapperOptions ), elementFormatter, wrapperOptions );
-				appender,
+	}
-				unwrap( value, Object[].class, wrapperOptions ),
+
-				elementFormatter,
+	private Object[] unwrapArray(Object value, WrapperOptions wrapperOptions) {
-				wrapperOptions
+		return unwrap( value, Object[].class, wrapperOptions );
-		);
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java

@@ -32,58 +32,26 @@ public class JdbcLiteralFormatterTemporal<T> extends BasicJdbcLiteralFormatter<T
 	public void appendJdbcLiteral(SqlAppender appender, Object value, Dialect dialect, WrapperOptions options) {
 		final TimeZone jdbcTimeZone = getJdbcTimeZone( options );
 		// for performance reasons, avoid conversions if we can
-		if ( value instanceof java.util.Date ) {
+		if ( value instanceof java.util.Date date ) {
-			dialect.appendDateTimeLiteral(
+			dialect.appendDateTimeLiteral( appender, date, precision, jdbcTimeZone );
-					appender,
-					(java.util.Date) value,
-					precision,
-					jdbcTimeZone
-			);
 		}
-		else if ( value instanceof java.util.Calendar ) {
+		else if ( value instanceof java.util.Calendar calendar ) {
-			dialect.appendDateTimeLiteral(
+			dialect.appendDateTimeLiteral( appender, calendar, precision, jdbcTimeZone );
-					appender,
-					(java.util.Calendar) value,
-					precision,
-					jdbcTimeZone
-			);
 		}
-		else if ( value instanceof TemporalAccessor ) {
+		else if ( value instanceof TemporalAccessor temporalAccessor ) {
-			dialect.appendDateTimeLiteral(
+			dialect.appendDateTimeLiteral( appender, temporalAccessor, precision, jdbcTimeZone );
-					appender,
-					(TemporalAccessor) value,
-					precision,
-					jdbcTimeZone
-			);
 		}
 		else {
-			switch ( precision ) {
+			dialect.appendDateTimeLiteral( appender, unwrap( value, options ), precision, jdbcTimeZone );
-				case DATE:
-					dialect.appendDateTimeLiteral(
-							appender,
-							unwrap( value, java.sql.Date.class, options ),
-							precision,
-							jdbcTimeZone
-					);
-					break;
-				case TIME:
-					dialect.appendDateTimeLiteral(
-							appender,
-							unwrap( value, java.sql.Time.class, options ),
-							precision,
-							jdbcTimeZone
-					);
-					break;
-				default:
-					dialect.appendDateTimeLiteral(
-							appender,
-							unwrap( value, java.util.Date.class, options ),
-							precision,
-							jdbcTimeZone
-					);
-					break;
 		}
 	}
+
+	private java.util.Date unwrap(Object value, WrapperOptions options) {
+		return switch ( precision ) {
+			case DATE -> unwrap( value, java.sql.Date.class, options );
+			case TIME -> unwrap( value, java.sql.Time.class, options );
+			case TIMESTAMP -> unwrap( value, java.util.Date.class, options );
+		};
 	}
 
 	private static TimeZone getJdbcTimeZone(WrapperOptions options) {

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java

@@ -24,7 +24,6 @@ public class JdbcLiteralFormatterUUIDData<T> extends BasicJdbcLiteralFormatter<T
 
 	@Override
 	public void appendJdbcLiteral(SqlAppender appender, Object value, Dialect dialect, WrapperOptions wrapperOptions) {
-		final UUID literalValue = unwrap( value, UUID.class, wrapperOptions );
+		dialect.appendUUIDLiteral( appender, unwrap( value, UUID.class, wrapperOptions ) );
-		dialect.appendUUIDLiteral( appender, literalValue );
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java

@@ -1,58 +0,0 @@
-/*
- * SPDX-License-Identifier: LGPL-2.1-or-later
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.type.internal;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.LobCreator;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.spi.TypeConfiguration;
-
-import java.util.TimeZone;
-
-public class TypeConfigurationWrapperOptions implements WrapperOptions {
-
-	private final TypeConfiguration typeConfiguration;
-
-	public TypeConfigurationWrapperOptions(TypeConfiguration typeConfiguration) {
-		this.typeConfiguration = typeConfiguration;
-	}
-
-	@Override
-	public Dialect getDialect() {
-		return typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
-	}
-
-	@Override
-	public SharedSessionContractImplementor getSession() {
-		return typeConfiguration.getSessionFactory().getWrapperOptions().getSession();
-	}
-
-	@Override
-	public SessionFactoryImplementor getSessionFactory() {
-		return typeConfiguration.getSessionFactory();
-	}
-
-	@Override
-	public boolean useStreamForLobBinding() {
-		return typeConfiguration.getSessionFactory().getWrapperOptions().useStreamForLobBinding();
-	}
-
-	@Override
-	public int getPreferredSqlTypeCodeForBoolean() {
-		return typeConfiguration.getCurrentBaseSqlTypeIndicators().getPreferredSqlTypeCodeForBoolean();
-	}
-
-	@Override
-	public LobCreator getLobCreator() {
-		return typeConfiguration.getSessionFactory().getWrapperOptions().getLobCreator();
-	}
-
-	@Override
-	public TimeZone getJdbcTimeZone() {
-		return typeConfiguration.getSessionFactory().getWrapperOptions().getJdbcTimeZone();
-	}
-}

hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java

@@ -81,16 +81,12 @@ public class UserTypeSqlTypeAdapter<J> implements JdbcType {
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
 		if ( !( userType instanceof EnhancedUserType<?> ) ) {
-			throw new HibernateException(
+			throw new HibernateException( "Could not create JdbcLiteralFormatter because UserType class '"
-					String.format(
+							+ userType.getClass().getName() + "' did not implement EnhancedUserType" );
-							"Could not create JdbcLiteralFormatter, UserType class [%s] did not implement %s",
-							userType.getClass().getName(),
-							EnhancedUserType.class.getName()
-					)
-			);
 		}
 		final EnhancedUserType<T> type = (EnhancedUserType<T>) userType;
-		return (appender, value, dialect, wrapperOptions) -> appender.append( type.toSqlLiteral( value ) );
+		return (appender, value, dialect, wrapperOptions) ->
+				appender.append( type.toSqlLiteral( value ) );
 	}
 
 	private static class ValueExtractorImpl<J> implements ValueExtractor<J> {