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

HHH-6142 - Integrate JAXB-based binding code and MetadataSources

This commit is contained in:
Steve Ebersole 2011-04-19 10:32:08 -05:00
parent 363608a604
commit d2f7ee8ae5
5 changed files with 36 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSources.java
View File

@ -81,6 +81,14 @@ public class MetadataSources {
return jaxbRootList;
}
public Iterable<String> getAnnotatedPackages() {
return annotatedPackages;
}
public Iterable<Class> getAnnotatedClasses() {
return annotatedClasses;
}
public BasicServiceRegistry getServiceRegistry() {
return serviceRegistry;
}

34
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
View File

@ -24,7 +24,9 @@
package org.hibernate.metamodel.source.internal;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jboss.logging.Logger;
@ -55,8 +57,7 @@ public class MetadataImpl implements Metadata, MetadataImplementor, Serializable
private final BasicServiceRegistry serviceRegistry;
private final NamingStrategy namingStrategy;
private final AnnotationBinder annotationBinder;
private final HibernateXmlBinder hibernateXmlBinder;
final AnnotationBinder annotationBinder = new AnnotationBinder( this );
private final Database database = new Database();
@ -69,18 +70,35 @@ public class MetadataImpl implements Metadata, MetadataImplementor, Serializable
this.serviceRegistry = metadataSources.getServiceRegistry();
this.namingStrategy = metadataSources.getNamingStrategy();
this.annotationBinder = new AnnotationBinder( this );
this.hibernateXmlBinder = new HibernateXmlBinder( this );
final ArrayList<String> processedEntityNames = new ArrayList<String>();
if ( preferredProcessingOrder == ProcessingOrder.HBM_FIRST ) {
applyHibernateMappings( metadataSources, processedEntityNames );
applyAnnotationMappings( metadataSources, processedEntityNames );
}
else {
applyAnnotationMappings( metadataSources, processedEntityNames );
applyHibernateMappings( metadataSources, processedEntityNames );
}
}
private void applyHibernateMappings(MetadataSources metadataSources, List<String> processedEntityNames) {
final HibernateXmlBinder hibernateXmlBinder = new HibernateXmlBinder( this );
for ( JaxbRoot jaxbRoot : metadataSources.getJaxbRootList() ) {
// filter to just hbm-based roots
hibernateXmlBinder.bindRoot( jaxbRoot );
}
}
private void applyAnnotationMappings(MetadataSources metadataSources, List<String> processedEntityNames) {
// todo : not sure how to best mesh what we have here with what AnnotationBinder is expecting... hardy?
// also, AnnotationBinder should become method local
}
public BasicServiceRegistry getServiceRegistry() {
return serviceRegistry;
}
public HibernateXmlBinder getHibernateXmlBinder() {
return hibernateXmlBinder;
}
public AnnotationBinder getAnnotationBinder() {
return annotationBinder;
}

216
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataSourceQueue.java
View File

@ -1,216 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. 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.metamodel.source.internal;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
import org.jboss.logging.Logger;
import org.hibernate.InvalidMappingException;
import org.hibernate.MappingException;
import org.hibernate.cfg.MetadataSourceType;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.metamodel.source.hbm.xml.mapping.HibernateMapping;
import org.hibernate.metamodel.source.util.MappingHelper;
/**
* Container for xml configuration documents and annotated classes.
*
* @author Steve Ebersole
*/
public class MetadataSourceQueue implements Serializable {
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
CoreMessageLogger.class, MetadataSourceQueue.class.getName()
);
private final MetadataImpl metadata;
private LinkedHashMap<JaxbRoot, Set<String>> hbmMetadataToEntityNamesMap
= new LinkedHashMap<JaxbRoot, Set<String>>();
private Map<String, JaxbRoot> hbmMetadataByEntityNameXRef = new HashMap<String, JaxbRoot>();
private transient List<Class> annotatedClasses = new ArrayList<Class>();
public MetadataSourceQueue(MetadataImpl metadata) {
this.metadata = metadata;
}
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
}
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
}
/* TODO: needed anymore???
public void add(XmlDocument metadataXml) {
final Document document = metadataXml.getDocumentTree();
final Element hmNode = document.getRootElement();
Attribute packNode = hmNode.attribute( "package" );
String defaultPackage = packNode != null ? packNode.getValue() : "";
Set<String> entityNames = new HashSet<String>();
findClassNames( defaultPackage, hmNode, entityNames );
for ( String entity : entityNames ) {
hbmMetadataByEntityNameXRef.put( entity, jaxbRoot );
}
this.hbmMetadataToEntityNamesMap.put( jaxbRoot, entityNames );
}
*/
public void add(JaxbRoot jaxbRoot) {
// TODO: does this have to work for EntityMappings also?
final HibernateMapping hibernateMapping = ( HibernateMapping ) jaxbRoot.getRoot();
String defaultPackage = MappingHelper.getStringValue( hibernateMapping.getPackage(), "" );
Set<String> entityNames = new HashSet<String>();
findClassNames( defaultPackage, hibernateMapping.getClazzOrSubclassOrJoinedSubclass(), entityNames );
for ( String entity : entityNames ) {
hbmMetadataByEntityNameXRef.put( entity, jaxbRoot );
}
this.hbmMetadataToEntityNamesMap.put( jaxbRoot, entityNames );
}
private void findClassNames(String defaultPackage, List entityClasses, Set<String> names) {
// if we have some extends we need to check if those classes possibly could be inside the
// same hbm.xml file...
// HibernateMapping.getClazzOrSubclassOrJoinedSubclass returns union-subclass objects
// as well as class, subclass, and joined-subclass objects
for ( Object entityClass : entityClasses) {
String entityName;
// TODO: can Class, Subclass, JoinedSubclass, and UnionSubclass implement the same interface
// so this stuff doesn't need to be duplicated?
if ( org.hibernate.metamodel.source.hbm.xml.mapping.Subclass.class.isInstance( entityClass ) ) {
org.hibernate.metamodel.source.hbm.xml.mapping.Subclass clazz = org.hibernate.metamodel.source.hbm.xml.mapping.Subclass.class.cast( entityClass );
names.add(
clazz.getEntityName() != null ?
clazz.getEntityName() :
getClassName( clazz.getName(), defaultPackage )
);
findClassNames( defaultPackage, clazz.getSubclass(), names );
}
else if ( org.hibernate.metamodel.source.hbm.xml.mapping.Class.class.isInstance( entityClass ) ) {
org.hibernate.metamodel.source.hbm.xml.mapping.Class clazz = org.hibernate.metamodel.source.hbm.xml.mapping.Class.class.cast( entityClass );
names.add(
clazz.getEntityName() != null ?
clazz.getEntityName() :
getClassName( clazz.getName(), defaultPackage )
);
findClassNames( defaultPackage, clazz.getSubclass(), names );
findClassNames( defaultPackage, clazz.getJoinedSubclass(), names );
findClassNames( defaultPackage, clazz.getUnionSubclass(), names );
}
else if ( org.hibernate.metamodel.source.hbm.xml.mapping.UnionSubclass.class.isInstance( entityClass ) ) {
org.hibernate.metamodel.source.hbm.xml.mapping.UnionSubclass clazz = org.hibernate.metamodel.source.hbm.xml.mapping.UnionSubclass.class.cast( entityClass );
names.add(
clazz.getEntityName() != null ?
clazz.getEntityName() :
getClassName( clazz.getName(), defaultPackage )
);
findClassNames( defaultPackage, clazz.getUnionSubclass(), names );
}
else if ( org.hibernate.metamodel.source.hbm.xml.mapping.JoinedSubclass.class.isInstance( entityClass ) ) {
org.hibernate.metamodel.source.hbm.xml.mapping.JoinedSubclass clazz = org.hibernate.metamodel.source.hbm.xml.mapping.JoinedSubclass.class.cast( entityClass );
names.add(
clazz.getEntityName() != null ?
clazz.getEntityName() :
getClassName( clazz.getName(), defaultPackage )
);
findClassNames( defaultPackage, clazz.getJoinedSubclass(), names );
}
else {
throw new InvalidMappingException( "unknown type of entity class", entityClass.getClass().getName() );
}
}
}
private String getClassName(String unqualifiedName, String defaultPackage) {
if ( unqualifiedName == null ) {
return null;
}
if ( unqualifiedName.indexOf( '.' ) < 0 && defaultPackage != null ) {
return defaultPackage + '.' + unqualifiedName;
}
return unqualifiedName;
}
public void add(Class annotatedClass) {
annotatedClasses.add( annotatedClass );
}
protected void processMetadata(List<MetadataSourceType> order) {
for ( MetadataSourceType type : order ) {
if ( MetadataSourceType.HBM.equals( type ) ) {
processHbmXmlQueue();
}
else if ( MetadataSourceType.CLASS.equals( type ) ) {
processAnnotatedClassesQueue();
}
}
}
private void processHbmXmlQueue() {
LOG.debug( "Processing hbm.xml files" );
for ( Map.Entry<JaxbRoot, Set<String>> entry : hbmMetadataToEntityNamesMap.entrySet() ) {
// Unfortunately we have to create a Mappings instance for each iteration here
processHbmXml( entry.getKey(), entry.getValue() );
}
hbmMetadataToEntityNamesMap.clear();
hbmMetadataByEntityNameXRef.clear();
}
public void processHbmXml(JaxbRoot jaxbRoot, Set<String> entityNames) {
try {
metadata.getHibernateXmlBinder().bindRoot( jaxbRoot, entityNames );
}
catch ( MappingException me ) {
throw new InvalidMappingException(
jaxbRoot.getOrigin().getType().toString(),
jaxbRoot.getOrigin().getName(),
me
);
}
}
private void processAnnotatedClassesQueue() {
LOG.debug( "Process annotated classes" );
annotatedClasses.clear();
}
public boolean isEmpty() {
return hbmMetadataToEntityNamesMap.isEmpty() && annotatedClasses.isEmpty();
}
}

3
hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicHbmBindingTests.java
View File

@ -62,9 +62,8 @@ public class BasicHbmBindingTests extends AbstractBasicBindingTests {
private EntityBinding getEntityBinding(String resourceName, String entityName ) {
MetadataSources metadataSources = new MetadataSources( basicServiceRegistry() );
metadataSources.addResource( resourceName );
MetadataImpl metadata = ( MetadataImpl ) metadataSources.buildMetadata();
assertEquals( 1, metadataSources.getJaxbRootList().size() );
metadata.getHibernateXmlBinder().bindRoot( metadataSources.getJaxbRootList().get( 0 ) );
MetadataImpl metadata = ( MetadataImpl ) metadataSources.buildMetadata();
return metadata.getEntityBinding( entityName );
}
}

2
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java
View File

@ -36,7 +36,7 @@ public class FetchProfileBinderTest extends BaseUnitTestCase {
public void setUp() {
serviceRegistry = new BasicServiceRegistryImpl( Collections.emptyMap() );
service = serviceRegistry.getService( ClassLoaderService.class );
meta = new MetadataImpl( new MetadataSources( serviceRegistry ) );
meta = (MetadataImpl) new MetadataSources( serviceRegistry ).buildMetadata();
}
@After