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

HHH-6133 update global configuration override strategy to make it consisit with previouse version

This commit is contained in:
Strong Liu 2011-05-13 21:16:15 +08:00
parent 4e0f6a1578
commit f70f8d7101
1 changed files with 99 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java
View File

@ -25,14 +25,19 @@ package org.hibernate.metamodel.source.annotations.xml.mocker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.DotName; import org.jboss.jandex.DotName;
import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.metamodel.source.MappingException;
import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; import org.hibernate.metamodel.source.annotation.xml.XMLAttributes;
import org.hibernate.metamodel.source.annotation.xml.XMLEntity; import org.hibernate.metamodel.source.annotation.xml.XMLEntity;
import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings;
@ -48,6 +53,10 @@ import org.hibernate.metamodel.source.annotations.JPADotNames;
* @author Strong Liu * @author Strong Liu
*/ */
class GlobalAnnotations implements JPADotNames { class GlobalAnnotations implements JPADotNames {
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
CoreMessageLogger.class,
GlobalAnnotations.class.getName()
);
private Map<String, XMLSequenceGenerator> sequenceGeneratorMap = new HashMap<String, XMLSequenceGenerator>(); private Map<String, XMLSequenceGenerator> sequenceGeneratorMap = new HashMap<String, XMLSequenceGenerator>();
private Map<String, XMLTableGenerator> tableGeneratorMap = new HashMap<String, XMLTableGenerator>(); private Map<String, XMLTableGenerator> tableGeneratorMap = new HashMap<String, XMLTableGenerator>();
private Map<String, XMLNamedQuery> namedQueryMap = new HashMap<String, XMLNamedQuery>(); private Map<String, XMLNamedQuery> namedQueryMap = new HashMap<String, XMLNamedQuery>();
@ -55,6 +64,11 @@ class GlobalAnnotations implements JPADotNames {
private Map<String, XMLSqlResultSetMapping> sqlResultSetMappingMap = new HashMap<String, XMLSqlResultSetMapping>(); private Map<String, XMLSqlResultSetMapping> sqlResultSetMappingMap = new HashMap<String, XMLSqlResultSetMapping>();
private Map<DotName, List<AnnotationInstance>> annotationInstanceMap = new HashMap<DotName, List<AnnotationInstance>>(); private Map<DotName, List<AnnotationInstance>> annotationInstanceMap = new HashMap<DotName, List<AnnotationInstance>>();
private List<AnnotationInstance> indexedAnnotationInstanceList = new ArrayList<AnnotationInstance>(); private List<AnnotationInstance> indexedAnnotationInstanceList = new ArrayList<AnnotationInstance>();
//---------------------------
private Set<String> defaultNamedNativeQueryNames = new HashSet<String>();
private Set<String> defaultNamedQueryNames = new HashSet<String>();
private Set<String> defaultNamedGenerators = new HashSet<String>();
private Set<String> defaultSqlResultSetMappingNames = new HashSet<String>();
Map<DotName, List<AnnotationInstance>> getAnnotationInstanceMap() { Map<DotName, List<AnnotationInstance>> getAnnotationInstanceMap() {
return annotationInstanceMap; return annotationInstanceMap;
@ -67,7 +81,7 @@ class GlobalAnnotations implements JPADotNames {
List<AnnotationInstance> list = annotationInstanceMap.get( name ); List<AnnotationInstance> list = annotationInstanceMap.get( name );
if ( list == null ) { if ( list == null ) {
list = new ArrayList<AnnotationInstance>(); list = new ArrayList<AnnotationInstance>();
annotationInstanceMap.put( name,list ); annotationInstanceMap.put( name, list );
} }
list.add( annotationInstance ); list.add( annotationInstance );
return annotationInstance; return annotationInstance;
@ -108,35 +122,6 @@ class GlobalAnnotations implements JPADotNames {
return tableGeneratorMap; return tableGeneratorMap;
} }
void put(String name, XMLNamedNativeQuery value) {
if ( value != null ) {
namedNativeQueryMap.put( name, value );
}
}
void put(String name, XMLNamedQuery value) {
if ( value != null ) {
namedQueryMap.put( name, value );
}
}
void put(String name, XMLSequenceGenerator value) {
if ( value != null ) {
sequenceGeneratorMap.put( name, value );
}
}
void put(String name, XMLTableGenerator value) {
if ( value != null ) {
tableGeneratorMap.put( name, value );
}
}
void put(String name, XMLSqlResultSetMapping value) {
if ( value != null ) {
sqlResultSetMappingMap.put( name, value );
}
}
public void filterIndexedAnnotations() { public void filterIndexedAnnotations() {
for ( AnnotationInstance annotationInstance : indexedAnnotationInstanceList ) { for ( AnnotationInstance annotationInstance : indexedAnnotationInstanceList ) {
@ -169,54 +154,71 @@ class GlobalAnnotations implements JPADotNames {
void collectGlobalMappings(XMLEntityMappings entityMappings, EntityMappingsMocker.Default defaults) { void collectGlobalMappings(XMLEntityMappings entityMappings, EntityMappingsMocker.Default defaults) {
for ( XMLSequenceGenerator generator : entityMappings.getSequenceGenerator() ) { for ( XMLSequenceGenerator generator : entityMappings.getSequenceGenerator() ) {
put( generator.getName(), overrideGenerator( generator, defaults ) ); put( generator, defaults );
defaultNamedGenerators.add( generator.getName() );
} }
for ( XMLTableGenerator generator : entityMappings.getTableGenerator() ) { for ( XMLTableGenerator generator : entityMappings.getTableGenerator() ) {
put( generator.getName(), overrideGenerator( generator, defaults ) ); put( generator, defaults );
defaultNamedGenerators.add( generator.getName() );
} }
for ( XMLNamedQuery namedQuery : entityMappings.getNamedQuery() ) { for ( XMLNamedQuery namedQuery : entityMappings.getNamedQuery() ) {
put( namedQuery.getName(), namedQuery ); put( namedQuery );
defaultNamedQueryNames.add( namedQuery.getName() );
} }
for ( XMLNamedNativeQuery namedNativeQuery : entityMappings.getNamedNativeQuery() ) { for ( XMLNamedNativeQuery namedNativeQuery : entityMappings.getNamedNativeQuery() ) {
put( namedNativeQuery.getName(), namedNativeQuery ); put( namedNativeQuery );
defaultNamedNativeQueryNames.add( namedNativeQuery.getName() );
} }
for ( XMLSqlResultSetMapping sqlResultSetMapping : entityMappings.getSqlResultSetMapping() ) { for ( XMLSqlResultSetMapping sqlResultSetMapping : entityMappings.getSqlResultSetMapping() ) {
put( sqlResultSetMapping.getName(), sqlResultSetMapping ); put( sqlResultSetMapping );
defaultSqlResultSetMappingNames.add( sqlResultSetMapping.getName() );
} }
} }
void collectGlobalMappings(XMLEntity entity, EntityMappingsMocker.Default defaults) { void collectGlobalMappings(XMLEntity entity, EntityMappingsMocker.Default defaults) {
for ( XMLNamedQuery namedQuery : entity.getNamedQuery() ) { for ( XMLNamedQuery namedQuery : entity.getNamedQuery() ) {
put( namedQuery.getName(), namedQuery ); if ( !defaultNamedQueryNames.contains( namedQuery.getName() ) ) {
put( namedQuery );
}
else {
LOG.warn( "Named Query [" + namedQuery.getName() + "] duplicated." );
}
} }
for ( XMLNamedNativeQuery namedNativeQuery : entity.getNamedNativeQuery() ) { for ( XMLNamedNativeQuery namedNativeQuery : entity.getNamedNativeQuery() ) {
put( namedNativeQuery.getName(), namedNativeQuery ); if ( !defaultNamedNativeQueryNames.contains( namedNativeQuery.getName() ) ) {
put( namedNativeQuery );
}
else {
LOG.warn( "Named native Query [" + namedNativeQuery.getName() + "] duplicated." );
}
} }
for ( XMLSqlResultSetMapping sqlResultSetMapping : entity.getSqlResultSetMapping() ) { for ( XMLSqlResultSetMapping sqlResultSetMapping : entity.getSqlResultSetMapping() ) {
put( sqlResultSetMapping.getName(), sqlResultSetMapping ); if ( !defaultSqlResultSetMappingNames.contains( sqlResultSetMapping.getName() ) ) {
put( sqlResultSetMapping );
}
} }
XMLSequenceGenerator sequenceGenerator = entity.getSequenceGenerator(); XMLSequenceGenerator sequenceGenerator = entity.getSequenceGenerator();
if ( sequenceGenerator != null ) { if ( sequenceGenerator != null ) {
put( sequenceGenerator.getName(), overrideGenerator( sequenceGenerator, defaults ) ); if ( !defaultNamedGenerators.contains( sequenceGenerator.getName() ) ) {
put( sequenceGenerator, defaults );
}
} }
XMLTableGenerator tableGenerator = entity.getTableGenerator(); XMLTableGenerator tableGenerator = entity.getTableGenerator();
if ( tableGenerator != null ) { if ( tableGenerator != null ) {
put( tableGenerator.getName(), overrideGenerator( tableGenerator, defaults ) ); if ( !defaultNamedGenerators.contains( tableGenerator.getName() ) ) {
put( tableGenerator, defaults );
}
} }
XMLAttributes attributes = entity.getAttributes(); XMLAttributes attributes = entity.getAttributes();
if ( attributes != null ) { if ( attributes != null ) {
for ( XMLId id : attributes.getId() ) { for ( XMLId id : attributes.getId() ) {
sequenceGenerator = id.getSequenceGenerator(); sequenceGenerator = id.getSequenceGenerator();
if ( sequenceGenerator != null ) { if ( sequenceGenerator != null ) {
put( put( sequenceGenerator, defaults );
sequenceGenerator.getName(), overrideGenerator(
sequenceGenerator, defaults
)
);
} }
tableGenerator = id.getTableGenerator(); tableGenerator = id.getTableGenerator();
if ( tableGenerator != null ) { if ( tableGenerator != null ) {
put( tableGenerator.getName(), overrideGenerator( tableGenerator, defaults ) ); put( tableGenerator, defaults );
} }
} }
} }
@ -226,10 +228,10 @@ class GlobalAnnotations implements JPADotNames {
* Override SequenceGenerator using info definded in EntityMappings/Persistence-Metadata-Unit * Override SequenceGenerator using info definded in EntityMappings/Persistence-Metadata-Unit
*/ */
private static XMLSequenceGenerator overrideGenerator(XMLSequenceGenerator generator, EntityMappingsMocker.Default defaults) { private static XMLSequenceGenerator overrideGenerator(XMLSequenceGenerator generator, EntityMappingsMocker.Default defaults) {
if ( StringHelper.isEmpty( generator.getSchema() ) ) { if ( StringHelper.isEmpty( generator.getSchema() ) && defaults != null ) {
generator.setSchema( defaults.getSchema() ); generator.setSchema( defaults.getSchema() );
} }
if ( StringHelper.isEmpty( generator.getCatalog() ) ) { if ( StringHelper.isEmpty( generator.getCatalog() ) && defaults != null ) {
generator.setCatalog( defaults.getCatalog() ); generator.setCatalog( defaults.getCatalog() );
} }
return generator; return generator;
@ -239,12 +241,59 @@ class GlobalAnnotations implements JPADotNames {
* Override TableGenerator using info definded in EntityMappings/Persistence-Metadata-Unit * Override TableGenerator using info definded in EntityMappings/Persistence-Metadata-Unit
*/ */
private static XMLTableGenerator overrideGenerator(XMLTableGenerator generator, EntityMappingsMocker.Default defaults) { private static XMLTableGenerator overrideGenerator(XMLTableGenerator generator, EntityMappingsMocker.Default defaults) {
if ( StringHelper.isEmpty( generator.getSchema() ) ) { if ( StringHelper.isEmpty( generator.getSchema() ) && defaults != null ) {
generator.setSchema( defaults.getSchema() ); generator.setSchema( defaults.getSchema() );
} }
if ( StringHelper.isEmpty( generator.getCatalog() ) ) { if ( StringHelper.isEmpty( generator.getCatalog() ) && defaults != null ) {
generator.setCatalog( defaults.getCatalog() ); generator.setCatalog( defaults.getCatalog() );
} }
return generator; return generator;
} }
private void put(XMLNamedNativeQuery query) {
if ( query != null ) {
checkQueryName( query.getName() );
namedNativeQueryMap.put( query.getName(), query );
}
}
private void checkQueryName(String name) {
if ( namedQueryMap.containsKey( name ) || namedNativeQueryMap.containsKey( name ) ) {
throw new MappingException( "Duplicated query mapping " + name, null );
}
}
private void put(XMLNamedQuery query) {
if ( query != null ) {
checkQueryName( query.getName() );
namedQueryMap.put( query.getName(), query );
}
}
private void put(XMLSequenceGenerator generator, EntityMappingsMocker.Default defaults) {
if ( generator != null ) {
Object old = sequenceGeneratorMap.put( generator.getName(), overrideGenerator( generator, defaults ) );
if ( old != null ) {
LOG.duplicateGeneratorName( generator.getName() );
}
}
}
private void put(XMLTableGenerator generator, EntityMappingsMocker.Default defaults) {
if ( generator != null ) {
Object old = tableGeneratorMap.put( generator.getName(), overrideGenerator( generator, defaults ) );
if ( old != null ) {
LOG.duplicateGeneratorName( generator.getName() );
}
}
}
private void put(XMLSqlResultSetMapping mapping) {
if ( mapping != null ) {
Object old = sqlResultSetMappingMap.put( mapping.getName(), mapping );
if ( old != null ) {
throw new MappingException( "Duplicated SQL result set mapping " + mapping.getName(), null );
}
}
}
} }