HHH-19393 WIP : Possible (simplified) fix

Author: cigaly

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.hibernate.envers.exception.AuditException;
@@ -46,6 +48,10 @@ public Object mapToIdFromMap(Map data) {
 			return null;
 		}
 
+		if ( compositeIdClass.isRecord() ) {
+			return mapToRecordFromMap( data );
+		}
+
 		final Object compositeId = instantiateCompositeId();
 		for ( AbstractIdMapper mapper : ids.values() ) {
 			if ( !mapper.mapToEntityFromMap( compositeId, data ) ) {
@@ -56,6 +62,36 @@ public Object mapToIdFromMap(Map data) {
 		return compositeId;
 	}
 
+	protected Object mapToRecordFromMap(Map data) {
+		final var map = new HashMap<String, Object>();
+		for ( AbstractIdMapper mapper : ids.values() ) {
+			if ( !(mapper instanceof SingleIdMapper single && single.mapToMapFromMap( map, data )) ) {
+				return null;
+			}
+		}
+		return recordFromMap( map );
+	}
+
+	protected Object recordFromMap(Map<String, Object> map) {
+		final var recordComponents = compositeIdClass.getRecordComponents();
+		final var constructoryTypes = new Class[recordComponents.length];
+		final var constructoryParameters = new Object[recordComponents.length];
+		for ( var i = 0; i < recordComponents.length; ++i ) {
+			constructoryTypes[i] = recordComponents[i].getType();
+			if ( !map.containsKey( recordComponents[i].getName() ) ) {
+				return null;
+			}
+			constructoryParameters[i] = map.get( recordComponents[i].getName() );
+		}
+		try {
+			final Constructor<?> idClassConstructor = compositeIdClass.getConstructor( constructoryTypes );
+			return idClassConstructor.newInstance( constructoryParameters );
+		}
+		catch (ReflectiveOperationException e) {
+			return null;
+		}
+	}
+
 	@Override
 	public void mapToEntityFromEntity(Object objectTo, Object objectFrom) {
 		// no-op; does nothing

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java

@@ -58,6 +58,17 @@ public boolean mapToEntityFromMap(final Object obj, final Map data) {
 
 		final Setter setter = ReflectionTools.getSetter( obj.getClass(), idPropertyData, getServiceRegistry() );
 		try {
+			if ( compositeIdClass.isRecord() ) {
+				final var subObj = mapToRecordFromMap( data );
+				if ( subObj == null ) {
+					return false;
+				}
+				else {
+					setter.set( obj, subObj );
+					return true;
+				}
+			}
+
 			final Object subObj = instantiateCompositeId();
 
 			boolean ret = true;

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java

@@ -62,6 +62,20 @@ public boolean mapToEntityFromMap(final Object obj, Map data) {
 		return true;
 	}
 
+	boolean mapToMapFromMap(Map<String, Object> map, Map data) {
+		if ( data == null || map == null ) {
+			return false;
+		}
+
+		final Object value = data.get( propertyData.getName() );
+		if ( value == null ) {
+			return false;
+		}
+
+		map.put( propertyData.getName(), value );
+		return true;
+	}
+
 	@Override
 	public Object mapToIdFromMap(Map data) {
 		if ( data == null ) {