[hibernate-commits] Hibernate SVN: r17872 - in core/trunk: core/src/main/java/org/hibernate/cfg and 1 other directory.

Author: epbernard Date: 2009-10-28 20:13:24 -0400 (Wed, 28 Oct 2009) New Revision: 17872 Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.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-4533 move metamodel storage to Hibernate Core Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2009-10-28 18:14:25 UTC (rev 17871) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2009-10-29 00:13:24 UTC (rev 17872) @@ -135,7 +135,6 @@ private transient ReflectionManager reflectionManager; private boolean isDefaultProcessed = false; private boolean isValidatorNotPresentLogged; - private Map<Class<?>, org.hibernate.mapping.MappedSuperclass> mappedSuperclasses; public AnnotationConfiguration() { super(); @@ -261,7 +260,6 @@ namingStrategy = EJB3NamingStrategy.INSTANCE; setEntityResolver( new EJB3DTDEntityResolver() ); anyMetaDefs = new HashMap<String, AnyMetaDef>(); - mappedSuperclasses = new HashMap<Class<?>, org.hibernate.mapping.MappedSuperclass>(); reflectionManager = new JavaReflectionManager(); ( ( MetadataProviderInjector ) reflectionManager ).setMetadataProvider( new JPAMetadataProvider() ); @@ -1180,14 +1178,6 @@ return inSecondPass; } - public void addMappedSuperclass(Class<?> type, org.hibernate.mapping.MappedSuperclass mappedSuperclass) { - mappedSuperclasses.put( type, mappedSuperclass ); - } - - public org.hibernate.mapping.MappedSuperclass getMappedSuperclass(Class<?> type) { - return mappedSuperclasses.get( type ); - } - public IdGenerator getGenerator(String name) { return getGenerator( name, null ); } Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2009-10-28 18:14:25 UTC (rev 17871) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2009-10-29 00:13:24 UTC (rev 17872) @@ -161,14 +161,4 @@ public AnyMetaDef getAnyMetaDef(String name); public boolean isInSecondPass(); - - /** - * add a new MappedSuperclass - */ - public void addMappedSuperclass(Class<?> type, org.hibernate.mapping.MappedSuperclass mappedSuperclass); - - /** - * Get a MappedSuperclass or null if not mapped - */ - org.hibernate.mapping.MappedSuperclass getMappedSuperclass(Class<?> type); } \ No newline at end of file Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-10-28 18:14:25 UTC (rev 17871) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-10-29 00:13:24 UTC (rev 17872) @@ -126,6 +126,7 @@ import org.hibernate.mapping.DenormalizedTable; import org.hibernate.mapping.TypeDef; import org.hibernate.mapping.Column; +import org.hibernate.mapping.MappedSuperclass; import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.secure.JACCConfiguration; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; @@ -207,6 +208,9 @@ private DefaultIdentifierGeneratorFactory identifierGeneratorFactory; + //Map<Class<?>, org.hibernate.mapping.MappedSuperclass> + private Map mappedSuperclasses; + protected Configuration(SettingsFactory settingsFactory) { this.settingsFactory = settingsFactory; reset(); @@ -252,6 +256,8 @@ // componentTuplizerFactory = new ComponentTuplizerFactory(); identifierGeneratorFactory = new DefaultIdentifierGeneratorFactory(); + + mappedSuperclasses = new HashMap(); } public EntityTuplizerFactory getEntityTuplizerFactory() { @@ -2747,5 +2753,17 @@ public DefaultIdentifierGeneratorFactory getIdentifierGeneratorFactory() { return identifierGeneratorFactory; } + + public void addMappedSuperclass(Class type, MappedSuperclass mappedSuperclass) { + mappedSuperclasses.put( type, mappedSuperclass ); + } + + public MappedSuperclass getMappedSuperclass(Class type) { + return (MappedSuperclass) mappedSuperclasses.get( type ); + } + + public Iterator iterateMappedSuperclasses() { + return mappedSuperclasses.values().iterator(); + } } } Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2009-10-28 18:14:25 UTC (rev 17871) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java 2009-10-29 00:13:24 UTC (rev 17872) @@ -526,4 +526,29 @@ * @return The IdentifierGeneratorFactory */ public DefaultIdentifierGeneratorFactory getIdentifierGeneratorFactory(); + + /** + * add a new MappedSuperclass + * This should not be called if the MappedSuperclass already exists + * (it would be erased) + * @param type type corresponding to the Mappedsuperclass + * @param mappedSuperclass MappedSuperclass + */ + public void addMappedSuperclass(Class type, org.hibernate.mapping.MappedSuperclass mappedSuperclass); + + /** + * Get a MappedSuperclass or null if not mapped + * + * @param type class corresponding to the MappedSuperclass + * @return the MappedSuperclass + */ + org.hibernate.mapping.MappedSuperclass getMappedSuperclass(Class type); + + /** + * Iterator over the MappedSuperclass mappings + * Use an iterator as a symetry to the other methods on Mappings + * + * @return mappedSuperclasses + */ + public Iterator iterateMappedSuperclasses(); } \ No newline at end of file