Skip to content

Commit b03fb5e

Browse files
committed
HHH-19362 JsonHelper improvements to handle more mapping types
- Add the `expandProperties` flag that indicates when serializing entier object trees - Handle entity values, including tracking circular relationships - Handle plural attribute values
1 parent 95d8fe9 commit b03fb5e

File tree

5 files changed

+302
-86
lines changed

5 files changed

+302
-86
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.hibernate.type.descriptor.jdbc.StructJdbcType;
4242
import org.hibernate.type.spi.TypeConfiguration;
4343

44-
import static org.hibernate.dialect.StructHelper.getEmbeddedPart;
44+
import static org.hibernate.dialect.StructHelper.getSubPart;
4545
import static org.hibernate.dialect.StructHelper.instantiate;
4646
import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate;
4747
import static org.hibernate.type.descriptor.DateTimeUtils.appendAsLocalTime;
@@ -997,7 +997,7 @@ private SelectableMapping getJdbcValueSelectable(int jdbcValueSelectableIndex) {
997997
final int size = numberOfAttributeMappings + ( embeddableMappingType.isPolymorphic() ? 1 : 0 );
998998
int count = 0;
999999
for ( int i = 0; i < size; i++ ) {
1000-
final ValuedModelPart modelPart = getEmbeddedPart( embeddableMappingType, orderMapping[i] );
1000+
final ValuedModelPart modelPart = getSubPart( embeddableMappingType, orderMapping[i] );
10011001
if ( modelPart.getMappedType() instanceof EmbeddableMappingType embeddableMappingType ) {
10021002
final SelectableMapping aggregateMapping = embeddableMappingType.getAggregateMapping();
10031003
if ( aggregateMapping == null ) {
@@ -1376,7 +1376,7 @@ private StructAttributeValues getAttributeValues(
13761376
attributeIndex = orderMapping[i];
13771377
}
13781378
jdbcIndex += injectAttributeValue(
1379-
getEmbeddedPart( embeddableMappingType, attributeIndex ),
1379+
getSubPart( embeddableMappingType, attributeIndex ),
13801380
attributeValues,
13811381
attributeIndex,
13821382
rawJdbcValues,

0 commit comments

Comments
 (0)