Skip to content

Commit a70f26d

Browse files
DavideDsebersole
authored andcommitted
HHH-18854 JsonHelper#arrayFromString minor refactoring
Change the parameter to JdbcType so that Hibernate Reactive can call it when in need to create the array.
1 parent fa94ea8 commit a70f26d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
4343
import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
4444
import org.hibernate.type.descriptor.jdbc.JdbcType;
45-
import org.hibernate.type.descriptor.jdbc.JsonArrayJdbcType;
4645

4746
import static org.hibernate.dialect.StructHelper.getEmbeddedPart;
4847
import static org.hibernate.dialect.StructHelper.instantiate;
@@ -363,16 +362,17 @@ public static <X> X fromString(
363362
return (X) values;
364363
}
365364

365+
// This is also used by Hibernate Reactive
366366
public static <X> X arrayFromString(
367367
JavaType<X> javaType,
368-
JsonArrayJdbcType jsonArrayJdbcType,
368+
JdbcType elementJdbcType,
369369
String string,
370370
WrapperOptions options) throws SQLException {
371371
if ( string == null ) {
372372
return null;
373373
}
374374
final JavaType<?> elementJavaType = ((BasicPluralJavaType<?>) javaType).getElementJavaType();
375-
final Class<?> preferredJavaTypeClass = jsonArrayJdbcType.getElementJdbcType().getPreferredJavaTypeClass( options );
375+
final Class<?> preferredJavaTypeClass = elementJdbcType.getPreferredJavaTypeClass( options );
376376
final JavaType<?> jdbcJavaType;
377377
if ( preferredJavaTypeClass == null || preferredJavaTypeClass == elementJavaType.getJavaTypeClass() ) {
378378
jdbcJavaType = elementJavaType;
@@ -390,7 +390,7 @@ public static <X> X arrayFromString(
390390
arrayList,
391391
elementJavaType,
392392
jdbcJavaType,
393-
jsonArrayJdbcType.getElementJdbcType()
393+
elementJdbcType
394394
);
395395
assert string.charAt( i - 1 ) == ']';
396396
return javaType.wrap( arrayList, options );

0 commit comments

Comments
 (0)