[hibernate-commits] Hibernate SVN: r14965 - in entitymanager/trunk/src: test/org/hibernate/ejb/test/callbacks and 1 other directory.

Author: hardy.ferentschik Date: 2008-07-23 07:47:04 -0400 (Wed, 23 Jul 2008) New Revision: 14965 Modified: entitymanager/trunk/src/java/org/hibernate/ejb/EventListenerConfigurator.java entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java Log: EJB-288: Disabled collection post update events. Modified: entitymanager/trunk/src/java/org/hibernate/ejb/EventListenerConfigurator.java =================================================================== --- entitymanager/trunk/src/java/org/hibernate/ejb/EventListenerConfigurator.java 2008-07-23 10:24:01 UTC (rev 14964) +++ entitymanager/trunk/src/java/org/hibernate/ejb/EventListenerConfigurator.java 2008-07-23 11:47:04 UTC (rev 14965) @@ -37,9 +37,6 @@ import org.hibernate.event.FlushEventListener; import org.hibernate.event.MergeEventListener; import org.hibernate.event.PersistEventListener; -import org.hibernate.event.PostCollectionRecreateEventListener; -import org.hibernate.event.PostCollectionRemoveEventListener; -import org.hibernate.event.PostCollectionUpdateEventListener; import org.hibernate.event.PostDeleteEventListener; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PostLoadEventListener; @@ -136,14 +133,16 @@ new PostUpdateEventListener[] { postUpdateEventListener } ); - listenerConfig.setPostCollectionRecreateEventListeners( - new PostCollectionRecreateEventListener[] { postUpdateEventListener }); - - listenerConfig.setPostCollectionRemoveEventListeners( - new PostCollectionRemoveEventListener[] { postUpdateEventListener }); - - listenerConfig.setPostCollectionUpdateEventListeners( - new PostCollectionUpdateEventListener[] { postUpdateEventListener }); +// EJB-288 - registration of post collection listeners. Commented out due to problem +// of duplicated callbacks. See Jira. +// listenerConfig.setPostCollectionRecreateEventListeners( +// new PostCollectionRecreateEventListener[] { postUpdateEventListener }); +// +// listenerConfig.setPostCollectionRemoveEventListeners( +// new PostCollectionRemoveEventListener[] { postUpdateEventListener }); +// +// listenerConfig.setPostCollectionUpdateEventListeners( +// new PostCollectionUpdateEventListener[] { postUpdateEventListener }); } public void setProperties(Properties properties) { Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java =================================================================== --- entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-07-23 10:24:01 UTC (rev 14964) +++ entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-07-23 11:47:04 UTC (rev 14965) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.ejb.test.callbacks; -import java.util.ArrayList; import java.util.Date; import java.util.List; + import javax.persistence.EntityManager; import org.hibernate.ejb.test.Cat; @@ -165,66 +165,66 @@ em.close(); } - /** - * Tests callbacks for collection changes. - * - * @throws Exception in case the test fails. - * @see EJB-288 - */ - public void testPostUpdateCollection() throws Exception { - - // create a cat - EntityManager em = factory.createEntityManager(); - Cat cat = new Cat(); - em.getTransaction().begin(); - cat.setLength( 23 ); - cat.setAge( 2 ); - cat.setName( "Beetle" ); - cat.setDateOfBirth( new Date() ); - em.persist( cat ); - em.getTransaction().commit(); - - // assert it is persisted - List ids = Cat.getIdList(); - Object id = Cat.getIdList().get( ids.size() - 1 ); - assertNotNull( id ); - - // add a kitten to the cat - triggers PostCollectionRecreateEvent - int postVersion = Cat.postVersion; - em.getTransaction().begin(); - Kitten kitty = new Kitten(); - kitty.setName("kitty"); - List kittens = new ArrayList<Kitten>(); - kittens.add(kitty); - cat.setKittens(kittens); - em.getTransaction().commit(); - assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); - - // add another kitten - triggers PostCollectionUpdateEvent. - postVersion = Cat.postVersion; - em.getTransaction().begin(); - Kitten tom = new Kitten(); - tom.setName("Tom"); - cat.getKittens().add(tom); - em.getTransaction().commit(); - assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); - - // delete a kitty - triggers PostCollectionUpdateEvent - postVersion = Cat.postVersion; - em.getTransaction().begin(); - cat.getKittens().remove(tom); - em.getTransaction().commit(); - assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); - - // delete and recreate kittens - triggers PostCollectionRemoveEvent and PostCollectionRecreateEvent) - postVersion = Cat.postVersion; - em.getTransaction().begin(); - cat.setKittens(new ArrayList<Kitten>()); - em.getTransaction().commit(); - assertEquals("Post version should have been incremented.", postVersion + 2, Cat.postVersion); - - em.close(); - } +// /** +// * Tests callbacks for collection changes. +// * +// * @throws Exception in case the test fails. +// * @see EJB-288 +// */ +// public void testPostUpdateCollection() throws Exception { +// +// // create a cat +// EntityManager em = factory.createEntityManager(); +// Cat cat = new Cat(); +// em.getTransaction().begin(); +// cat.setLength( 23 ); +// cat.setAge( 2 ); +// cat.setName( "Beetle" ); +// cat.setDateOfBirth( new Date() ); +// em.persist( cat ); +// em.getTransaction().commit(); +// +// // assert it is persisted +// List ids = Cat.getIdList(); +// Object id = Cat.getIdList().get( ids.size() - 1 ); +// assertNotNull( id ); +// +// // add a kitten to the cat - triggers PostCollectionRecreateEvent +// int postVersion = Cat.postVersion; +// em.getTransaction().begin(); +// Kitten kitty = new Kitten(); +// kitty.setName("kitty"); +// List kittens = new ArrayList<Kitten>(); +// kittens.add(kitty); +// cat.setKittens(kittens); +// em.getTransaction().commit(); +// assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); +// +// // add another kitten - triggers PostCollectionUpdateEvent. +// postVersion = Cat.postVersion; +// em.getTransaction().begin(); +// Kitten tom = new Kitten(); +// tom.setName("Tom"); +// cat.getKittens().add(tom); +// em.getTransaction().commit(); +// assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); +// +// // delete a kitty - triggers PostCollectionUpdateEvent +// postVersion = Cat.postVersion; +// em.getTransaction().begin(); +// cat.getKittens().remove(tom); +// em.getTransaction().commit(); +// assertEquals("Post version should have been incremented.", postVersion + 1, Cat.postVersion); +// +// // delete and recreate kittens - triggers PostCollectionRemoveEvent and PostCollectionRecreateEvent) +// postVersion = Cat.postVersion; +// em.getTransaction().begin(); +// cat.setKittens(new ArrayList<Kitten>()); +// em.getTransaction().commit(); +// assertEquals("Post version should have been incremented.", postVersion + 2, Cat.postVersion); +// +// em.close(); +// } public Class[] getAnnotatedClasses() { return new Class[]{