clean up formatters and remove TypeConfigurationWrapperOptions

gavinking · gavinking · commit 0a41a5d6837f · 2024-12-14T00:26:05.000+01:00
It's wrong to build a WrapperOptions from a TypeConfiguration
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java
@@ -45,14 +45,8 @@ public Class<?> getPreferredJavaTypeClass(WrapperOptions options) {
 
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return (appender, value, dialect, wrapperOptions) -> dialect.appendIntervalLiteral(
-				appender,
-				javaType.unwrap(
-						value,
-						Duration.class,
-						wrapperOptions
-				)
-		);
+		return (appender, value, dialect, wrapperOptions) ->
+				dialect.appendIntervalLiteral( appender, javaType.unwrap( value, Duration.class, wrapperOptions ) );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java
@@ -63,9 +63,11 @@ public int getDefaultSqlTypeCode() {
 	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)
-				-> appender.appendSql( dialect.getEnumTypeDeclaration( enumClass )
-						+ "." + ((Enum<?>) value).name() );
+		return (appender, value, dialect, wrapperOptions) -> {
+			appender.appendSql( dialect.getEnumTypeDeclaration( enumClass ) );
+			appender.appendSql( '.' );
+			appender.appendSql( ((Enum<?>) value).name() );
+		};
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java
@@ -64,9 +64,12 @@ public int getDefaultSqlTypeCode() {
 	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)
-				-> appender.appendSql( "'" + ((Enum<?>) value).name() + "'::"
-						+ dialect.getEnumTypeDeclaration( enumClass ) );
+		return (appender, value, dialect, wrapperOptions) -> {
+			appender.appendSql( "'" );
+			appender.appendSql( ((Enum<?>) value).name() );
+			appender.appendSql( "'::" );
+			appender.appendSql( dialect.getEnumTypeDeclaration( enumClass ) );
+		};
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java
@@ -70,14 +70,8 @@ public JdbcType resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<?>
 
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return (appender, value, dialect, wrapperOptions) -> dialect.appendIntervalLiteral(
-				appender,
-				javaType.unwrap(
-						value,
-						Duration.class,
-						wrapperOptions
-				)
-		);
+		return (appender, value, dialect, wrapperOptions) ->
+				dialect.appendIntervalLiteral( appender, javaType.unwrap( value, Duration.class, wrapperOptions ) );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
@@ -23,7 +23,7 @@
 
 /**
  * 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
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/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.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 @@ private OracleAggregateSupport(boolean checkConstraintSupport, JsonSupport jsonS
 
 	public static AggregateSupport valueOf(Dialect dialect) {
 		final DatabaseVersion version = dialect.getVersion();
-		switch ( version.getMajor() ) {
-			case 12:
-			case 13:
-			case 14:
-			case 15:
-			case 16:
-			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;
+		return switch ( version.getMajor() ) {
+			case 12, 13, 14, 15, 16, 17 -> V12_INSTANCE;
+			case 18 -> V18_INSTANCE;
+			case 19, 20 -> V19_INSTANCE;
+			case 21, 22 -> V21_INSTANCE;
+			default -> version.isSameOrAfter( 23 )
+					? OracleAggregateSupport.V23_INSTANCE
+					: OracleAggregateSupport.LEGACY_INSTANCE;
+		};
 	}
 
 	@Override
@@ -132,7 +121,7 @@ public String aggregateComponentCustomReadExpression(
 								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 String aggregateComponentCustomReadExpression(
 						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 String aggregateComponentCustomReadExpression(
 		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 @@ private String jsonCustomWriteExpression(
 						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 @@ private static String xmlCustomWriteExpression(String customWriteExpression, Jdb
 				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')";
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java b/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();
-		appendJdbcLiteral( new StringBuilderSqlAppender( sb ), value, dialect, wrapperOptions );
-		return sb.toString();
+		final StringBuilder result = new StringBuilder();
+		appendJdbcLiteral( new StringBuilderSqlAppender( result ), value, dialect, wrapperOptions );
+		return result.toString();
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
@@ -118,7 +118,8 @@ default <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
 	 */
 	// 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() );
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java
@@ -23,11 +23,10 @@ public JdbcLiteralFormatterArray(JavaType<T> javaType, JdbcLiteralFormatter<?> e
 
 	@Override
 	public void appendJdbcLiteral(SqlAppender appender, Object value, Dialect dialect, WrapperOptions wrapperOptions) {
-		dialect.appendArrayLiteral(
-				appender,
-				unwrap( value, Object[].class, wrapperOptions ),
-				elementFormatter,
-				wrapperOptions
-		);
+		dialect.appendArrayLiteral( appender, unwrapArray( value, wrapperOptions ), elementFormatter, wrapperOptions );
+	}
+
+	private Object[] unwrapArray(Object value, WrapperOptions wrapperOptions) {
+		return unwrap( value, Object[].class, wrapperOptions );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java
@@ -32,60 +32,28 @@ public JdbcLiteralFormatterTemporal(JavaType<T> javaType, TemporalType precision
 	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 ) {
-			dialect.appendDateTimeLiteral(
-					appender,
-					(java.util.Date) value,
-					precision,
-					jdbcTimeZone
-			);
+		if ( value instanceof java.util.Date date ) {
+			dialect.appendDateTimeLiteral( appender, date, precision, jdbcTimeZone );
 		}
-		else if ( value instanceof java.util.Calendar ) {
-			dialect.appendDateTimeLiteral(
-					appender,
-					(java.util.Calendar) value,
-					precision,
-					jdbcTimeZone
-			);
+		else if ( value instanceof java.util.Calendar calendar ) {
+			dialect.appendDateTimeLiteral( appender, calendar, precision, jdbcTimeZone );
 		}
-		else if ( value instanceof TemporalAccessor ) {
-			dialect.appendDateTimeLiteral(
-					appender,
-					(TemporalAccessor) value,
-					precision,
-					jdbcTimeZone
-			);
+		else if ( value instanceof TemporalAccessor temporalAccessor ) {
+			dialect.appendDateTimeLiteral( appender, temporalAccessor, precision, jdbcTimeZone );
 		}
 		else {
-			switch ( precision ) {
-				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;
-			}
+			dialect.appendDateTimeLiteral( appender, unwrap( value, options ), precision, jdbcTimeZone );
 		}
 	}
 
+	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) {
 		return options == null || options.getJdbcTimeZone() == null
 				? TimeZone.getDefault()
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java
@@ -24,7 +24,6 @@ public JdbcLiteralFormatterUUIDData(JavaType<T> javaType) {
 
 	@Override
 	public void appendJdbcLiteral(SqlAppender appender, Object value, Dialect dialect, WrapperOptions wrapperOptions) {
-		final UUID literalValue = unwrap( value, UUID.class, wrapperOptions );
-		dialect.appendUUIDLiteral( appender, literalValue );
+		dialect.appendUUIDLiteral( appender, unwrap( value, UUID.class, wrapperOptions ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java b/hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java
@@ -81,16 +81,12 @@ public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
 	@Override
 	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
 		if ( !( userType instanceof EnhancedUserType<?> ) ) {
-			throw new HibernateException(
-					String.format(
-							"Could not create JdbcLiteralFormatter, UserType class [%s] did not implement %s",
-							userType.getClass().getName(),
-							EnhancedUserType.class.getName()
-					)
-			);
+			throw new HibernateException( "Could not create JdbcLiteralFormatter because UserType class '"
+							+ userType.getClass().getName() + "' did not implement EnhancedUserType" );
 		}
 		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> {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* A set of operations providing support for aggregate column types`
`26`		`- * in a certain {@link Dialect SQL dialect}.`
	`26`	`+ * in a certain {@linkplain Dialect SQL dialect}.`
`27`	`27`	`*`
`28`	`28`	`* @since 6.2`
`29`	`29`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ default <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(`
`118`	`118`	`*/`
`119`	`119`	`// todo (6.0) : move to {@link org.hibernate.metamodel.mapping.JdbcMapping}?`
`120`	`120`	`default <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {`
`121`		`- return (appender, value, dialect, wrapperOptions) -> appender.appendSql( value.toString() );`
	`121`	`+ return (appender, value, dialect, wrapperOptions) ->`
	`122`	`+ appender.appendSql( value.toString() );`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`/**`