HSEARCH-4132 Store transient identifier to report

hibernate · Mar 8, 2021 · 10cd573 · 10cd573
1 parent eab1ec6
commit 10cd573
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/OutboxEvent.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/OutboxEvent.java
@@ -8,6 +8,7 @@
 
 import java.util.Arrays;
 import java.util.Objects;
+import javax.persistence.Transient;
 
 import org.hibernate.search.mapper.pojo.route.DocumentRoutesDescriptor;
 import org.hibernate.search.util.common.serialization.spi.SerializationUtils;
@@ -24,14 +25,19 @@ public enum Type {
 	private byte[] serializedRoutes;
 	private Type type;
 
+	@Transient
+	private Object identifier;
+
 	public OutboxEvent() {
 	}
 
-	public OutboxEvent(Type type, String entityName, String serializedId, DocumentRoutesDescriptor routesDescriptor) {
+	public OutboxEvent(String entityName, String serializedId, DocumentRoutesDescriptor routesDescriptor, Type type,
+			Object identifier) {
 		this.entityName = entityName;
 		this.serializedId = serializedId;
 		this.serializedRoutes = SerializationUtils.serialize( routesDescriptor );
 		this.type = type;
+		this.identifier = identifier;
 	}
 
 	public Integer getId() {
@@ -74,6 +80,14 @@ public void setType(Type type) {
 		this.type = type;
 	}
 
+	public Object getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(Object identifier) {
+		this.identifier = identifier;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {

diff --git a/...orm/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/OutboxTableSendingPlan.java b/...orm/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/OutboxTableSendingPlan.java
@@ -27,18 +27,18 @@ public OutboxTableSendingPlan(Session session) {
 
 	@Override
 	public void add(String entityName, Object identifier, String serializedId, DocumentRoutesDescriptor routes) {
-		events.add( new OutboxEvent( OutboxEvent.Type.ADD, entityName, serializedId, routes ) );
+		events.add( new OutboxEvent( entityName, serializedId, routes, OutboxEvent.Type.ADD, identifier ) );
 	}
 
 	@Override
 	public void addOrUpdate(String entityName, Object identifier, String serializedId,
 			DocumentRoutesDescriptor routes) {
-		events.add( new OutboxEvent( OutboxEvent.Type.ADD_OR_UPDATE, entityName, serializedId, routes ) );
+		events.add( new OutboxEvent( entityName, serializedId, routes, OutboxEvent.Type.ADD_OR_UPDATE, identifier ) );
 	}
 
 	@Override
 	public void delete(String entityName, Object identifier, String serializedId, DocumentRoutesDescriptor routes) {
-		events.add( new OutboxEvent( OutboxEvent.Type.DELETE, entityName, serializedId, routes ) );
+		events.add( new OutboxEvent( entityName, serializedId, routes, OutboxEvent.Type.DELETE, identifier ) );
 	}
 
 	@Override
@@ -57,7 +57,7 @@ public <R> CompletableFuture<MultiEntityOperationExecutionReport<R>> sendAndRepo
 			catch (RuntimeException e) {
 				builder.throwable( e );
 				builder.failingEntityReference(
-						entityReferenceFactory, event.getEntityName(), event.getSerializedId() );
+						entityReferenceFactory, event.getEntityName(), event.getIdentifier() );
 			}
 		}
 		session.flush();