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

HHH-12147 - Add support for JPA2.2 @TableGenerators and @SequenceGenerators

This commit is contained in:
Andrea Boriero 2017-12-06 08:14:46 +00:00 committed by Steve Ebersole
parent 37e918d1d4
commit 6818275376
1 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
View File

@ -61,11 +61,13 @@ import javax.persistence.OrderColumn;
import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.PrimaryKeyJoinColumns; import javax.persistence.PrimaryKeyJoinColumns;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.SequenceGenerators;
import javax.persistence.SharedCacheMode; import javax.persistence.SharedCacheMode;
import javax.persistence.SqlResultSetMapping; import javax.persistence.SqlResultSetMapping;
import javax.persistence.SqlResultSetMappings; import javax.persistence.SqlResultSetMappings;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.TableGenerator; import javax.persistence.TableGenerator;
import javax.persistence.TableGenerators;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.persistence.Version; import javax.persistence.Version;
@ -224,6 +226,34 @@ public final class AnnotationBinder {
} }
} }
{
List<TableGenerators> anns = (List<TableGenerators>) defaults.get( TableGenerators.class );
if ( anns != null ) {
anns.forEach( tableGenerators -> {
for ( TableGenerator tableGenerator : tableGenerators.value() ) {
IdentifierGeneratorDefinition idGen = buildIdGenerator( tableGenerator, context );
if ( idGen != null ) {
context.getMetadataCollector().addDefaultIdentifierGenerator( idGen );
}
}
} );
}
}
{
List<SequenceGenerators> anns = (List<SequenceGenerators>) defaults.get( SequenceGenerators.class );
if ( anns != null ) {
anns.forEach( sequenceGenerators -> {
for ( SequenceGenerator ann : sequenceGenerators.value() ) {
IdentifierGeneratorDefinition idGen = buildIdGenerator( ann, context );
if ( idGen != null ) {
context.getMetadataCollector().addDefaultIdentifierGenerator( idGen );
}
}
} );
}
}
// queries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // queries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{ {
@ -298,12 +328,24 @@ public final class AnnotationBinder {
LOG.tracev( "Add sequence generator with name: {0}", idGen.getName() ); LOG.tracev( "Add sequence generator with name: {0}", idGen.getName() );
} }
} }
if ( pckg.isAnnotationPresent( SequenceGenerators.class ) ) {
SequenceGenerators ann = pckg.getAnnotation( SequenceGenerators.class );
for ( SequenceGenerator tableGenerator : ann.value() ) {
context.getMetadataCollector().addIdentifierGenerator( buildIdGenerator( tableGenerator, context ) );
}
}
if ( pckg.isAnnotationPresent( TableGenerator.class ) ) { if ( pckg.isAnnotationPresent( TableGenerator.class ) ) {
TableGenerator ann = pckg.getAnnotation( TableGenerator.class ); TableGenerator ann = pckg.getAnnotation( TableGenerator.class );
IdentifierGeneratorDefinition idGen = buildIdGenerator( ann, context ); IdentifierGeneratorDefinition idGen = buildIdGenerator( ann, context );
context.getMetadataCollector().addIdentifierGenerator( idGen ); context.getMetadataCollector().addIdentifierGenerator( idGen );
} }
if ( pckg.isAnnotationPresent( TableGenerators.class ) ) {
TableGenerators ann = pckg.getAnnotation( TableGenerators.class );
for ( TableGenerator tableGenerator : ann.value() ) {
context.getMetadataCollector().addIdentifierGenerator( buildIdGenerator( tableGenerator, context ) );
}
}
bindGenericGenerators( pckg, context ); bindGenericGenerators( pckg, context );
bindQueries( pckg, context ); bindQueries( pckg, context );
@ -3354,7 +3396,28 @@ public final class AnnotationBinder {
} }
private static HashMap<String, IdentifierGeneratorDefinition> buildLocalGenerators(XAnnotatedElement annElt, MetadataBuildingContext context) { private static HashMap<String, IdentifierGeneratorDefinition> buildLocalGenerators(XAnnotatedElement annElt, MetadataBuildingContext context) {
HashMap<String, IdentifierGeneratorDefinition> generators = new HashMap<String, IdentifierGeneratorDefinition>(); HashMap<String, IdentifierGeneratorDefinition> generators = new HashMap<>();
TableGenerators tableGenerators = annElt.getAnnotation( TableGenerators.class );
if ( tableGenerators != null ) {
for ( TableGenerator tableGenerator : tableGenerators.value() ) {
generators.put(
buildIdGenerator( tableGenerator, context ).getName(),
buildIdGenerator( tableGenerator, context )
);
}
}
SequenceGenerators sequenceGenerators = annElt.getAnnotation( SequenceGenerators.class );
if ( sequenceGenerators != null ) {
for ( SequenceGenerator sequenceGenerator : sequenceGenerators.value() ) {
generators.put(
buildIdGenerator( sequenceGenerator, context ).getName(),
buildIdGenerator( sequenceGenerator, context )
);
}
}
TableGenerator tabGen = annElt.getAnnotation( TableGenerator.class ); TableGenerator tabGen = annElt.getAnnotation( TableGenerator.class );
SequenceGenerator seqGen = annElt.getAnnotation( SequenceGenerator.class ); SequenceGenerator seqGen = annElt.getAnnotation( SequenceGenerator.class );
GenericGenerator genGen = annElt.getAnnotation( GenericGenerator.class ); GenericGenerator genGen = annElt.getAnnotation( GenericGenerator.class );