Fix postLoad callback method calls

This commit is contained in:
Andrea Boriero 2022-01-11 12:53:23 +01:00 committed by Andrea Boriero
parent 8f5fefd806
commit 2bbeeb5ab2
4 changed files with 155 additions and 2 deletions

View File

@ -433,10 +433,8 @@ public abstract class AbstractEntityInitializer extends AbstractFetchParentAcces
} }
else { else {
final Object existingEntity = persistenceContext.getEntity( entityKey ); final Object existingEntity = persistenceContext.getEntity( entityKey );
if ( existingEntity != null ) { if ( existingEntity != null ) {
this.entityInstance = existingEntity; this.entityInstance = existingEntity;
registerLoadingEntity( rowProcessingState, entityInstance );
} }
else if ( this instanceof EntityResultInitializer && entityInstanceFromExecutionContext != null ) { else if ( this instanceof EntityResultInitializer && entityInstanceFromExecutionContext != null ) {
this.entityInstance = entityInstanceFromExecutionContext; this.entityInstance = entityInstanceFromExecutionContext;

View File

@ -0,0 +1,119 @@
package org.hibernate.orm.test.jpa.compliance.callback.listener;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa;
import org.junit.jupiter.api.Test;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.Id;
import jakarta.persistence.PostLoad;
import jakarta.persistence.Query;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Jpa(
annotatedClasses = MultiListenersAppliedTest.Person.class,
xmlMappings = "org/hibernate/orm/test/jpa/compliance/callback/listener/orm.xml"
)
public class MultiListenersAppliedTest {
@Test
public void postLoadMultiTest(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
Person person = new Person( 1, "Fab" );
entityManager.persist( person );
entityManager.flush();
entityManager.refresh( person );
final Query query = entityManager
.createQuery( "select p from Person p" );
query.getResultList();
final List<String> actual = person.getPostLoadCalls();
assertThat( actual.size(), is( 3 ) );
assertTrue(
actual.contains( "AnotherPersonListener" ),
"AnotherPersonListener#postLoad has not been called"
);
assertTrue(
actual.contains( "LastPersonListener" ),
"LastPersonListener#postLoad has not been called"
);
assertTrue(
actual.contains( "PersonListener" ),
"PersonListener#postLoad has not been called"
);
}
);
}
public static class PersonCallback {
boolean isPostPersistCalled;
private List<String> postLoadCalls = new ArrayList();
public void setPostPersistCalled() {
this.isPostPersistCalled = true;
}
public boolean isPostLoadCalled() {
return isPostPersistCalled;
}
public List<String> getPostLoadCalls() {
return postLoadCalls;
}
public void addPostLoadCall(String name) {
postLoadCalls.add( name );
}
}
@Entity(name = "Person")
@EntityListeners({ AnotherPersonListener.class, LastPersonListener.class })
public static class Person extends PersonCallback {
Person() {
}
public Person(Integer id, String name) {
this.id = id;
this.name = name;
}
@Id
private Integer id;
private String name;
}
public static class AnotherPersonListener {
@PostLoad
protected void postLoad(PersonCallback callback) {
callback.addPostLoadCall( "AnotherPersonListener" );
callback.setPostPersistCalled();
}
}
public static class LastPersonListener {
@PostLoad
protected void postLoad(PersonCallback callback) {
callback.addPostLoadCall( "LastPersonListener" );
callback.setPostPersistCalled();
}
}
}

View File

@ -0,0 +1,18 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.jpa.compliance.callback.listener;
import jakarta.persistence.PostLoad;
public class PersonListener {
@PostLoad
protected void postLoad(MultiListenersAppliedTest.PersonCallback callback) {
callback.addPostLoadCall("PersonListener" );
callback.setPostPersistCalled();
}
}

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm
https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd"
version="3.0">
<persistence-unit-metadata>
<persistence-unit-defaults>
<entity-listeners>
<entity-listener class="org.hibernate.orm.test.jpa.compliance.callback.listener.PersonListener">
</entity-listener>
</entity-listeners>
</persistence-unit-defaults>
</persistence-unit-metadata>
</entity-mappings>