October 2010 - hibernate-commits - Jboss List Archives

Hibernate SVN: r20774 - core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy.

by hibernate-commits＠lists.jboss.org

Author: fbascheper Date: 2010-10-04 10:52:19 -0400 (Mon, 04 Oct 2010) New Revision: 20774 Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java Log: fixed envers build (broken since rev 20760) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java 2010-10-04 14:07:11 UTC (rev 20773) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java 2010-10-04 14:52:19 UTC (rev 20774) @@ -77,14 +77,6 @@ return delegate.getLoadQueryInfluencers(); } - public void registerInsertedKey(EntityPersister persister, Serializable id) { - delegate.registerInsertedKey( persister, id ); - } - - public boolean wasInsertedDuringTransaction(EntityPersister persister, Serializable id) { - return delegate.wasInsertedDuringTransaction( persister, id ); - } - public Interceptor getInterceptor() { return delegate.getInterceptor(); }

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20773 - in jpamodelgen/trunk/src: main/java/org/hibernate/jpamodelgen/annotation and 16 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-10-04 10:07:11 -0400 (Mon, 04 Oct 2010) New Revision: 20773 Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Context.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Version.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/Constants.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/ArrayTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/AddressImpl.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/TargetAnnotationTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/Dummy.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnly.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java Log: METAGEN-36 Made sure svn:keywords is set on all java classes Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java ___________________________________________________________________ Name: svn:keyword + Id Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Context.java =================================================================== --- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Context.java 2010-10-04 14:05:41 UTC (rev 20772) +++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Context.java 2010-10-04 14:07:11 UTC (rev 20773) @@ -40,7 +40,7 @@ * @author Hardy Ferentschik * @author Emmanuel Bernard */ -public class Context { +public final class Context { private static final String DEFAULT_PERSISTENCE_XML_LOCATION = "/META-INF/persistence.xml"; /** Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Context.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/Version.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java ___________________________________________________________________ Name: svn:keyword + Id Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java =================================================================== --- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java 2010-10-04 14:05:41 UTC (rev 20772) +++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java 2010-10-04 14:07:11 UTC (rev 20773) @@ -133,7 +133,7 @@ sb.append( '}' ); return sb.toString(); } - + private void addPersistentMembers(List<? extends Element> membersOfClass, AccessType membersKind) { for ( Element memberOfClass : membersOfClass ) { AccessType forcedAccessType = TypeUtils.determineAnnotationSpecifiedAccessType( memberOfClass ); Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/Constants.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/ArrayTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/AddressImpl.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/TargetAnnotationTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/Dummy.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnly.java ___________________________________________________________________ Name: svn:keyword + Id Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java ___________________________________________________________________ Name: svn:keyword + Id

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20772 - core/trunk/core/src/main/java/org/hibernate/cfg.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-10-04 10:05:41 -0400 (Mon, 04 Oct 2010) New Revision: 20772 Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java Log: HHH-5578 fix incorrect use of JDK 6 Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 14:03:09 UTC (rev 20771) +++ core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 14:05:41 UTC (rev 20772) @@ -2661,7 +2661,7 @@ final JoinColumn joinColumn = property.getAnnotation( JoinColumn.class ); if ( property.isAnnotationPresent( ManyToOne.class ) && joinColumn != null - && !joinColumn.name().isEmpty() + && ! BinderHelper.isEmptyAnnotationValue( joinColumn.name() ) && joinColumn.name().equals( columnName ) && !property.isAnnotationPresent( MapsId.class ) ) { hasSpecjManyToOne = true;

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20771 - jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-10-04 10:03:09 -0400 (Mon, 04 Oct 2010) New Revision: 20771 Modified: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java Log: METAGEN-36 added the ability to check for compliation errors after running the tests Modified: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java =================================================================== --- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java 2010-10-04 13:45:28 UTC (rev 20770) +++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java 2010-10-04 14:03:09 UTC (rev 20771) @@ -43,17 +43,22 @@ import static org.testng.FileAssert.fail; /** + * Base class for annotation processor tests. + * * @author Hardy Ferentschik */ public abstract class CompilationTest { private static final Logger log = LoggerFactory.getLogger( CompilationTest.class ); private static final String PATH_SEPARATOR = System.getProperty( "file.separator" ); private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A"; + private static final String PROC_NONE = "-proc:none"; private static final String SOURCE_BASE_DIR_PROPERTY = "sourceBaseDir"; private static final String OUT_BASE_DIR_PROPERTY = "outBaseDir"; private static final String sourceBaseDir; private static final String outBaseDir; + private List<Diagnostic> compilationDiagnostics; + static { String tmp = System.getProperty( SOURCE_BASE_DIR_PROPERTY ); if ( tmp == null ) { @@ -69,8 +74,13 @@ } public CompilationTest() { + compilationDiagnostics = new ArrayList<Diagnostic>(); } + public final List<Diagnostic> getCompilationDiagnostics() { + return compilationDiagnostics; + } + @BeforeClass protected void compile() throws Exception { TestUtil.deleteGeneratedSourceFiles( new File( outBaseDir ) ); @@ -91,8 +101,9 @@ compilationUnits = fileManager.getJavaFileObjectsFromFiles( getCompilationUnits( outBaseDir ) ); - options.add( "-proc:none" ); // for the second compile skip the processor + options.add( PROC_NONE ); // for the second compile skip the processor compileSources( options, compiler, diagnostics, fileManager, compilationUnits ); + compilationDiagnostics.addAll( diagnostics.getDiagnostics() ); fileManager.close(); } Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java ___________________________________________________________________ Name: svn:keyword + Id Modified: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java =================================================================== --- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java 2010-10-04 13:45:28 UTC (rev 20770) +++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java 2010-10-04 14:03:09 UTC (rev 20771) @@ -28,6 +28,8 @@ import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.List; +import javax.tools.Diagnostic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -209,10 +211,6 @@ } } - private static boolean hasFieldInMetamodelFor(Class<?> clazz, String fieldName) { - return getFieldFromMetamodelFor( clazz, fieldName ) != null; - } - public static Field getFieldFromMetamodelFor(Class<?> entityClass, String fieldName) { Class<?> metaModelClass = getMetamodelClassFor( entityClass ); Field field; @@ -229,6 +227,18 @@ return fcn.replace( PACKAGE_SEPARATOR, PATH_SEPARATOR ); } + public static void assertNoCompilationError(List<Diagnostic> diagnostics) { + for ( Diagnostic diagnostic : diagnostics ) { + if ( diagnostic.getKind().equals( Diagnostic.Kind.ERROR ) ) { + fail( "There was a compilation error. " + diagnostic.getMessage( null ) ); + } + } + } + + private static boolean hasFieldInMetamodelFor(Class<?> clazz, String fieldName) { + return getFieldFromMetamodelFor( clazz, fieldName ) != null; + } + private static class MetaModelFilenameFilter implements FileFilter { @Override public boolean accept(File pathName) { Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java ___________________________________________________________________ Name: svn:keyword + Id

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20770 - in jpamodelgen/trunk/src: test/java/org/hibernate/jpamodelgen/test and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-10-04 09:45:28 -0400 (Mon, 04 Oct 2010) New Revision: 20770 Added: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java Log: METAGEN-36 Now we keep at list in JPAMetaModelEntityProcessor.createMetaModelClasses() of all generated source files to avoid writing a file twice. Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java =================================================================== --- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java 2010-10-04 09:46:17 UTC (rev 20769) +++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java 2010-10-04 13:45:28 UTC (rev 20770) @@ -19,6 +19,7 @@ package org.hibernate.jpamodelgen; +import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -139,21 +140,30 @@ } private void createMetaModelClasses() { + // keep track of all classes for which model have been generated + Collection<String> generatedModelClasses = new ArrayList<String>(); + for ( MetaEntity entity : context.getMetaEntities() ) { context.logMessage( Diagnostic.Kind.OTHER, "Writing meta model for entity " + entity ); ClassWriter.writeFile( entity, context ); + generatedModelClasses.add( entity.getQualifiedName() ); } // we cannot process the delayed entities in any order. There might be dependencies between them. // we need to process the top level entities first - // TODO make sure that we don't run into circular dependencies here Collection<MetaEntity> toProcessEntities = context.getMetaEmbeddables(); while ( !toProcessEntities.isEmpty() ) { Set<MetaEntity> processedEntities = new HashSet<MetaEntity>(); + int toProcessCountBeforeLoop = toProcessEntities.size(); for ( MetaEntity entity : toProcessEntities ) { - if ( containedInEntity( toProcessEntities, entity ) ) { + // see METAGEN-36 + if ( generatedModelClasses.contains( entity.getQualifiedName() ) ) { + toProcessEntities.remove( entity ); continue; } + if ( modelGenerationNeedsToBeDeferred( toProcessEntities, entity ) ) { + continue; + } context.logMessage( Diagnostic.Kind.OTHER, "Writing meta model for embeddable/mapped superclass" + entity ); @@ -161,10 +171,15 @@ processedEntities.add( entity ); } toProcessEntities.removeAll( processedEntities ); + if ( toProcessEntities.size() >= toProcessCountBeforeLoop ) { + context.logMessage( + Diagnostic.Kind.ERROR, "Potential endless loop in generation of entities." + ); + } } } - private boolean containedInEntity(Collection<MetaEntity> entities, MetaEntity containedEntity) { + private boolean modelGenerationNeedsToBeDeferred(Collection<MetaEntity> entities, MetaEntity containedEntity) { ContainsAttributeTypeVisitor visitor = new ContainsAttributeTypeVisitor( containedEntity.getTypeElement(), context ); @@ -207,7 +222,7 @@ continue; } - String fqn = ( ( TypeElement ) element ).getQualifiedName().toString(); + String fqn = ( (TypeElement) element ).getQualifiedName().toString(); MetaEntity alreadyExistingMetaEntity = tryGettingExistingEntityFromContext( mirror, fqn ); if ( alreadyExistingMetaEntity != null && alreadyExistingMetaEntity.isMetaComplete() ) { String msg = "Skipping processing of annotations for " + fqn + " since xml configuration is metadata complete."; @@ -217,10 +232,10 @@ AnnotationMetaEntity metaEntity; if ( TypeUtils.containsAnnotation( element, Embeddable.class ) ) { - metaEntity = new AnnotationEmbeddable( ( TypeElement ) element, context ); + metaEntity = new AnnotationEmbeddable( (TypeElement) element, context ); } else { - metaEntity = new AnnotationMetaEntity( ( TypeElement ) element, context ); + metaEntity = new AnnotationMetaEntity( (TypeElement) element, context ); } if ( alreadyExistingMetaEntity != null ) { @@ -267,7 +282,7 @@ @Override public Boolean visitDeclared(DeclaredType declaredType, Element element) { - TypeElement returnedElement = ( TypeElement ) context.getTypeUtils().asElement( declaredType ); + TypeElement returnedElement = (TypeElement) context.getTypeUtils().asElement( declaredType ); String fqNameOfReturnType = returnedElement.getQualifiedName().toString(); String collection = Constants.COLLECTIONS.get( fqNameOfReturnType ); @@ -275,7 +290,7 @@ TypeMirror collectionElementType = TypeUtils.getCollectionElementType( declaredType, fqNameOfReturnType, null, context ); - returnedElement = ( TypeElement ) context.getTypeUtils().asElement( collectionElementType ); + returnedElement = (TypeElement) context.getTypeUtils().asElement( collectionElementType ); } if ( type.getQualifiedName().toString().equals( returnedElement.getQualifiedName().toString() ) ) { Property changes on: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java ___________________________________________________________________ Name: svn:keyword + Id Added: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java =================================================================== --- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java (rev 0) +++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java 2010-10-04 13:45:28 UTC (rev 20770) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed 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. + */ + +// $Id:$ +package org.hibernate.jpamodelgen.test.embeddablemappedsuperclass; + +import javax.persistence.Embeddable; +import javax.persistence.MappedSuperclass; + +/** + * @author Hardy Ferentschik + */ +@Embeddable +@MappedSuperclass +public class EmbeddableAndMappedSuperClass { + +} + + Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java ___________________________________________________________________ Name: svn:keyword + Id Added: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java =================================================================== --- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java (rev 0) +++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java 2010-10-04 13:45:28 UTC (rev 20770) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed 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. + */ + +// $Id: BlobTest.java 20721 2010-09-27 12:40:10Z hardy.ferentschik $ + +package org.hibernate.jpamodelgen.test.embeddablemappedsuperclass; + +import org.testng.annotations.Test; + +import org.hibernate.jpamodelgen.test.util.CompilationTest; + +import static org.hibernate.jpamodelgen.test.util.TestUtil.assertMetamodelClassGeneratedFor; +import static org.hibernate.jpamodelgen.test.util.TestUtil.assertNoCompilationError; + +/** + * @author Hardy Ferentschik + */ +public class EmbeddableMappedSuperClassTest extends CompilationTest { + /** + * METAGEN-36 + */ + @Test + public void testMetaModelsGenerated() { + assertMetamodelClassGeneratedFor( EmbeddableAndMappedSuperClass.class ); + assertNoCompilationError(getCompilationDiagnostics()); + } + + @Override + protected String getPackageNameOfTestSources() { + return EmbeddableMappedSuperClassTest.class.getPackage().getName(); + } +} \ No newline at end of file Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java ___________________________________________________________________ Name: svn:keyword + Id

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20769 - core/trunk/core/src/main/java/org/hibernate/cfg.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-10-04 05:46:17 -0400 (Mon, 04 Oct 2010) New Revision: 20769 Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java Log: HHH-5578 centralize specj property discovery Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:45:41 UTC (rev 20768) +++ core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:46:17 UTC (rev 20769) @@ -1418,7 +1418,7 @@ * TODO is @Column mandatory? * TODO add method support */ - if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + if ( mappings.isSpecjProprietarySyntaxEnabled() ) { if ( element.isAnnotationPresent( Id.class ) && element.isAnnotationPresent( Column.class ) ) { String columnName = element.getAnnotation( Column.class ).name(); for ( XProperty prop : declaringClass.getDeclaredProperties( AccessType.FIELD.getType() ) ) { @@ -2651,7 +2651,7 @@ //Make sure that JPA1 key-many-to-one columns are read only tooj boolean hasSpecjManyToOne=false; - if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + if ( mappings.isSpecjProprietarySyntaxEnabled() ) { String columnName = ""; for ( XProperty prop : inferredData.getDeclaringClass() .getDeclaredProperties( AccessType.FIELD.getType() ) ) { Modified: core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:45:41 UTC (rev 20768) +++ core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:46:17 UTC (rev 20769) @@ -682,7 +682,7 @@ } if ( propertyHolder.isInIdClass() ) { PropertyData pd = mappings.getPropertyAnnotatedWithIdAndToOne( persistentXClass, propertyName ); - if ( pd == null && System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + if ( pd == null && mappings.isSpecjProprietarySyntaxEnabled() ) { pd = mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyName ); } return pd; Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:45:41 UTC (rev 20768) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:46:17 UTC (rev 20769) @@ -288,6 +288,7 @@ private boolean isValidatorNotPresentLogged; private Map<XClass, Map<String, PropertyData>> propertiesAnnotatedWithMapsId; private Map<XClass, Map<String, PropertyData>> propertiesAnnotatedWithIdAndToOne; + private boolean specjProprietarySyntaxEnabled; protected Configuration(SettingsFactory settingsFactory) { @@ -358,6 +359,7 @@ anyMetaDefs = new HashMap<String, AnyMetaDef>(); propertiesAnnotatedWithMapsId = new HashMap<XClass, Map<String, PropertyData>>(); propertiesAnnotatedWithIdAndToOne = new HashMap<XClass, Map<String, PropertyData>>(); + specjProprietarySyntaxEnabled = System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null; } public EntityTuplizerFactory getEntityTuplizerFactory() { @@ -3595,6 +3597,10 @@ map.put( property.getProperty().getAnnotation( MapsId.class ).value(), property ); } + public boolean isSpecjProprietarySyntaxEnabled() { + return specjProprietarySyntaxEnabled; + } + public void addPropertyAnnotatedWithMapsIdSpecj(XClass entityType, PropertyData property, String mapsIdValue) { Map<String, PropertyData> map = propertiesAnnotatedWithMapsId.get( entityType ); if ( map == null ) { Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-10-04 09:45:41 UTC (rev 20768) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-10-04 09:46:17 UTC (rev 20769) @@ -735,6 +735,8 @@ public void addPropertyAnnotatedWithMapsIdSpecj(XClass entityType, PropertyData property, String mapsIdValue); + public boolean isSpecjProprietarySyntaxEnabled(); + /** * Should we use the new generator strategy mappings. This is controlled by the * {@link Configuration#USE_NEW_ID_GENERATOR_MAPPINGS} setting.

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20768 - core/trunk/core/src/main/java/org/hibernate/cfg.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-10-04 05:45:41 -0400 (Mon, 04 Oct 2010) New Revision: 20768 Modified: core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java Log: HHH-5578 implement a cleaner version of getPropertyOverriddenByMapperOrMapsId in the SpecJ case Modified: core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:45:09 UTC (rev 20767) +++ core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:45:41 UTC (rev 20768) @@ -682,13 +682,10 @@ } if ( propertyHolder.isInIdClass() ) { PropertyData pd = mappings.getPropertyAnnotatedWithIdAndToOne( persistentXClass, propertyName ); - if ( pd == null ) { - String propertyPath = isId ? "" : propertyName; - return mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyPath ); + if ( pd == null && System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + pd = mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyName ); } - else { - return pd; - } + return pd; } else { String propertyPath = isId ? "" : propertyName;

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20767 - in core/trunk: testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-10-04 05:45:09 -0400 (Mon, 04 Oct 2010) New Revision: 20767 Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java Log: HHH-5578 Support SpecJ's proprietary syntax Generalize the fix a bit Clean some more style issues Fix issues related to the atomicity test fixed setting proper value on property marked as many-to-one-key fixed parsing bug, now it shouldnt affect other many-to-one in the same entity fixed annotation check on many-to-one property Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:44:12 UTC (rev 20766) +++ core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:45:09 UTC (rev 20767) @@ -1417,7 +1417,6 @@ * TODO support true/false/default on the property instead of present / not present * TODO is @Column mandatory? * TODO add method support - * TODO avoid custId hardcoded */ if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { if ( element.isAnnotationPresent( Id.class ) && element.isAnnotationPresent( Column.class ) ) { @@ -1433,7 +1432,7 @@ propertyAccessor, //TODO we should get the right accessor but the same as id would do mappings.getReflectionManager() ); - mappings.addPropertyAnnotatedWithMapsIdSpecj( entity, specJPropertyData, "custId" ); + mappings.addPropertyAnnotatedWithMapsIdSpecj( entity, specJPropertyData, element.toString() ); } } } @@ -2650,7 +2649,8 @@ } } - //Make sure that JPA1 key-many-to-one columns are read only too + //Make sure that JPA1 key-many-to-one columns are read only tooj + boolean hasSpecjManyToOne=false; if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { String columnName = ""; for ( XProperty prop : inferredData.getDeclaringClass() @@ -2659,13 +2659,12 @@ columnName = prop.getAnnotation( Column.class ).name(); } - final JoinColumn joinColumn = prop.getAnnotation( JoinColumn.class ); - if ( prop.isAnnotationPresent( ManyToOne.class ) && joinColumn != null + final JoinColumn joinColumn = property.getAnnotation( JoinColumn.class ); + if ( property.isAnnotationPresent( ManyToOne.class ) && joinColumn != null && !joinColumn.name().isEmpty() && joinColumn.name().equals( columnName ) - && !prop.isAnnotationPresent( MapsId.class ) ) - - { + && !property.isAnnotationPresent( MapsId.class ) ) { + hasSpecjManyToOne = true; for ( Ejb3JoinColumn column : columns ) { column.setInsertable( false ); column.setUpdatable( false ); @@ -2710,6 +2709,10 @@ propertyBinder.setInsertable( false ); propertyBinder.setUpdatable( false ); } + else if (hasSpecjManyToOne) { + propertyBinder.setInsertable( false ); + propertyBinder.setUpdatable( false ); + } else { propertyBinder.setInsertable( columns[0].isInsertable() ); propertyBinder.setUpdatable( columns[0].isUpdatable() ); Modified: core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:44:12 UTC (rev 20766) +++ core/trunk/core/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-10-04 09:45:09 UTC (rev 20767) @@ -681,7 +681,14 @@ throw new AssertionFailure( "PersistentClass name cannot be converted into a Class", e); } if ( propertyHolder.isInIdClass() ) { - return mappings.getPropertyAnnotatedWithIdAndToOne( persistentXClass, propertyName ); + PropertyData pd = mappings.getPropertyAnnotatedWithIdAndToOne( persistentXClass, propertyName ); + if ( pd == null ) { + String propertyPath = isId ? "" : propertyName; + return mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyPath ); + } + else { + return pd; + } } else { String propertyPath = isId ? "" : propertyName; Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:44:12 UTC (rev 20766) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:45:09 UTC (rev 20767) @@ -3594,15 +3594,15 @@ } map.put( property.getProperty().getAnnotation( MapsId.class ).value(), property ); } - + public void addPropertyAnnotatedWithMapsIdSpecj(XClass entityType, PropertyData property, String mapsIdValue) { - Map<String, PropertyData> map = propertiesAnnotatedWithMapsId.get( entityType ); - if ( map == null ) { - map = new HashMap<String, PropertyData>(); - propertiesAnnotatedWithMapsId.put( entityType, map ); - } - map.put( mapsIdValue, property ); - } + Map<String, PropertyData> map = propertiesAnnotatedWithMapsId.get( entityType ); + if ( map == null ) { + map = new HashMap<String, PropertyData>(); + propertiesAnnotatedWithMapsId.put( entityType, map ); + } + map.put( mapsIdValue, property ); + } public PropertyData getPropertyAnnotatedWithIdAndToOne(XClass entityType, String propertyName) { final Map<String, PropertyData> map = propertiesAnnotatedWithIdAndToOne.get( entityType ); Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java 2010-10-04 09:44:12 UTC (rev 20766) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java 2010-10-04 09:45:09 UTC (rev 20767) @@ -43,6 +43,7 @@ public void testComplexIdClass() { + Session s = openSession(); Transaction tx = s.beginTransaction(); @@ -79,16 +80,17 @@ c1.addInventory( house, 100, new BigDecimal( 50000 ) ); s.merge( c1 ); - s.flush(); - s.clear(); + tx.commit(); + + tx = s.beginTransaction(); Customer c12 = ( Customer ) s.createQuery( "select c from Customer c" ).uniqueResult(); -// c12.getBalance(); List<CustomerInventory> inventory = c12.getInventories(); assertEquals( 2, inventory.size() ); assertEquals( 10, inventory.get( 0 ).getQuantity() ); + assertEquals( "2", inventory.get(1).getVehicle().getId()); Item house2 = new Item(); @@ -112,6 +114,20 @@ .uniqueResult(); assertEquals( 3, c13.getInventories().size() ); + + + Customer customer2 = new Customer( + "foo2", "bar2", "contact12", "1002", new BigDecimal( 10002 ), new BigDecimal( 10002 ), new BigDecimal( 1000 )); + customer2.setId(2); + s.persist(customer2); + + customer2.addInventory(boat, 10, new BigDecimal(400)); + customer2.addInventory(house2, 3, new BigDecimal(4000)); + s.merge(customer2); + + Customer c23 = ( Customer ) s.createQuery( "select c from Customer c where c.id = 2" ).uniqueResult(); + assertEquals( 2, c23.getInventories().size() ); + tx.rollback(); s.close(); }

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20766 - in core/trunk: testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-10-04 05:44:12 -0400 (Mon, 04 Oct 2010) New Revision: 20766 Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java Log: HHH-5578 Add support for SpecJ's proprietary syntax Initial patch by Stale Uses a specific property to activate Fix a couple of test issues (The test made change on an unmanaged object wo reattaching it) Fix some code style issues Add TODOs for a proper solution Use the correct PropertyData Populate the metamodel with the PropertyData corresponding to the @ToOne instead of reusing the PropertyData from the @Id property Modified: core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:14:07 UTC (rev 20765) +++ core/trunk/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -1412,6 +1412,33 @@ final XAnnotatedElement element = propertyAnnotatedElement.getProperty(); if ( element.isAnnotationPresent( Id.class ) || element.isAnnotationPresent( EmbeddedId.class ) ) { annElts.add( 0, propertyAnnotatedElement ); + /** + * The property must be put in hibernate.properties as it's a system wide property. Fixable? + * TODO support true/false/default on the property instead of present / not present + * TODO is @Column mandatory? + * TODO add method support + * TODO avoid custId hardcoded + */ + if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + if ( element.isAnnotationPresent( Id.class ) && element.isAnnotationPresent( Column.class ) ) { + String columnName = element.getAnnotation( Column.class ).name(); + for ( XProperty prop : declaringClass.getDeclaredProperties( AccessType.FIELD.getType() ) ) { + if ( prop.isAnnotationPresent( JoinColumn.class ) + && prop.getAnnotation( JoinColumn.class ).name().equals( columnName ) + && !prop.isAnnotationPresent( MapsId.class ) ) { + //create a PropertyData fpr the specJ property holding the mapping + PropertyData specJPropertyData = new PropertyInferredData( + declaringClass, //same dec + prop, // the actual @XToOne property + propertyAccessor, //TODO we should get the right accessor but the same as id would do + mappings.getReflectionManager() + ); + mappings.addPropertyAnnotatedWithMapsIdSpecj( entity, specJPropertyData, "custId" ); + } + } + } + } + if ( element.isAnnotationPresent( ManyToOne.class ) || element.isAnnotationPresent( OneToOne.class ) ) { mappings.addToOneAndIdProperty( entity, propertyAnnotatedElement ); } @@ -2622,6 +2649,31 @@ column.setUpdatable( false ); } } + + //Make sure that JPA1 key-many-to-one columns are read only too + if ( System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) { + String columnName = ""; + for ( XProperty prop : inferredData.getDeclaringClass() + .getDeclaredProperties( AccessType.FIELD.getType() ) ) { + if ( prop.isAnnotationPresent( Id.class ) && prop.isAnnotationPresent( Column.class ) ) { + columnName = prop.getAnnotation( Column.class ).name(); + } + + final JoinColumn joinColumn = prop.getAnnotation( JoinColumn.class ); + if ( prop.isAnnotationPresent( ManyToOne.class ) && joinColumn != null + && !joinColumn.name().isEmpty() + && joinColumn.name().equals( columnName ) + && !prop.isAnnotationPresent( MapsId.class ) ) + + { + for ( Ejb3JoinColumn column : columns ) { + column.setInsertable( false ); + column.setUpdatable( false ); + } + } + } + + } value.setTypeName( inferredData.getClassOrElementName() ); final String propertyName = inferredData.getPropertyName(); value.setTypeUsingReflection( propertyHolder.getClassName(), propertyName ); Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:14:07 UTC (rev 20765) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -3594,6 +3594,15 @@ } map.put( property.getProperty().getAnnotation( MapsId.class ).value(), property ); } + + public void addPropertyAnnotatedWithMapsIdSpecj(XClass entityType, PropertyData property, String mapsIdValue) { + Map<String, PropertyData> map = propertiesAnnotatedWithMapsId.get( entityType ); + if ( map == null ) { + map = new HashMap<String, PropertyData>(); + propertiesAnnotatedWithMapsId.put( entityType, map ); + } + map.put( mapsIdValue, property ); + } public PropertyData getPropertyAnnotatedWithIdAndToOne(XClass entityType, String propertyName) { final Map<String, PropertyData> map = propertiesAnnotatedWithIdAndToOne.get( entityType ); Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-10-04 09:14:07 UTC (rev 20765) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -733,6 +733,8 @@ public void addPropertyAnnotatedWithMapsId(XClass entityType, PropertyData property); + public void addPropertyAnnotatedWithMapsIdSpecj(XClass entityType, PropertyData property, String mapsIdValue); + /** * Should we use the new generator strategy mappings. This is controlled by the * {@link Configuration#USE_NEW_ID_GENERATOR_MAPPINGS} setting. @@ -748,7 +750,4 @@ public PropertyData getPropertyAnnotatedWithIdAndToOne(XClass entityType, String propertyName); void addToOneAndIdProperty(XClass entity, PropertyData property); - - - -} \ No newline at end of file +} Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -0,0 +1,243 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Version; + +@SuppressWarnings("serial") +@NamedQueries({ + @NamedQuery(name = Customer.QUERY_ALL, + query = "select a from Customer a"), + @NamedQuery(name = Customer.QUERY_COUNT, + query = "select COUNT(a) from Customer a"), + @NamedQuery(name = Customer.QUERY_BY_CREDIT, + query = "SELECT c.id FROM Customer c WHERE c.creditLimit > :limit") +}) +@Entity +@Table(name = "O_CUSTOMER") +public class Customer implements Serializable { + public static final String QUERY_ALL = "Customer.selectAll"; + public static final String QUERY_COUNT = "Customer.count"; + public static final String QUERY_BY_CREDIT = "Customer.selectByCreditLimit"; + + public static final String BAD_CREDIT = "BC"; + + @Id + @Column(name = "C_ID") + private int id; + + @Column(name = "C_FIRST") + private String firstName; + + @Column(name = "C_LAST") + private String lastName; + + @Column(name = "C_CONTACT") + private String contact; + + @Column(name = "C_CREDIT") + private String credit; + + @Column(name = "C_CREDIT_LIMIT") + private BigDecimal creditLimit; + + @Column(name = "C_SINCE") + @Temporal(TemporalType.DATE) + private Calendar since; + + @Column(name = "C_BALANCE") + private BigDecimal balance; + + @Column(name = "C_YTD_PAYMENT") + private BigDecimal ytdPayment; + + @OneToMany(targetEntity = CustomerInventory.class, + mappedBy = "customer", + cascade = CascadeType.ALL, + fetch = FetchType.EAGER) + private List<CustomerInventory> customerInventories; + + + @Version + @Column(name = "C_VERSION") + private int version; + + protected Customer() { + } + + public Customer(String first, String last, + String contact, String credit, BigDecimal creditLimit, + BigDecimal balance, BigDecimal YtdPayment) { + + this.firstName = first; + this.lastName = last; + this.contact = contact; + this.since = Calendar.getInstance(); + this.credit = credit; + this.creditLimit = creditLimit; + this.balance = balance; + this.ytdPayment = YtdPayment; + } + + public Integer getId() { + return id; + } + + public void setId(Integer customerId) { + this.id = customerId; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getContact() { + return contact; + } + + public void setContact(String contact) { + this.contact = contact; + } + + public String getCredit() { + return credit; + } + + public void setCredit(String credit) { + this.credit = credit; + } + + public BigDecimal getCreditLimit() { + return creditLimit; + } + + public void setCreditLimit(BigDecimal creditLimit) { + this.creditLimit = creditLimit; + } + + public Calendar getSince() { + return since; + } + + public void setSince(Calendar since) { + this.since = since; + } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + + public void changeBalance(BigDecimal change) { + setBalance( balance.add( change ).setScale( 2, BigDecimal.ROUND_DOWN ) ); + } + + public BigDecimal getYtdPayment() { + return ytdPayment; + } + + public void setYtdPayment(BigDecimal ytdPayment) { + this.ytdPayment = ytdPayment; + } + + public List<CustomerInventory> getInventories() { + if ( customerInventories == null ) { + customerInventories = new ArrayList<CustomerInventory>(); + } + return customerInventories; + } + + public CustomerInventory addInventory(Item item, int quantity, + BigDecimal totalValue) { + + CustomerInventory inventory = new CustomerInventory( + this, item, + quantity, totalValue + ); + getInventories().add( inventory ); + return inventory; + } + + public int getVersion() { + return version; + } + + public boolean hasSufficientCredit(BigDecimal amount) { + return !BAD_CREDIT.equals( getCredit() ) + && creditLimit != null + && creditLimit.compareTo( amount ) >= 0; + } + + @Override + public boolean equals(Object o) { + if ( this == o ) { + return true; + } + if ( o == null || getClass() != o.getClass() ) { + return false; + } + return id == ( ( Customer ) o ).id; + } + + @Override + public int hashCode() { + return new Integer( id ).hashCode(); + } + + @Override + public String toString() { + return this.getFirstName() + " " + this.getLastName(); + } +} Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -0,0 +1,150 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Comparator; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.IdClass; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.TableGenerator; +import javax.persistence.Version; + +@NamedQueries({ + @NamedQuery(name = "CustomerInventory.selectAll", + query = "select a from CustomerInventory a") +}) +@SuppressWarnings("serial") +@Entity +@Table(name = "O_CUSTINVENTORY") +(a)IdClass(CustomerInventoryPK.class) +public class CustomerInventory implements Serializable, Comparator<CustomerInventory> { + + @Id + @TableGenerator(name = "inventory", + table = "U_SEQUENCES", + pkColumnName = "S_ID", + valueColumnName = "S_NEXTNUM", + pkColumnValue = "inventory", + allocationSize = 1000) + @GeneratedValue(strategy = GenerationType.TABLE, generator = "inventory") + @Column(name = "CI_ID") + private Integer id; + + @Id + @Column(name = "CI_CUSTOMERID", insertable = false, updatable = false) + private int custId; + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "CI_CUSTOMERID") + private Customer customer; + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "CI_ITEMID") + private Item vehicle; + + @Column(name = "CI_VALUE") + private BigDecimal totalCost; + + @Column(name = "CI_QUANTITY") + private int quantity; + + @Version + @Column(name = "CI_VERSION") + private int version; + + protected CustomerInventory() { + } + + CustomerInventory(Customer customer, Item vehicle, int quantity, BigDecimal totalValue) { + this.customer = customer; + this.vehicle = vehicle; + this.quantity = quantity; + this.totalCost = totalValue; + } + + public Item getVehicle() { + return vehicle; + } + + public BigDecimal getTotalCost() { + return totalCost; + } + + public int getQuantity() { + return quantity; + } + + public Integer getId() { + return id; + } + + public Customer getCustomer() { + return customer; + } + + public int getCustId() { + return custId; + } + + public int getVersion() { + return version; + } + + public int compare(CustomerInventory cdb1, CustomerInventory cdb2) { + return cdb1.id.compareTo( cdb2.id ); + } + + @Override + public boolean equals(Object obj) { + if ( obj == this ) { + return true; + } + if ( obj == null || !( obj instanceof CustomerInventory ) ) { + return false; + } + if ( this.id == ( ( CustomerInventory ) obj ).id ) { + return true; + } + if ( this.id != null && ( ( CustomerInventory ) obj ).id == null ) { + return false; + } + if ( this.id == null && ( ( CustomerInventory ) obj ).id != null ) { + return false; + } + + return this.id.equals( ( ( CustomerInventory ) obj ).id ); + } + +} Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -0,0 +1,67 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; + +import java.io.Serializable; + + +public class CustomerInventoryPK implements Serializable { + + private Integer id; + private int custId; + + public CustomerInventoryPK() { + } + + public CustomerInventoryPK(Integer id, int custId) { + this.id = id; + this.custId = custId; + } + + public boolean equals(Object other) { + if ( other == this ) { + return true; + } + if ( other == null || getClass() != other.getClass() ) { + return false; + } + CustomerInventoryPK cip = ( CustomerInventoryPK ) other; + return ( custId == cip.custId && ( id == cip.id || + ( id != null && id.equals( cip.id ) ) ) ); + } + + public int hashCode() { + return ( id == null ? 0 : id.hashCode() ) ^ custId; + } + + public Integer getId() { + return id; + } + + public int getCustId() { + return custId; + } + + +} Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -0,0 +1,128 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; + +import java.math.BigDecimal; +import java.util.List; + +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; + +/** + * A test. + * + * @author <a href="mailto:stale.pedersen@jboss.org">Stale W. Pedersen</a> + */ +public class IdMapManyToOneSpecjTest extends TestCase { + + public IdMapManyToOneSpecjTest() { + System.setProperty( "hibernate.enable_specj_proprietary_syntax", "true" ); + } + + public void testComplexIdClass() { + + Session s = openSession(); + Transaction tx = s.beginTransaction(); + + Customer c1 = new Customer( + "foo", "bar", "contact1", "100", new BigDecimal( 1000 ), new BigDecimal( 1000 ), new BigDecimal( 1000 ) + ); + + s.persist( c1 ); + s.flush(); + s.clear(); + + Item boat = new Item(); + boat.setId( "1" ); + boat.setName( "cruiser" ); + boat.setPrice( new BigDecimal( 500 ) ); + boat.setDescription( "a boat" ); + boat.setCategory( 42 ); + + s.persist( boat ); + + + Item house = new Item(); + house.setId( "2" ); + house.setName( "blada" ); + house.setPrice( new BigDecimal( 5000 ) ); + house.setDescription( "a house" ); + house.setCategory( 74 ); + + s.persist( house ); + s.flush(); + s.clear(); + + c1.addInventory( boat, 10, new BigDecimal( 5000 ) ); + + c1.addInventory( house, 100, new BigDecimal( 50000 ) ); + s.merge( c1 ); + s.flush(); + s.clear(); + + Customer c12 = ( Customer ) s.createQuery( "select c from Customer c" ).uniqueResult(); + +// c12.getBalance(); + List<CustomerInventory> inventory = c12.getInventories(); + + assertEquals( 2, inventory.size() ); + assertEquals( 10, inventory.get( 0 ).getQuantity() ); + + + Item house2 = new Item(); + house2.setId( "3" ); + house2.setName( "blada" ); + house2.setPrice( new BigDecimal( 5000 ) ); + house2.setDescription( "a house" ); + house2.setCategory( 74 ); + + s.persist( house2 ); + s.flush(); + s.clear(); + + c12.addInventory( house2, 200, new BigDecimal( 500000 ) ); + s.merge( c12 ); + + s.flush(); + s.clear(); + + Customer c13 = ( Customer ) s.createQuery( "select c from Customer c where c.id = " + c12.getId() ) + .uniqueResult(); + assertEquals( 3, c13.getInventories().size() ); + + tx.rollback(); + s.close(); + } + + protected Class[] getAnnotatedClasses() { + return new Class[] { + Customer.class, + CustomerInventory.class, + CustomerInventoryPK.class, + Item.class + + }; + } +} Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java 2010-10-04 09:44:12 UTC (rev 20766) @@ -0,0 +1,144 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat, Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; + +import java.io.Serializable; +import java.math.BigDecimal; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Version; + + +@NamedQueries({ + @NamedQuery(name = "Item.findByCategory", + query = "SELECT i FROM Item i WHERE i.category=:category ORDER BY i.id") +}) +@SuppressWarnings("serial") +@Entity +@Table(name = "O_ITEM") +public class Item implements Serializable { + + public static final String QUERY_BY_CATEGORY = "Item.findByCategory"; + + @Id + @Column(name = "I_ID") + private String id; + + @Column(name = "I_NAME") + private String name; + + @Column(name = "I_PRICE") + private BigDecimal price; + + @Column(name = "I_DESC") + private String description; + + @Column(name = "I_DISCOUNT") + private BigDecimal discount; + + @Column(name = "I_CATEGORY") + private int category; + + @Version + @Column(name = "I_VERSION") + int version; + + public String getId() { + return id; + } + + public void setId(String i) { + id = i; + } + + public int getCategory() { + return category; + } + + public void setCategory(int category) { + this.category = category; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public BigDecimal getDiscount() { + return discount; + } + + public void setDiscount(BigDecimal discount) { + if ( discount.doubleValue() < 0 || discount.doubleValue() > 100.0 ) { + throw new IllegalArgumentException( + this + " discount " + discount + + " is invalid. Must be between 0.0 and 100.0" + ); + } + this.discount = discount; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + public int getVersion() { + return version; + } + + @Override + public boolean equals(Object other) { + if ( other == null || other.getClass() != this.getClass() ) { + return false; + } + if ( other == this ) { + return true; + } + return id.equals( ( ( Item ) other ).id ); + } + + @Override + public int hashCode() { + return id.hashCode(); + } +}

13 years, 7 months

1
0
0 / 0

Hibernate SVN: r20765 - jpamodelgen/trunk/src/main/docbook/en-US.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-10-04 05:14:07 -0400 (Mon, 04 Oct 2010) New Revision: 20765 Modified: jpamodelgen/trunk/src/main/docbook/en-US/master.xml Log: METAGEN-32 Updated documentation Modified: jpamodelgen/trunk/src/main/docbook/en-US/master.xml =================================================================== --- jpamodelgen/trunk/src/main/docbook/en-US/master.xml 2010-10-01 15:38:46 UTC (rev 20764) +++ jpamodelgen/trunk/src/main/docbook/en-US/master.xml 2010-10-04 09:14:07 UTC (rev 20765) @@ -363,53 +363,34 @@ </example> <para>Once disabled, the <ulink - url="http://code.google.com/p/maven-annotation-plugin/">maven-annotation-plugin</ulink> - for annotation processing (you will need the following additional - maven repositories: <ulink - url="http://maven-annotation-plugin.googlecode.com/svn/trunk/mavenrepo">maven-annotation-plugin</ulink> - and <ulink - url="http://www.jfrog.org/artifactory/plugins-releases">jfrog</ulink>) - can be used. The configuration can be seen in <xref - linkend="maven-processor-plugin" />.</para> + url="http://code.google.com/p/maven-annotation-plugin/">maven-processor-plugin</ulink> + for annotation processing can be used. The configuration can be seen + in <xref linkend="maven-processor-plugin" />.</para> <example id="maven-processor-plugin"> - <title>Configuration with maven-annotation-plugin</title> + <title>Configuration with maven-processor-plugin</title> <programlisting language="XML" role="XML"><plugin> <groupId>org.bsc.maven</groupId> <artifactId>maven-processor-plugin</artifactId> + <version>1.3.7</version> <executions> <execution> <id>process</id> <goals> <goal>process</goal> </goals> - <phase>generate-sources</phase> - <configuration> -  - <outputDirectory>target/metamodel</outputDirectory> - </configuration> + <phase>process-sources</phase> </execution> </executions> -</plugin> -<plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/metamodel</source> - </sources> - </configuration> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jpamodelgen</artifactId> + <version>&version;</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin></programlisting> </example> </section>

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits October 2010