Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7542: Modified EntityClass to allow for multiple class-level @Immutable annotations in the same hierarchy

This commit is contained in:
John Verhaeg 2012-09-14 14:03:01 -05:00
parent 4882bebdba
commit 58a238e5b7
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
View File

@ -285,10 +285,8 @@ public class EntityClass extends ConfiguredClass {
}
optimisticLockStyle = OptimisticLockStyle.valueOf( optimisticLockType.name() );
final AnnotationInstance hibernateImmutableAnnotation = JandexHelper.getSingleAnnotation(
getClassInfo(), HibernateDotNames.IMMUTABLE
);
isMutable = hibernateImmutableAnnotation == null
List< AnnotationInstance > hibernateImmutableAnnotations = getClassInfo().annotations().get( HibernateDotNames.IMMUTABLE );
isMutable = ( hibernateImmutableAnnotations == null || hibernateImmutableAnnotations.isEmpty() )
&& hibernateEntityAnnotation != null
&& hibernateEntityAnnotation.value( "mutable" ) != null
&& hibernateEntityAnnotation.value( "mutable" ).asBoolean();

16
hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
View File

@ -23,12 +23,14 @@
*/
package org.hibernate.test.annotations.immutable;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
import org.jboss.logging.Logger;
import org.junit.Test;
import org.hibernate.AnnotationException;
import org.hibernate.HibernateException;
import org.hibernate.Session;
@ -37,11 +39,8 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.jboss.logging.Logger;
import org.junit.Test;
/**
* Tests for <code>Immutable</code> annotation.
@ -53,7 +52,6 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
private static final Logger log = Logger.getLogger( ImmutableTest.class );
@Test
@FailureExpectedWithNewMetamodel
public void testImmutableEntity() throws Exception {
Session s = openSession();
Transaction tx = s.beginTransaction();