From 5eb13dbde9782affaa41e954e72decef8f3748ca Mon Sep 17 00:00:00 2001 From: "Kevin W. Sutter" Date: Fri, 13 Jul 2012 19:46:41 +0000 Subject: [PATCH] OPENJPA-2230. Set the _activated flag when processing EventListeners in super classes. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1361354 13f79535-47bb-0310-9956-ffa450edef68 --- .../openjpa/meta/LifecycleMetaData.java | 1 + .../EntityListenerMappedSuperClass.java | 29 +++++ .../callbacks/MSCListenerEntity.java | 47 +++++++ .../callbacks/TestMSCEntityListeners.java | 119 ++++++++++++++++++ .../test/resources/META-INF/persistence.xml | 9 ++ 5 files changed, 205 insertions(+) create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java index 803df9e51..a80bf4d46 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java @@ -204,6 +204,7 @@ public class LifecycleMetaData return _declared; if (_declared == null && _ignoreSups == 0) { _high = supMeta._high; + _activated = true; return supMeta._all; } // don't hold strong refs onto redundant info diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java new file mode 100644 index 000000000..9b0a59556 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerMappedSuperClass.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.openjpa.persistence.callbacks; + +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; + +@MappedSuperclass +@EntityListeners({ListenerImpl.class}) +public abstract class EntityListenerMappedSuperClass { + +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java new file mode 100644 index 000000000..4fe04f203 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.callbacks; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.GeneratedValue; + +@Entity +public class MSCListenerEntity extends EntityListenerMappedSuperClass implements ListenerTestEntity { + @Id @GeneratedValue + private long id; + + private int value; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java new file mode 100644 index 000000000..eadf725bb --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.callbacks; + +import org.apache.openjpa.persistence.test.SingleEMFTestCase; +import org.apache.openjpa.persistence.OpenJPAEntityManager; + +/* + * Separate testcase from TestEntityListeners to avoid the declaration of + * a System level event listener in the orm.xml file... + */ +public class TestMSCEntityListeners extends SingleEMFTestCase { + + private static final int MSC_LISTENER_ENTITY = 4; + + public void setUp() { + setUp(CLEAR_TABLES); + ListenerImpl.prePersistCount = 0; + ListenerImpl.postPersistCount = 0; + ListenerImpl.preUpdateCount = 0; + ListenerImpl.postUpdateCount = 0; + ListenerImpl.preRemoveCount = 0; + ListenerImpl.postRemoveCount = 0; + ListenerImpl.postLoadCount = 0; + } + + @Override + protected String getPersistenceUnitName() { + return "msclistener-pu"; + } + + public void testMSCEntityListeners() { + helper(MSC_LISTENER_ENTITY); + } + + public void helper(int entityListeners) { + OpenJPAEntityManager em = emf.createEntityManager(); + try { + em.getTransaction().begin(); + ListenerTestEntity o = null; + switch (entityListeners) { + case MSC_LISTENER_ENTITY: + o = new MSCListenerEntity(); + break; + + } + em.persist(o); + + assertStatus(1, 0, 0, 0, 0, 0, 0); + + em.getTransaction().commit(); + long id = o.getId(); + em.close(); + + assertStatus(1, 1, 0, 0, 0, 0, 0); + + em = emf.createEntityManager(); + em.getTransaction().begin(); + switch (entityListeners) { + case MSC_LISTENER_ENTITY: + o = em.find(MSCListenerEntity.class, id); + break; + + } + assertNotNull(o); + assertStatus(1, 1, 0, 0, 0, 0, 1); + + o.setValue(o.getValue() + 1); + + em.flush(); + assertStatus(1, 1, 1, 1, 0, 0, 1); + + em.remove(o); + assertStatus(1, 1, 1, 1, 1, 0, 1); + + em.getTransaction().commit(); + + assertStatus(1, 1, 1, 1, 1, 1, 1); + + em.close(); + } finally { + if (em != null && em.getTransaction().isActive()) + em.getTransaction().rollback(); + if (em != null && em.isOpen()) + em.close(); + } + } + + private void assertStatus( + int prePersist, int postPersist, + int preUpdate, int postUpdate, + int preRemove, int postRemove, + int postLoad) { + assertEquals(prePersist, ListenerImpl.prePersistCount); + assertEquals(postPersist, ListenerImpl.postPersistCount); + assertEquals(preUpdate, ListenerImpl.preUpdateCount); + assertEquals(postUpdate, ListenerImpl.postUpdateCount); + assertEquals(preRemove, ListenerImpl.preRemoveCount); + assertEquals(postRemove, ListenerImpl.postRemoveCount); + assertEquals(postLoad, ListenerImpl.postLoadCount); + } + +} diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml index 8ccb929b5..3ecb58f15 100644 --- a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml +++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml @@ -111,6 +111,15 @@ + + org.apache.openjpa.persistence.callbacks.MSCListenerEntity + org.apache.openjpa.persistence.callbacks.EntityListenerMappedSuperClass + + + + + org/apache/openjpa/persistence/jdbc/unique/orm.xml org.apache.openjpa.persistence.jdbc.unique.UniqueA