diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index 447730ea3d..accc04e707 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -76,7 +76,7 @@ task jaxb { // hibernate-configuration ant.xjc( destdir: '${jaxbTargetDir}', - package: 'org.hibernate.metamodel.source.hbm.xml.config', + package: 'org.hibernate.metamodel.source.hbm.jaxb.config', binding: 'src/main/xjb/hbm-configuration-bindings.xjb', schema: cfgXsd.path ) @@ -84,7 +84,7 @@ task jaxb { // hibernate-mapping ant.xjc( destdir: '${jaxbTargetDir}', - package: 'org.hibernate.metamodel.source.hbm.xml.mapping', + package: 'org.hibernate.metamodel.source.hbm.jaxb.mapping', binding: hbmXjb.path, schema: hbmXsd.path, extension: 'true' @@ -95,7 +95,7 @@ task jaxb { // orm.xml (jpa) ant.xjc( destdir: '${jaxbTargetDir}', - package: 'org.hibernate.metamodel.source.annotation.xml', + package: 'org.hibernate.metamodel.source.annotation.jaxb', binding: 'src/main/xjb/orm-bindings.xjb', schema: ormXsd.path ) diff --git a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java index 61396392a3..afee84203c 100644 --- a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java @@ -24,7 +24,7 @@ package org.hibernate; import org.hibernate.internal.util.xml.XmlDocument; -import org.hibernate.metamodel.binder.Origin; +import org.hibernate.metamodel.source.Origin; /** * Thrown when a mapping is found to be invalid. diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerServiceInitiator.java index 04a49bf5c9..c4eec7b474 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerServiceInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerServiceInitiator.java @@ -26,7 +26,7 @@ package org.hibernate.event.service.internal; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceInitiator; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index 2b95802fb2..4dfbc42c86 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -112,7 +112,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.RootClass; import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.binding.PluralAttributeBinding; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java index dc59dbbf46..21fdeb22ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java @@ -43,13 +43,13 @@ import org.xml.sax.EntityResolver; import org.hibernate.cfg.EJB3DTDEntityResolver; import org.hibernate.cfg.EJB3NamingStrategy; import org.hibernate.cfg.NamingStrategy; -import org.hibernate.metamodel.binder.MappingException; -import org.hibernate.metamodel.binder.MappingNotFoundException; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.SourceType; -import org.hibernate.metamodel.binder.source.internal.JaxbHelper; -import org.hibernate.metamodel.binder.source.internal.JaxbRoot; -import org.hibernate.metamodel.binder.source.internal.MetadataBuilderImpl; +import org.hibernate.metamodel.source.MappingException; +import org.hibernate.metamodel.source.MappingNotFoundException; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.SourceType; +import org.hibernate.metamodel.source.internal.JaxbHelper; +import org.hibernate.metamodel.source.internal.JaxbRoot; +import org.hibernate.metamodel.source.internal.MetadataBuilderImpl; import org.hibernate.service.BasicServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/DiscriminatorSubClassEntityDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/DiscriminatorSubClassEntityDescriptor.java deleted file mode 100644 index 806eb16631..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/DiscriminatorSubClassEntityDescriptor.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -/** - * @author Steve Ebersole - */ -public interface DiscriminatorSubClassEntityDescriptor extends EntityDescriptor { -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/EntityDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/EntityDescriptor.java deleted file mode 100644 index b1b6399b77..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/EntityDescriptor.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -import java.util.Set; - -import org.hibernate.EntityMode; -import org.hibernate.metamodel.binding.Caching; -import org.hibernate.metamodel.binding.CustomSQL; -import org.hibernate.metamodel.binding.InheritanceType; -import org.hibernate.metamodel.domain.Hierarchical; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.tuple.entity.EntityTuplizer; - -/** - * Represents the normalized set of mapping information about a specific entity. - * - * @author Gail Badner - * @author Steve Ebersole - */ -public interface EntityDescriptor extends UnifiedDescriptorObject { - /** - * Obtain the Hibernate entity name. - * - * @return The entity name. - */ - public String getEntityName(); - - /** - * Obtain the JPA entity name. - * - * @return The JPA entity name - */ - public String getJpaEntityName(); - - /** - * Obtain the entity mode represented by this state. - * - * @return The entity mode. - */ - public EntityMode getEntityMode(); - - /** - * Obtain the name of the entity class. - * - * @return The entity class name. - */ - public String getClassName(); - - /** - * The name of an interface to use for creating instance proxies for this entity. - * - * @return The name of the proxy interface. - */ - public String getProxyInterfaceName(); - - /** - * Obtains the type of inheritance defined for this entity hierarchy - * - * @return The inheritance strategy for this entity. - */ - public InheritanceType getEntityInheritanceType(); - - /** - * Obtain the super type for this entity. - * - * @return This entity's super type. - */ - public String getSuperEntityName(); - - /** - * Obtain the custom {@link EntityPersister} class defined in this mapping. {@code null} indicates the default - * should be used. - * - * @return The custom {@link EntityPersister} class to use; or {@code null} - */ - public Class getCustomEntityPersisterClass(); - - /** - * Obtain the custom {@link EntityTuplizer} class defined in this mapping. {@code null} indicates the default - * should be used. - * - * @return The custom {@link EntityTuplizer} class to use; or {@code null} - */ - public Class getCustomEntityTuplizerClass(); - - - boolean isLazy(); - - boolean isDynamicUpdate(); - - boolean isDynamicInsert(); - - int getBatchSize(); - - boolean isSelectBeforeUpdate(); - - Boolean isAbstract(); - - String getCustomLoaderName(); - - CustomSQL getCustomInsert(); - - CustomSQL getCustomUpdate(); - - CustomSQL getCustomDelete(); - - Set getSynchronizedTableNames(); - - -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/JoinedSubClassEntityDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/JoinedSubClassEntityDescriptor.java deleted file mode 100644 index 1aef70103c..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/JoinedSubClassEntityDescriptor.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -/** - * @author Steve Ebersole - */ -public interface JoinedSubClassEntityDescriptor extends EntityDescriptor { -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/TableDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/TableDescriptor.java deleted file mode 100644 index 3383f55770..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/TableDescriptor.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -/** - * @author Steve Ebersole - */ -public interface TableDescriptor extends UnifiedDescriptorObject { - public String getExplicitSchemaName(); - public String getExplicitCatalogName(); - public String getTableName(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnifiedDescriptorObject.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnifiedDescriptorObject.java deleted file mode 100644 index 76233a88df..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnifiedDescriptorObject.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -import org.hibernate.metamodel.binder.Origin; - -/** - * @author Steve Ebersole - */ -public interface UnifiedDescriptorObject { - public Origin getOrigin(); - public UnifiedDescriptorObject getContainingDescriptor(); - public MetaAttributeContext getMetaAttributeContext(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnionSubClassEntityDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnionSubClassEntityDescriptor.java deleted file mode 100644 index f8883f4b35..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/UnionSubClassEntityDescriptor.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source; - -/** - * @author Steve Ebersole - */ -public interface UnionSubClassEntityDescriptor extends EntityDescriptor { -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AbstractEntityDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AbstractEntityDescriptorImpl.java deleted file mode 100644 index a638fc664b..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AbstractEntityDescriptorImpl.java +++ /dev/null @@ -1,358 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.AnnotationValue; - -import org.hibernate.EntityMode; -import org.hibernate.annotations.ResultCheckStyle; -import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.EntityDescriptor; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.UnifiedDescriptorObject; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binding.CustomSQL; -import org.hibernate.metamodel.binding.InheritanceType; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.tuple.entity.EntityTuplizer; - -/** - * @author Steve Ebersole - */ -public abstract class AbstractEntityDescriptorImpl implements EntityDescriptor { - private final ConfiguredClass configuredClass; - @SuppressWarnings( {"FieldCanBeLocal", "UnusedDeclaration"}) // for now this is not used. - private final AnnotationsBindingContext bindingContext; - - private final String jpaEntityName; - - private final String superEntityName; - private final InheritanceType inheritanceType; - - private final boolean lazy; - private final String proxyInterfaceName; - - private final Class entityPersisterClass; - private final Class tuplizerClass; - - private final int batchSize; - - private final boolean dynamicUpdate; - private final boolean dynamicInsert; - - private final boolean selectBeforeUpdate; - - private final String customLoaderName; - private final CustomSQL customInsert; - private final CustomSQL customUpdate; - private final CustomSQL customDelete; - - private final Set synchronizedTableNames; - - public AbstractEntityDescriptorImpl( - ConfiguredClass configuredClass, - String superEntityName, - InheritanceType inheritanceType, - AnnotationsBindingContext bindingContext) { - this.configuredClass = configuredClass; - this.superEntityName = superEntityName; - this.inheritanceType = inheritanceType; - this.bindingContext = bindingContext; - - final AnnotationInstance jpaEntityAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), JPADotNames.ENTITY - ); - - final AnnotationValue explicitJpaEntityName = jpaEntityAnnotation.value( "name" ); - if ( explicitJpaEntityName == null ) { - jpaEntityName = configuredClass.getName(); - } - else { - jpaEntityName = explicitJpaEntityName.asString(); - } - - final AnnotationInstance hibernateEntityAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.ENTITY - ); - - this.dynamicInsert = hibernateEntityAnnotation != null - && hibernateEntityAnnotation.value( "dynamicInsert" ) != null - && hibernateEntityAnnotation.value( "dynamicInsert" ).asBoolean(); - - this.dynamicUpdate = hibernateEntityAnnotation != null - && hibernateEntityAnnotation.value( "dynamicUpdate" ) != null - && hibernateEntityAnnotation.value( "dynamicUpdate" ).asBoolean(); - - this.selectBeforeUpdate = hibernateEntityAnnotation != null - && hibernateEntityAnnotation.value( "selectBeforeUpdate" ) != null - && hibernateEntityAnnotation.value( "selectBeforeUpdate" ).asBoolean(); - - final AnnotationInstance sqlLoaderAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.LOADER - ); - this.customLoaderName = sqlLoaderAnnotation == null - ? null - : sqlLoaderAnnotation.value( "namedQuery" ).asString(); - final AnnotationInstance sqlInsertAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.SQL_INSERT - ); - this.customInsert = createCustomSQL( sqlInsertAnnotation ); - final AnnotationInstance sqlUpdateAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.SQL_UPDATE - ); - this.customUpdate = createCustomSQL( sqlUpdateAnnotation ); - final AnnotationInstance sqlDeleteAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.SQL_DELETE - ); - this.customDelete = createCustomSQL( sqlDeleteAnnotation ); - - final AnnotationInstance batchSizeAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.BATCH_SIZE - ); - this.batchSize = batchSizeAnnotation == null - ? -1 - : batchSizeAnnotation.value( "size" ).asInt(); - - final AnnotationInstance hibernateProxyAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.PROXY - ); - if ( hibernateProxyAnnotation != null ) { - this.lazy = hibernateProxyAnnotation.value( "lazy" ) == null - || hibernateProxyAnnotation.value( "lazy" ).asBoolean(); - final AnnotationValue proxyClassValue = hibernateProxyAnnotation.value( "proxyClass" ); - if ( proxyClassValue == null ) { - this.proxyInterfaceName = null; - } - else { - this.proxyInterfaceName = bindingContext.locateClassByName( proxyClassValue.asString() ).getName(); - } - } - else { - this.lazy = true; - this.proxyInterfaceName = configuredClass.getName(); - } - - final AnnotationInstance persisterAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.PERSISTER - ); - if ( persisterAnnotation == null || persisterAnnotation.value( "impl" ) == null ) { - if ( hibernateEntityAnnotation != null && hibernateEntityAnnotation.value( "persister" ) != null ) { - this.entityPersisterClass = bindingContext.locateClassByName( hibernateEntityAnnotation.value( "persister" ).asString() ); - } - else { - this.entityPersisterClass = null; - } - } - else { - if ( hibernateEntityAnnotation != null && hibernateEntityAnnotation.value( "persister" ) != null ) { - // todo : error? - } - this.entityPersisterClass = bindingContext.locateClassByName( persisterAnnotation.value( "impl" ).asString() ); - } - - final AnnotationInstance pojoTuplizerAnnotation = locatePojoTuplizerAnnotation(); - if ( pojoTuplizerAnnotation == null ) { - tuplizerClass = null; - } - else { - tuplizerClass = bindingContext.locateClassByName( pojoTuplizerAnnotation.value( "impl" ).asString() ); - } - - final AnnotationInstance synchronizeAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.SYNCHRONIZE - ); - if ( synchronizeAnnotation != null ) { - synchronizedTableNames = new HashSet(); - final String[] tableNames = synchronizeAnnotation.value().asStringArray(); - synchronizedTableNames.addAll( Arrays.asList( tableNames ) ); - } - else { - synchronizedTableNames = java.util.Collections.emptySet(); - } - } - - private CustomSQL createCustomSQL(AnnotationInstance customSQLAnnotation) { - if ( customSQLAnnotation == null ) { - return null; - } - - String sql = customSQLAnnotation.value( "sql" ).asString(); - boolean isCallable = false; - AnnotationValue callableValue = customSQLAnnotation.value( "callable" ); - if ( callableValue != null ) { - isCallable = callableValue.asBoolean(); - } - - ResultCheckStyle checkStyle = ResultCheckStyle.NONE; - AnnotationValue checkStyleValue = customSQLAnnotation.value( "check" ); - if ( checkStyleValue != null ) { - checkStyle = Enum.valueOf( ResultCheckStyle.class, checkStyleValue.asEnum() ); - } - - return new CustomSQL( - sql, - isCallable, - Enum.valueOf( ExecuteUpdateResultCheckStyle.class, checkStyle.toString() ) - ); - } - - private AnnotationInstance locatePojoTuplizerAnnotation() { - final AnnotationInstance tuplizersAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.SYNCHRONIZE - ); - if ( tuplizersAnnotation == null ) { - return null; - } - - for ( AnnotationInstance tuplizerAnnotation : JandexHelper.getValueAsArray(tuplizersAnnotation, "value" ) ) { - if ( EntityMode.valueOf( tuplizerAnnotation.value( "entityModeType" ).asEnum() ) == EntityMode.POJO ) { - return tuplizerAnnotation; - } - } - - return null; - } - - @Override - public String getClassName() { - return configuredClass.getName(); - } - - @Override - public String getEntityName() { - return getClassName(); - } - - @Override - public String getJpaEntityName() { - return jpaEntityName; - } - - @Override - public EntityMode getEntityMode() { - return EntityMode.POJO; - } - - @Override - public String getProxyInterfaceName() { - return proxyInterfaceName; - } - - @Override - public Class getCustomEntityPersisterClass() { - return entityPersisterClass; - } - - @Override - public Class getCustomEntityTuplizerClass() { - return tuplizerClass; - } - - @Override - public String getSuperEntityName() { - return superEntityName; - } - - @Override - public InheritanceType getEntityInheritanceType() { - return inheritanceType; - } - - @Override - public MetaAttributeContext getMetaAttributeContext() { - return null; - } - - @Override - public boolean isLazy() { - return lazy; - } - - @Override - public boolean isDynamicUpdate() { - return dynamicUpdate; - } - - @Override - public boolean isDynamicInsert() { - return dynamicInsert; - } - - @Override - public int getBatchSize() { - return batchSize; - } - - @Override - public boolean isSelectBeforeUpdate() { - return selectBeforeUpdate; - } - - @Override - public Boolean isAbstract() { - return false; - } - - @Override - public String getCustomLoaderName() { - return customLoaderName; - } - - @Override - public CustomSQL getCustomInsert() { - return customInsert; - } - - @Override - public CustomSQL getCustomUpdate() { - return customUpdate; - } - - @Override - public CustomSQL getCustomDelete() { - return customDelete; - } - - @Override - public Set getSynchronizedTableNames() { - return synchronizedTableNames; - } - - @Override - public UnifiedDescriptorObject getContainingDescriptor() { - return null; - } - - @Override - public Origin getOrigin() { -// return bindingContext.getOrigin(); - return null; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsMetadataProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsMetadataProcessor.java deleted file mode 100644 index f5039cf2e2..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsMetadataProcessor.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations; - -import java.util.List; - -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.AnnotationValue; -import org.jboss.jandex.Index; - -import org.hibernate.cfg.NamingStrategy; -import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binder.source.annotations.entity.EntityBinder; -import org.hibernate.metamodel.binder.source.internal.OverriddenMappingDefaults; -import org.hibernate.metamodel.domain.Type; -import org.hibernate.service.ServiceRegistry; - -/** - * @author Hardy Ferentschik - * @author Steve Ebersole - */ -public class AnnotationsMetadataProcessor implements AnnotationsBindingContext { - private final AnnotationsBindingContext parentBindingContext; - private final ConfiguredClass configuredClass; - - private final MappingDefaults mappingDefaults; - - private final EntityBinder entityBinder; - - public AnnotationsMetadataProcessor( - AnnotationsBindingContext parentBindingContext, - ConfiguredClass configuredClass) { - this.parentBindingContext = parentBindingContext; - this.configuredClass = configuredClass; - - String explicitSchemaName = null; - String explicitCatalogName = null; - AnnotationInstance tableAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), - JPADotNames.TABLE - ); - if ( tableAnnotation != null ) { - AnnotationValue schemaValue = tableAnnotation.value( "schema" ); - explicitSchemaName = schemaValue != null ? schemaValue.asString() : null; - AnnotationValue catalogValue = tableAnnotation.value( "catalog" ); - explicitCatalogName = catalogValue != null ? catalogValue.asString() : null; - } - this.mappingDefaults = new OverriddenMappingDefaults( - parentBindingContext.getMappingDefaults(), - null, // packageName - explicitSchemaName, - explicitCatalogName, - null, // idColumnName - null, // discriminatorColumnName - null, // cascade - null, // property accessor - null // association laziness - ); - - this.entityBinder = new EntityBinder( configuredClass, this ); - } - - - public void processMappingMetadata(List processedEntityNames) { - entityBinder.bind( processedEntityNames ); - } - - @Override - public Index getIndex() { - return parentBindingContext.getIndex(); - } - - @Override - public ServiceRegistry getServiceRegistry() { - return parentBindingContext.getServiceRegistry(); - } - - @Override - public NamingStrategy getNamingStrategy() { - return parentBindingContext.getNamingStrategy(); - } - - @Override - public MappingDefaults getMappingDefaults() { - return mappingDefaults; - } - - @Override - public MetadataImplementor getMetadataImplementor() { - return parentBindingContext.getMetadataImplementor(); - } - - @Override - public Class locateClassByName(String name) { - return parentBindingContext.locateClassByName( name ); - } - - @Override - public Type makeJavaType(String className) { - return parentBindingContext.makeJavaType( className ); - } - - @Override - public Value> makeClassReference(String className) { - return parentBindingContext.makeClassReference( className ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/RootEntityDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/RootEntityDescriptorImpl.java deleted file mode 100644 index 549a6c860d..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/RootEntityDescriptorImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations; - -import javax.persistence.SharedCacheMode; - -import org.jboss.jandex.AnnotationInstance; - -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.OptimisticLockType; -import org.hibernate.annotations.PolymorphismType; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.engine.OptimisticLockStyle; -import org.hibernate.metamodel.binder.source.RootEntityDescriptor; -import org.hibernate.metamodel.binder.source.TableDescriptor; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binding.Caching; -import org.hibernate.metamodel.binding.InheritanceType; - -/** - * @author Steve Ebersole - * @author Gail Badner - * @author Hardy Ferentschik - */ -public class RootEntityDescriptorImpl extends AbstractEntityDescriptorImpl implements RootEntityDescriptor { - private final boolean mutable; - private final boolean explicitPolymorphism; - private final String whereFilter; - private final String rowId; - private final Caching caching; - private final OptimisticLockStyle optimisticLockStyle; - - private final TableDescriptor baseTableDescriptor; - - public RootEntityDescriptorImpl(ConfiguredClass configuredClass, AnnotationsBindingContext bindingContext) { - super( configuredClass, null, InheritanceType.NO_INHERITANCE, bindingContext ); - - final AnnotationInstance hibernateEntityAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.ENTITY - ); - - OptimisticLockType optimisticLockType = OptimisticLockType.VERSION; - if ( hibernateEntityAnnotation != null && hibernateEntityAnnotation.value( "optimisticLock" ) != null ) { - optimisticLockType = OptimisticLockType.valueOf( hibernateEntityAnnotation.value( "optimisticLock" ).asEnum() ); - } - this.optimisticLockStyle = OptimisticLockStyle.valueOf( optimisticLockType.name() ); - - final PolymorphismType polymorphism = hibernateEntityAnnotation != null && hibernateEntityAnnotation.value( "polymorphism" ) != null - ? PolymorphismType.valueOf( hibernateEntityAnnotation.value( "polymorphism" ).asEnum() ) - : PolymorphismType.IMPLICIT; - this.explicitPolymorphism = polymorphism != PolymorphismType.IMPLICIT; - - final AnnotationInstance hibernateImmutableAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.IMMUTABLE - ); - this.mutable = hibernateImmutableAnnotation == null - && hibernateEntityAnnotation != null - && hibernateEntityAnnotation.value( "mutable" ) != null - && hibernateEntityAnnotation.value( "mutable" ).asBoolean(); - - final AnnotationInstance whereAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.WHERE - ); - this.whereFilter = whereAnnotation != null && whereAnnotation.value( "clause" ) != null - ? whereAnnotation.value( "clause" ).asString() - : null; - - final AnnotationInstance rowIdAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.ROW_ID - ); - this.rowId = rowIdAnnotation != null && rowIdAnnotation.value() != null - ? rowIdAnnotation.value().asString() - : null; - - this.caching = interpretCaching( configuredClass, bindingContext ); - - final AnnotationInstance tableAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), JPADotNames.TABLE - ); - this.baseTableDescriptor = new TableDescriptorImpl( - tableAnnotation.value( "schema" ) == null - ? null - : tableAnnotation.value( "schema" ).asString(), - tableAnnotation.value( "catalog" ) == null - ? null - : tableAnnotation.value( "catalog" ).asString(), - tableAnnotation.value( "name" ) == null - ? null - : tableAnnotation.value( "name" ).asString(), - this, - bindingContext - ); - } - - private Caching interpretCaching(ConfiguredClass configuredClass, AnnotationsBindingContext bindingContext) { - final AnnotationInstance hibernateCacheAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), HibernateDotNames.CACHE - ); - if ( hibernateCacheAnnotation != null ) { - final AccessType accessType = hibernateCacheAnnotation.value( "usage" ) == null - ? bindingContext.getMappingDefaults().getCacheAccessType() - : CacheConcurrencyStrategy.parse( hibernateCacheAnnotation.value( "usage" ).asEnum() ).toAccessType(); - return new Caching( - hibernateCacheAnnotation.value( "region" ) == null - ? configuredClass.getName() - : hibernateCacheAnnotation.value( "region" ).asString(), - accessType, - hibernateCacheAnnotation.value( "include" ) != null - && "all".equals( hibernateCacheAnnotation.value( "include" ).asString() ) - ); - } - - final AnnotationInstance jpaCacheableAnnotation = JandexHelper.getSingleAnnotation( - configuredClass.getClassInfo(), JPADotNames.CACHEABLE - ); - - boolean cacheable = true; // true is the default - if ( jpaCacheableAnnotation != null && jpaCacheableAnnotation.value() != null ) { - cacheable = jpaCacheableAnnotation.value().asBoolean(); - } - - final boolean doCaching; - switch ( bindingContext.getMetadataImplementor().getOptions().getSharedCacheMode() ) { - case ALL: { - doCaching = true; - break; - } - case ENABLE_SELECTIVE: { - doCaching = cacheable; - break; - } - case DISABLE_SELECTIVE: { - doCaching = jpaCacheableAnnotation == null || cacheable; - break; - } - default: { - // treat both NONE and UNSPECIFIED the same - doCaching = false; - break; - } - } - - if ( ! doCaching ) { - return null; - } - - return new Caching( - configuredClass.getName(), - bindingContext.getMappingDefaults().getCacheAccessType(), - true - ); - } - - @Override - public boolean isMutable() { - return mutable; - } - - @Override - public boolean isExplicitPolymorphism() { - return explicitPolymorphism; - } - - @Override - public String getWhereFilter() { - return whereFilter; - } - - @Override - public String getRowId() { - return rowId; - } - - @Override - public Caching getCaching() { - return caching; - } - - @Override - public OptimisticLockStyle getOptimisticLockStyle() { - return optimisticLockStyle; - } - - @Override - public TableDescriptor getBaseTable() { - return baseTableDescriptor; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/TableDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/TableDescriptorImpl.java deleted file mode 100644 index 12cb40ebdf..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/TableDescriptorImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations; - -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.EntityDescriptor; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.TableDescriptor; -import org.hibernate.metamodel.binder.source.UnifiedDescriptorObject; - -/** - * @author Steve Ebersole - */ -public class TableDescriptorImpl implements TableDescriptor { - private final String explicitSchemaName; - private final String explicitCatalogName; - private final String tableName; - - private final EntityDescriptor entityDescriptor; - private final AnnotationsBindingContext bindingContext; - - public TableDescriptorImpl( - String explicitSchemaName, - String explicitCatalogName, - String tableName, - EntityDescriptor entityDescriptor, AnnotationsBindingContext bindingContext) { - this.explicitSchemaName = explicitSchemaName; - this.explicitCatalogName = explicitCatalogName; - this.tableName = tableName; - this.entityDescriptor = entityDescriptor; - this.bindingContext = bindingContext; - } - - @Override - public String getExplicitSchemaName() { - return explicitSchemaName; - } - - @Override - public String getExplicitCatalogName() { - return explicitCatalogName; - } - - @Override - public String getTableName() { - return tableName; - } - - @Override - public Origin getOrigin() { -// return bindingContext.getOrigin(); - return null; - } - - @Override - public UnifiedDescriptorObject getContainingDescriptor() { - return entityDescriptor; - } - - @Override - public MetaAttributeContext getMetaAttributeContext() { - return null; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/AbstractEntityDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/AbstractEntityDescriptorImpl.java deleted file mode 100644 index c0e00404f1..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/AbstractEntityDescriptorImpl.java +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations.entity.state.binding; - -import java.util.HashSet; -import java.util.Set; - -import org.hibernate.EntityMode; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.EntityDescriptor; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.UnifiedDescriptorObject; -import org.hibernate.metamodel.binding.CustomSQL; -import org.hibernate.metamodel.binding.InheritanceType; -import org.hibernate.metamodel.source.annotations.entity.EntityClass; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.tuple.entity.EntityTuplizer; - -/** - * @author Hardy Ferentschik - */ -public abstract class AbstractEntityDescriptorImpl implements EntityDescriptor { - private final BindingContext bindingContext; - - private final String className; - private final String superEntityName; - private final InheritanceType inheritanceType; - - private String jpaEntityName; - - private boolean lazy; - private String proxyInterfaceName; - - private Class persisterClass; - private Class tuplizerClass; - - private boolean dynamicUpdate; - private boolean dynamicInsert; - - private int batchSize = -1; - private boolean selectBeforeUpdate; - - private String customLoaderName; - private CustomSQL customInsert; - private CustomSQL customUpdate; - private CustomSQL customDelete; - - private Set synchronizedTableNames = new HashSet(); - - public AbstractEntityDescriptorImpl( - EntityClass entityClass, - String superEntityName, - BindingContext bindingContext) { - this.bindingContext = bindingContext; - - this.className = entityClass.getName(); - this.superEntityName = superEntityName; - this.inheritanceType = entityClass.getInheritanceType(); - } - - @Override - public String getEntityName() { - return className; - } - - @Override - public String getClassName() { - return className; - } - - @Override - public String getJpaEntityName() { - return jpaEntityName; - } - - public void setJpaEntityName(String entityName) { - this.jpaEntityName = entityName; - } - - @Override - public EntityMode getEntityMode() { - return EntityMode.POJO; - } - - @Override - public String getSuperEntityName() { - return superEntityName; - } - - @Override - public InheritanceType getEntityInheritanceType() { - return inheritanceType; - } - - @Override - public Boolean isAbstract() { - // no annotations equivalent - return Boolean.FALSE; - } - - @Override - public boolean isLazy() { - return lazy; - } - - public void setLazy(boolean lazy) { - this.lazy = lazy; - } - - @Override - public String getProxyInterfaceName() { - return proxyInterfaceName; - } - - public void setProxyInterfaceName(String proxyInterfaceName) { - this.proxyInterfaceName = proxyInterfaceName; - } - - @Override - public Class getCustomEntityPersisterClass() { - return persisterClass; - } - - public void setPersisterClass(Class persisterClass) { - this.persisterClass = persisterClass; - } - - @Override - public Class getCustomEntityTuplizerClass() { - return tuplizerClass; - } - - public void setTuplizerClass(Class tuplizerClass) { - this.tuplizerClass = tuplizerClass; - } - - @Override - public boolean isDynamicUpdate() { - return dynamicUpdate; - } - - public void setDynamicUpdate(boolean dynamicUpdate) { - this.dynamicUpdate = dynamicUpdate; - } - - @Override - public boolean isDynamicInsert() { - return dynamicInsert; - } - - public void setDynamicInsert(boolean dynamicInsert) { - this.dynamicInsert = dynamicInsert; - } - - @Override - public int getBatchSize() { - return batchSize; - } - - public void setBatchSize(int batchSize) { - this.batchSize = batchSize; - } - - @Override - public boolean isSelectBeforeUpdate() { - return selectBeforeUpdate; - } - - public void setSelectBeforeUpdate(boolean selectBeforeUpdate) { - this.selectBeforeUpdate = selectBeforeUpdate; - } - - @Override - public String getCustomLoaderName() { - return customLoaderName; - } - - public void setCustomLoaderName(String customLoaderName) { - this.customLoaderName = customLoaderName; - } - - @Override - public CustomSQL getCustomInsert() { - return customInsert; - } - - public void setCustomInsert(CustomSQL customInsert) { - this.customInsert = customInsert; - } - - @Override - public CustomSQL getCustomUpdate() { - return customUpdate; - } - - public void setCustomUpdate(CustomSQL customUpdate) { - this.customUpdate = customUpdate; - } - - @Override - public CustomSQL getCustomDelete() { - return customDelete; - } - - public void setCustomDelete(CustomSQL customDelete) { - this.customDelete = customDelete; - } - - @Override - public Set getSynchronizedTableNames() { - return synchronizedTableNames; - } - - public void addSynchronizedTableName(String tableName) { - synchronizedTableNames.add( tableName ); - } - - @Override - public MetaAttributeContext getMetaAttributeContext() { - // not needed for annotations!? (HF) - // probably not; this is a tools/generation thing (SE) - return null; - } - - @Override - public Origin getOrigin() { - // (steve) - not sure how to best handle this. Origin should essentially name the class file from which - // this information came - return null; - } - - @Override - public UnifiedDescriptorObject getContainingDescriptor() { - // probably makes most sense as none for annotations. - return this; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/RootEntityDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/RootEntityDescriptorImpl.java deleted file mode 100644 index 0c250cd2aa..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/state/binding/RootEntityDescriptorImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations.entity.state.binding; - -import org.hibernate.annotations.OptimisticLockType; -import org.hibernate.engine.OptimisticLockStyle; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.RootEntityDescriptor; -import org.hibernate.metamodel.binder.source.TableDescriptor; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binding.Caching; -import org.hibernate.metamodel.binding.InheritanceType; - -/** - * @author Steve Ebersole - * @author Hardy Ferentschik - */ -public class RootEntityDescriptorImpl - extends AbstractEntityDescriptorImpl - implements RootEntityDescriptor { - - private boolean mutable; - private boolean explicitPolymorphism; - private String whereFilter; - private String rowId; - private OptimisticLockStyle optimisticLockStyle; - - private Caching caching; - - private TableDescriptor baseTableDescriptor; - - public RootEntityDescriptorImpl( - ConfiguredClass configuredClass, - String superEntityName, - BindingContext bindingContext) { - super( configuredClass, superEntityName, bindingContext ); - if ( configuredClass.getInheritanceType() != InheritanceType.NO_INHERITANCE ) { - // throw exception? - } - } - - @Override - public boolean isMutable() { - return mutable; - } - - public void setMutable(boolean mutable) { - this.mutable = mutable; - } - - @Override - public boolean isExplicitPolymorphism() { - return explicitPolymorphism; - } - - public void setExplicitPolymorphism(boolean explicitPolymorphism) { - this.explicitPolymorphism = explicitPolymorphism; - } - - @Override - public String getWhereFilter() { - return whereFilter; - } - - public void setWhereFilter(String whereFilter) { - this.whereFilter = whereFilter; - } - - @Override - public String getRowId() { - return rowId; - } - - public void setRowId(String rowId) { - this.rowId = rowId; - } - - @Override - public OptimisticLockStyle getOptimisticLockStyle() { - return optimisticLockStyle; - } - - public void setOptimisticLockType(OptimisticLockType optimisticLockType) { - switch ( optimisticLockType ) { - case NONE: { - this.optimisticLockStyle = OptimisticLockStyle.NONE; - break; - } - case DIRTY: { - this.optimisticLockStyle = OptimisticLockStyle.DIRTY; - break; - } - case ALL: { - this.optimisticLockStyle = OptimisticLockStyle.ALL; - break; - } - default: { - this.optimisticLockStyle = OptimisticLockStyle.VERSION; - } - } - } - - @Override - public Caching getCaching() { - return caching; - } - - public void setCaching(Caching caching) { - this.caching = caching; - } - - @Override - public TableDescriptor getBaseTable() { - return baseTableDescriptor; - } - - public void setBaseTableDescriptor(TableDescriptor baseTableDescriptor) { - this.baseTableDescriptor = baseTableDescriptor; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/package-info.java deleted file mode 100644 index beef15c51d..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/package-info.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, 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.binder.source.annotations; - -/** - * This code in this package is responsible for performing the process of preparing metadata from annotations - * and {@code orm.xml} into the forms needed by {@link org.hibernate.metamodel.binder.EntityBinder}. The main driver - * of this process is the {@link AnnotationsSourceProcessor} class. - */ \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AbstractAttributeBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AbstractAttributeBinding.java index 38d5d89d1a..a42b3fd875 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AbstractAttributeBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AbstractAttributeBinding.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; import org.hibernate.MappingException; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.binding.state.AttributeBindingState; import org.hibernate.metamodel.domain.Attribute; import org.hibernate.metamodel.relational.Column; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AttributeBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AttributeBinding.java index 0427c1503a..dca2d6cda8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AttributeBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/AttributeBinding.java @@ -25,7 +25,7 @@ package org.hibernate.metamodel.binding; import java.util.Set; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.domain.Attribute; import org.hibernate.metamodel.relational.SimpleValue; import org.hibernate.metamodel.relational.Value; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java index 6777bf90b7..ed6ac30c23 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java @@ -34,7 +34,7 @@ import org.hibernate.MappingException; import org.hibernate.engine.OptimisticLockStyle; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.domain.Attribute; import org.hibernate.metamodel.domain.Entity; import org.hibernate.metamodel.relational.Column; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/SimpleAttributeBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/SimpleAttributeBinding.java index fd5571a50e..120d85e330 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/SimpleAttributeBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/SimpleAttributeBinding.java @@ -24,10 +24,9 @@ package org.hibernate.metamodel.binding; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.binding.state.SimpleAttributeBindingState; import org.hibernate.metamodel.domain.SingularAttribute; -import org.hibernate.metamodel.relational.Value; import org.hibernate.metamodel.relational.state.ColumnRelationalState; import org.hibernate.metamodel.relational.state.ValueRelationalState; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/state/AttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/state/AttributeBindingState.java index 37fd2da6ab..cfb7db211a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/state/AttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/state/AttributeBindingState.java @@ -26,7 +26,7 @@ package org.hibernate.metamodel.binding.state; import java.util.Map; import java.util.Set; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.binding.CascadeType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AbstractAttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AbstractAttributeContainer.java index fc894ecfc1..0d64eb0095 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AbstractAttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AbstractAttributeContainer.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Set; +import org.hibernate.HibernateException; import org.hibernate.internal.util.Value; /** @@ -100,15 +101,108 @@ public abstract class AbstractAttributeContainer implements AttributeContainer, @Override public SingularAttribute locateOrCreateComponentAttribute(String name) { - SingularAttribute attribute = (SingularAttribute) getAttribute( name ); + SingularAttributeImpl attribute = (SingularAttributeImpl) getAttribute( name ); if ( attribute == null ) { - Component component = new Component( name, null ); + ComponentAttributeContainerDelegate component = new ComponentAttributeContainerDelegate(); attribute = new SingularAttributeImpl( name, component ); + component.singularAttribute = attribute; addAttribute( attribute ); } return attribute; } + private static class ComponentAttributeContainerDelegate implements AttributeContainer { + private SingularAttributeImpl singularAttribute; + + private ComponentAttributeContainerDelegate() { + } + + private Component realComponent() { + if ( singularAttribute.getSingularAttributeType() == null ) { + throw new HibernateException( "Component type was not yet bound" ); + } + if ( ! Component.class.isInstance( singularAttribute.getSingularAttributeType() ) ) { + throw new HibernateException( "Unexpected bound type for component attribute" ); + } + return (Component) singularAttribute.getSingularAttributeType(); + } + + @Override + public Attribute getAttribute(String name) { + return realComponent().getAttribute( name ); + } + + @Override + public Set getAttributes() { + return realComponent().getAttributes(); + } + + @Override + public SingularAttribute locateOrCreateSingularAttribute(String name) { + return realComponent().locateOrCreateSingularAttribute( name ); + } + + @Override + public PluralAttribute locateOrCreatePluralAttribute(String name, PluralAttributeNature nature) { + return realComponent().locateOrCreatePluralAttribute( name, nature ); + } + + @Override + public PluralAttribute locateOrCreateBag(String name) { + return realComponent().locateOrCreateBag( name ); + } + + @Override + public PluralAttribute locateOrCreateSet(String name) { + return realComponent().locateOrCreateBag( name ); + } + + @Override + public IndexedPluralAttribute locateOrCreateList(String name) { + return realComponent().locateOrCreateList( name ); + } + + @Override + public IndexedPluralAttribute locateOrCreateMap(String name) { + return realComponent().locateOrCreateMap( name ); + } + + @Override + public SingularAttribute locateOrCreateComponentAttribute(String name) { + return realComponent().locateOrCreateComponentAttribute( name ); + } + + @Override + public String getName() { + return realComponent().getName(); + } + + @Override + public String getClassName() { + return realComponent().getClassName(); + } + + @Override + public Class getClassReference() { + return realComponent().getClassReference(); + } + + @Override + public Value> getClassReferenceUnresolved() { + return realComponent().getClassReferenceUnresolved(); + } + + @Override + public boolean isAssociation() { + return realComponent().isAssociation(); + } + + @Override + public boolean isComponent() { + return realComponent().isComponent(); + } + } + @Override public PluralAttribute locateOrCreateBag(String name) { return locateOrCreatePluralAttribute( name, PluralAttributeNature.BAG ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AttributeContainer.java index 0dabf559d4..302027bd2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/domain/AttributeContainer.java @@ -49,10 +49,11 @@ public interface AttributeContainer extends Type { public Set getAttributes(); public SingularAttribute locateOrCreateSingularAttribute(String name); - public SingularAttribute locateOrCreateComponentAttribute(String name); public PluralAttribute locateOrCreatePluralAttribute(String name, PluralAttributeNature nature); public PluralAttribute locateOrCreateBag(String name); public PluralAttribute locateOrCreateSet(String name); public IndexedPluralAttribute locateOrCreateList(String name); public IndexedPluralAttribute locateOrCreateMap(String name); + + public SingularAttribute locateOrCreateComponentAttribute(String name); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/BindingContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/BindingContext.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/BindingContext.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/BindingContext.java index fac913abe5..598aa6086f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/BindingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/BindingContext.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.metamodel.source; import org.hibernate.cfg.NamingStrategy; import org.hibernate.internal.util.Value; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingDefaults.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MappingDefaults.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingDefaults.java index fe6c0119b2..bb66dc64f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MappingDefaults.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingDefaults.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.metamodel.source; import org.hibernate.cache.spi.access.AccessType; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingException.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingException.java index 35a6032e02..279879e41f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder; +package org.hibernate.metamodel.source; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingNotFoundException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingNotFoundException.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingNotFoundException.java index f1b73f1649..3e56633c35 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/MappingNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MappingNotFoundException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder; +package org.hibernate.metamodel.source; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetaAttributeContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetaAttributeContext.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetaAttributeContext.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/MetaAttributeContext.java index 231f730314..461c031863 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetaAttributeContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetaAttributeContext.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.metamodel.source; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataImplementor.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetadataImplementor.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataImplementor.java index 6e35d0b826..7d29096fc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/MetadataImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataImplementor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.metamodel.source; import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.spi.FilterDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/Origin.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Origin.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/Origin.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/Origin.java index 0ef00b2979..824d433bd8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/Origin.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Origin.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder; +package org.hibernate.metamodel.source; import java.io.Serializable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/SourceProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceProcessor.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/SourceProcessor.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceProcessor.java index b42f0cf61a..6f5c17f909 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/SourceProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceProcessor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.metamodel.source; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/SourceType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceType.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/SourceType.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceType.java index cd8484a6d9..07eb6046ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/SourceType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/SourceType.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder; +package org.hibernate.metamodel.source; /** * From where did the metadata come from? diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/XsdException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/XsdException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/XsdException.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/XsdException.java index 7a2a7cb004..fac0104bf9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/XsdException.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/XsdException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder; +package org.hibernate.metamodel.source; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsBindingContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsBindingContext.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsBindingContext.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsBindingContext.java index 3a557d4c3e..cb670afa76 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsBindingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsBindingContext.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import com.fasterxml.classmate.ResolvedType; import com.fasterxml.classmate.ResolvedTypeWithMembers; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.Index; -import org.hibernate.metamodel.binder.source.BindingContext; +import org.hibernate.metamodel.source.BindingContext; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsSourceProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java similarity index 86% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsSourceProcessor.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java index 4c2e5e926e..395a89e676 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/AnnotationsSourceProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import java.io.IOException; import java.io.InputStream; @@ -45,22 +45,22 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.NamingStrategy; import org.hibernate.internal.util.Value; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.SourceProcessor; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassType; -import org.hibernate.metamodel.binder.source.annotations.entity.EntityBinder; -import org.hibernate.metamodel.binder.source.annotations.global.FetchProfileBinder; -import org.hibernate.metamodel.binder.source.annotations.global.FilterDefBinder; -import org.hibernate.metamodel.binder.source.annotations.global.IdGeneratorBinder; -import org.hibernate.metamodel.binder.source.annotations.global.QueryBinder; -import org.hibernate.metamodel.binder.source.annotations.global.TableBinder; -import org.hibernate.metamodel.binder.source.annotations.global.TypeDefBinder; -import org.hibernate.metamodel.binder.source.annotations.xml.PseudoJpaDotNames; -import org.hibernate.metamodel.binder.source.annotations.xml.mocker.EntityMappingsMocker; -import org.hibernate.metamodel.binder.source.internal.JaxbRoot; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.SourceProcessor; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassType; +import org.hibernate.metamodel.source.annotations.entity.EntityBinder; +import org.hibernate.metamodel.source.annotations.global.FetchProfileBinder; +import org.hibernate.metamodel.source.annotations.global.FilterDefBinder; +import org.hibernate.metamodel.source.annotations.global.IdGeneratorBinder; +import org.hibernate.metamodel.source.annotations.global.QueryBinder; +import org.hibernate.metamodel.source.annotations.global.TableBinder; +import org.hibernate.metamodel.source.annotations.global.TypeDefBinder; +import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; +import org.hibernate.metamodel.source.annotations.xml.mocker.EntityMappingsMocker; +import org.hibernate.metamodel.source.internal.JaxbRoot; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.domain.Hierarchical; import org.hibernate.metamodel.domain.Type; @@ -183,12 +183,22 @@ public class AnnotationsSourceProcessor implements SourceProcessor, AnnotationsB // for classes annotated w/ @MappedSuperclass we just create the domain instance // the attribute bindings will be part of the first entity subclass else if ( ConfiguredClassType.MAPPED_SUPERCLASS.equals( entityClass.getConfiguredClassType() ) ) { - parent = new Superclass( entityClass.getName(), parent ); + parent = new Superclass( + entityClass.getName(), + entityClass.getName(), + makeClassReference( entityClass.getName() ), + parent + ); } // for classes which are not annotated at all we create the NonEntity domain class // todo - not sure whether this is needed. It might be that we don't need this information (HF) else { - parent = new NonEntity( entityClass.getName(), parent ); + parent = new NonEntity( + entityClass.getName(), + entityClass.getName(), + makeClassReference( entityClass.getName() ), + parent + ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ConfiguredClassHierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClassHierarchyBuilder.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ConfiguredClassHierarchyBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClassHierarchyBuilder.java index feed15f26e..37c5769f56 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ConfiguredClassHierarchyBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClassHierarchyBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import javax.persistence.AccessType; import java.util.ArrayList; @@ -37,7 +37,7 @@ import org.jboss.jandex.DotName; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; import org.hibernate.metamodel.source.annotations.entity.EntityClass; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/HibernateDotNames.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/HibernateDotNames.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/HibernateDotNames.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/HibernateDotNames.java index d1915d37ed..8709025657 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/HibernateDotNames.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/HibernateDotNames.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import org.jboss.jandex.DotName; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JPADotNames.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JPADotNames.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JPADotNames.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JPADotNames.java index 5c9bcabd3b..70d0235d3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JPADotNames.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JPADotNames.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JandexHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JandexHelper.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JandexHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JandexHelper.java index a7888d3b8c..6ef9d665ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/JandexHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JandexHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import java.beans.Introspector; import java.io.IOException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ReflectionHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ReflectionHelper.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ReflectionHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ReflectionHelper.java index 06aeb66200..c21a69e426 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/ReflectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ReflectionHelper.java @@ -1,4 +1,4 @@ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import java.beans.Introspector; import java.lang.reflect.Field; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/UnknownInheritanceTypeException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/UnknownInheritanceTypeException.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/UnknownInheritanceTypeException.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/UnknownInheritanceTypeException.java index e6f7de4066..1f492d5d6c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/UnknownInheritanceTypeException.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/UnknownInheritanceTypeException.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations; +package org.hibernate.metamodel.source.annotations; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/AssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/AssociationAttribute.java index f622922b21..d4542237fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/AssociationAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/AssociationAttribute.java @@ -34,8 +34,8 @@ import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/DiscriminatorColumnValues.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/DiscriminatorColumnValues.java index 5e9839febf..05cc3ac20b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/DiscriminatorColumnValues.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/DiscriminatorColumnValues.java @@ -31,7 +31,7 @@ import org.jboss.jandex.DotName; import org.hibernate.metamodel.source.annotations.HibernateDotNames; import org.hibernate.metamodel.source.annotations.JPADotNames; -import org.hibernate.metamodel.source.annotations.util.JandexHelper; +import org.hibernate.metamodel.source.annotations.JandexHelper; /** * Container for the properties of a discriminator column. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleAttribute.java index 8a426978d1..c8af4abbc1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleAttribute.java @@ -35,9 +35,9 @@ import org.jboss.jandex.DotName; import org.hibernate.AnnotationException; import org.hibernate.annotations.GenerationTime; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; /** * Represent a mapped attribute (explicitly or implicitly mapped). Also used for synthetic attributes like a diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/binding/AttributeBindingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/binding/AttributeBindingStateImpl.java index 5b814f14a0..d52329c02a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/binding/AttributeBindingStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/binding/AttributeBindingStateImpl.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetaAttributeContext; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.state.SimpleAttributeBindingState; import org.hibernate.metamodel.source.annotations.attribute.SimpleAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/relational/ColumnRelationalStateImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/relational/ColumnRelationalStateImpl.java index 9ed2072bd8..f3be699d8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/relational/ColumnRelationalStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/state/relational/ColumnRelationalStateImpl.java @@ -33,7 +33,7 @@ import org.jboss.jandex.AnnotationInstance; import org.hibernate.AnnotationException; import org.hibernate.cfg.NamingStrategy; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.relational.Size; import org.hibernate.metamodel.relational.state.ColumnRelationalState; import org.hibernate.metamodel.source.annotations.HibernateDotNames; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClass.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClass.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClass.java index eae86bf3ac..69e261f4c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClass.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClass.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.entity; +package org.hibernate.metamodel.source.annotations.entity; import javax.persistence.AccessType; import java.lang.reflect.Field; @@ -52,17 +52,16 @@ import org.jboss.logging.Logger; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.ConfiguredClassHierarchyBuilder; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.ReflectionHelper; +import org.hibernate.metamodel.source.annotations.AnnotationsBindingContext; +import org.hibernate.metamodel.source.annotations.ConfiguredClassHierarchyBuilder; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.ReflectionHelper; import org.hibernate.metamodel.source.annotations.attribute.AssociationAttribute; import org.hibernate.metamodel.source.annotations.attribute.AttributeOverride; import org.hibernate.metamodel.source.annotations.attribute.AttributeType; import org.hibernate.metamodel.source.annotations.attribute.MappedAttribute; import org.hibernate.metamodel.source.annotations.attribute.SimpleAttribute; -import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; /** * Base class for a configured entity, mapped super class or embeddable diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassHierarchy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassHierarchy.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassHierarchy.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassHierarchy.java index d5a90abbd3..ead8cf76c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassHierarchy.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassHierarchy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.entity; +package org.hibernate.metamodel.source.annotations.entity; import javax.persistence.AccessType; import java.util.ArrayList; @@ -34,12 +34,10 @@ import org.jboss.jandex.FieldInfo; import org.jboss.jandex.MethodInfo; import org.hibernate.AnnotationException; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.AnnotationsBindingContext; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.binding.InheritanceType; -import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; -import org.hibernate.metamodel.source.annotations.entity.EntityClass; /** * Contains information about the access and inheritance type for all classes within a class hierarchy. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassType.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassType.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassType.java index 683c30d1c9..cf7d0207ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/ConfiguredClassType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClassType.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.entity; +package org.hibernate.metamodel.source.annotations.entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableClass.java index 3bdcbc0761..a3cc40b188 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableClass.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableClass.java @@ -27,8 +27,7 @@ import javax.persistence.AccessType; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; +import org.hibernate.metamodel.source.annotations.AnnotationsBindingContext; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBinder.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/EntityBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBinder.java index 93d1762859..72ee4efe6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.entity; +package org.hibernate.metamodel.source.annotations.entity; import javax.persistence.GenerationType; import java.util.Arrays; @@ -47,12 +47,12 @@ import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle; import org.hibernate.id.IdentifierGenerator; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.UnknownInheritanceTypeException; -import org.hibernate.metamodel.binder.source.annotations.global.IdGeneratorBinder; +import org.hibernate.metamodel.source.annotations.AnnotationsBindingContext; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.UnknownInheritanceTypeException; +import org.hibernate.metamodel.source.annotations.global.IdGeneratorBinder; import org.hibernate.metamodel.binding.Caching; import org.hibernate.metamodel.binding.CustomSQL; import org.hibernate.metamodel.binding.EntityBinding; @@ -84,8 +84,6 @@ import org.hibernate.metamodel.source.annotations.attribute.state.binding.ManyTo import org.hibernate.metamodel.source.annotations.attribute.state.relational.ColumnRelationalStateImpl; import org.hibernate.metamodel.source.annotations.attribute.state.relational.ManyToOneRelationalStateImpl; import org.hibernate.metamodel.source.annotations.attribute.state.relational.TupleRelationalStateImpl; -import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; -import org.hibernate.metamodel.source.annotations.entity.EntityClass; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.entity.EntityTuplizer; @@ -152,7 +150,6 @@ public class EntityBinder { bindTableUniqueConstraints( entityBinding ); - bindingContext.getMetadataImplementor().addEntity( entityBinding ); return entityBinding; } @@ -877,7 +874,7 @@ public class EntityBinder { } String attributeName = simpleAttribute.getName(); - SingularAttribute attribute = entityBinding.getEntity().locateOrCreateSingularAttribute( attributeName ); + SingularAttribute attribute = container.locateOrCreateSingularAttribute( attributeName ); SimpleAttributeBinding attributeBinding; if ( simpleAttribute.isDiscriminator() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityClass.java index 3ba07e2c99..782673e3e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityClass.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityClass.java @@ -33,11 +33,8 @@ import org.jboss.jandex.DotName; import org.hibernate.AnnotationException; import org.hibernate.MappingException; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassType; -import org.hibernate.metamodel.binder.source.annotations.entity.IdType; +import org.hibernate.metamodel.source.annotations.AnnotationsBindingContext; +import org.hibernate.metamodel.source.annotations.JPADotNames; import org.hibernate.metamodel.binding.InheritanceType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/IdType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/IdType.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/IdType.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/IdType.java index 3b6c56e416..164e756af7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/entity/IdType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/IdType.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.entity; +package org.hibernate.metamodel.source.annotations.entity; /** * An emum for the type of id configuration for an entity. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FetchProfileBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinder.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FetchProfileBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinder.java index ce989afa2a..1c0e5d5617 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FetchProfileBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import java.util.HashSet; import java.util.Set; @@ -32,11 +32,11 @@ import org.jboss.jandex.Index; import org.hibernate.MappingException; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfiles; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.binding.FetchProfile; import org.hibernate.metamodel.binding.FetchProfile.Fetch; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; /** * Binds fetch profiles found in annotations. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FilterDefBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FilterDefBinder.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FilterDefBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FilterDefBinder.java index bc46f7fcdc..2e83b3af10 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/FilterDefBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/FilterDefBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import java.util.HashMap; import java.util.Map; @@ -34,9 +34,9 @@ import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.FilterDefs; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.type.Type; public class FilterDefBinder { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/IdGeneratorBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/IdGeneratorBinder.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/IdGeneratorBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/IdGeneratorBinder.java index 1daafb9f44..15c32a3b6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/IdGeneratorBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/IdGeneratorBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import java.util.HashMap; import java.util.Map; @@ -44,11 +44,11 @@ import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.TableGenerator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.binding.IdGenerator; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; public class IdGeneratorBinder { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/QueryBinder.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/QueryBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/QueryBinder.java index 16ac19c068..bd0fef9bcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/QueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/QueryBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import java.util.HashMap; import javax.persistence.NamedNativeQueries; @@ -45,10 +45,10 @@ import org.hibernate.engine.spi.NamedQueryDefinition; import org.hibernate.engine.spi.NamedSQLQueryDefinition; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; public class QueryBinder { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TableBinder.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TableBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TableBinder.java index 3fb53d814f..87e3bf86ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TableBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.Index; @@ -30,14 +30,14 @@ import org.jboss.logging.Logger; import org.hibernate.AnnotationException; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.relational.Column; import org.hibernate.metamodel.relational.ObjectName; import org.hibernate.metamodel.relational.Schema; import org.hibernate.metamodel.relational.SimpleValue; import org.hibernate.metamodel.relational.Table; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; /** * Binds table related information. This binder is called after the entities are bound. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TypeDefBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TypeDefBinder.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TypeDefBinder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TypeDefBinder.java index e1fd213c50..378f92fbde 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/global/TypeDefBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/global/TypeDefBinder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.global; +package org.hibernate.metamodel.source.annotations.global; import java.util.HashMap; import java.util.Map; @@ -34,10 +34,10 @@ import org.hibernate.AnnotationException; import org.hibernate.annotations.TypeDefs; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.binding.TypeDef; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; public class TypeDefBinder { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/PseudoJpaDotNames.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/PseudoJpaDotNames.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/PseudoJpaDotNames.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/PseudoJpaDotNames.java index 9920716fe5..de9a703dba 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/PseudoJpaDotNames.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/PseudoJpaDotNames.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml; +package org.hibernate.metamodel.source.annotations.xml; import org.jboss.jandex.DotName; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/AbstractAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/AbstractAnnotationFilter.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/AbstractAnnotationFilter.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/AbstractAnnotationFilter.java index 66830bc6bc..6e0fc9e300 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/AbstractAnnotationFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/AbstractAnnotationFilter.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.filter; +package org.hibernate.metamodel.source.annotations.xml.filter; import java.util.Arrays; import java.util.HashSet; @@ -32,7 +32,7 @@ import java.util.Set; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.binder.source.annotations.xml.mocker.IndexBuilder; +import org.hibernate.metamodel.source.annotations.xml.mocker.IndexBuilder; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/ExclusiveAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/ExclusiveAnnotationFilter.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/ExclusiveAnnotationFilter.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/ExclusiveAnnotationFilter.java index daa577db82..59c5ddd228 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/ExclusiveAnnotationFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/ExclusiveAnnotationFilter.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.filter; +package org.hibernate.metamodel.source.annotations.xml.filter; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +35,7 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.binder.source.annotations.xml.mocker.MockHelper; +import org.hibernate.metamodel.source.annotations.xml.mocker.MockHelper; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/IndexedAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/IndexedAnnotationFilter.java similarity index 87% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/IndexedAnnotationFilter.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/IndexedAnnotationFilter.java index 83190e7204..24987526af 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/IndexedAnnotationFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/IndexedAnnotationFilter.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.filter; +package org.hibernate.metamodel.source.annotations.xml.filter; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.xml.mocker.IndexBuilder; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.xml.mocker.IndexBuilder; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameAnnotationFilter.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameAnnotationFilter.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameAnnotationFilter.java index c2c286da00..5635134bca 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameAnnotationFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameAnnotationFilter.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.filter; +package org.hibernate.metamodel.source.annotations.xml.filter; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameTargetAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameTargetAnnotationFilter.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameTargetAnnotationFilter.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameTargetAnnotationFilter.java index 8b99cc6e9d..1582c7e6db 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/filter/NameTargetAnnotationFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/NameTargetAnnotationFilter.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.filter; +package org.hibernate.metamodel.source.annotations.xml.filter; import java.util.Iterator; import java.util.List; @@ -30,7 +30,7 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.binder.source.annotations.xml.mocker.MockHelper; +import org.hibernate.metamodel.source.annotations.xml.mocker.MockHelper; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractAttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractAttributesBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java index 88abb10c59..81e26a2220 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractAttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractEntityObjectMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractEntityObjectMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java index ca1221b7fb..ada9a6efa0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractEntityObjectMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java index 9b6c6aadbb..30b645aa4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ import org.jboss.jandex.DotName; import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; import org.hibernate.metamodel.source.annotation.xml.XMLUniqueConstraint; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; /** * Base class for the mock jandex annotations created from orm.xml. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AccessHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AccessHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java index 84299b99a9..33ea7b5943 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AccessHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.List; import java.util.Map; @@ -36,10 +36,10 @@ import org.jboss.logging.Logger; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.xml.PseudoJpaDotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AnnotationMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AnnotationMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java index d5bea2a0cd..4be7b035bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AnnotationMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.HashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AttributesBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java index 4f1134324d..fb20f550c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java index 35f4ed7655..0332d9eee8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java index f055b78136..6f08c05be2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; @@ -34,13 +34,13 @@ import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.xml.filter.IndexedAnnotationFilter; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.xml.filter.IndexedAnnotationFilter; import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddable; import org.hibernate.metamodel.source.annotation.xml.XMLEntity; import org.hibernate.metamodel.source.annotation.xml.XMLMappedSuperclass; import org.hibernate.metamodel.source.annotation.xml.XMLTable; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ElementCollectionMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ElementCollectionMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java index 35427bb404..95540ba0ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ElementCollectionMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java index f0035664aa..7b8274448e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.Collections; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java index 327eeef3f4..6a243090e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddableMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedIdMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedIdMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java index 7b71558ad2..f9a274ce9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedIdMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java index 1c926dbe4d..0b3e061c41 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EmbeddedMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMappingsMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMappingsMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java index 55efe77f87..60a9159395 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMappingsMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.io.Serializable; import java.util.ArrayList; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java index a6ea979bc9..0b6f78e526 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotationMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotationMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java index 9fec2da693..1723db0748 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotationMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.Collection; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotations.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotations.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java index 9c76fe0916..9dd1f2f2c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/GlobalAnnotations.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.HashMap; @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.MappingException; +import org.hibernate.metamodel.source.MappingException; import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; import org.hibernate.metamodel.source.annotation.xml.XMLEntity; import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; @@ -47,7 +47,7 @@ import org.hibernate.metamodel.source.annotation.xml.XMLNamedQuery; import org.hibernate.metamodel.source.annotation.xml.XMLSequenceGenerator; import org.hibernate.metamodel.source.annotation.xml.XMLSqlResultSetMapping; import org.hibernate.metamodel.source.annotation.xml.XMLTableGenerator; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IdMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IdMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java index 8d3bf30503..8e418e76f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IdMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java index af2ac0488a..defdde09ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +38,7 @@ import org.jboss.logging.Logger; import org.hibernate.AssertionFailure; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.binder.source.annotations.xml.filter.IndexedAnnotationFilter; +import org.hibernate.metamodel.source.annotations.xml.filter.IndexedAnnotationFilter; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ListenerMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ListenerMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java index 470ccbe4a7..89123afa5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ListenerMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToManyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToManyMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java index b540948bc1..3e7b17223c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToManyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToOneMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToOneMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java index de30f67d42..9e14156efd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ManyToOneMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MappedSuperclassMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MappedSuperclassMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java index efe442aac3..f272994ff4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MappedSuperclassMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MockHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MockHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java index 6a0e945a4d..5b6f8ca5a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/MockHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.beans.Introspector; import java.lang.reflect.Field; @@ -42,7 +42,7 @@ import org.jboss.jandex.Type; import org.hibernate.HibernateException; import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.source.annotation.xml.XMLCascadeType; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToManyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToManyMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java index 9156532217..71db95cd1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToManyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToOneMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToOneMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java index 0ca0419018..076b7dee88 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OneToOneMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java index 23f9f62a80..745d60cddd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java @@ -1,4 +1,4 @@ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.HashMap; import java.util.Map; @@ -9,7 +9,7 @@ import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.binder.source.annotations.xml.PseudoJpaDotNames; +import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; import org.hibernate.metamodel.source.annotation.xml.XMLPersistenceUnitDefaults; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PropertyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PropertyMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java index e49028d622..7f029e1d2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PropertyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/SchemaAware.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/SchemaAware.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java index 42493634d6..69cfc9e97d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/SchemaAware.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.hibernate.metamodel.source.annotation.xml.XMLCollectionTable; import org.hibernate.metamodel.source.annotation.xml.XMLJoinTable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/TransientMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/TransientMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java index 0c631e4a9c..2f3e1767ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/TransientMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/VersionMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/VersionMocker.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java index 6d72a924d3..90d4bc22fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/VersionMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/AbstractSubEntityContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractSubEntityContainer.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/AbstractSubEntityContainer.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractSubEntityContainer.java index e299e72e4a..620122e3ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/AbstractSubEntityContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractSubEntityContainer.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/BindingCreator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/BindingCreator.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/BindingCreator.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/BindingCreator.java index b3bfb13913..5bf17a2b6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/BindingCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/BindingCreator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.beans.BeanInfo; import java.beans.PropertyDescriptor; @@ -37,11 +37,12 @@ import org.hibernate.engine.OptimisticLockStyle; import org.hibernate.internal.util.Value; import org.hibernate.internal.util.beans.BeanInfoHelper; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.MappingException; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.JoinElementSource; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.SubEntityElement; +import org.hibernate.metamodel.domain.SingularAttribute; +import org.hibernate.metamodel.source.MappingException; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.annotations.attribute.SimpleAttribute; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.JoinElementSource; import org.hibernate.metamodel.binding.BagBinding; import org.hibernate.metamodel.binding.Caching; import org.hibernate.metamodel.binding.EntityBinding; @@ -58,31 +59,31 @@ import org.hibernate.metamodel.relational.SimpleValue; import org.hibernate.metamodel.relational.Size; import org.hibernate.metamodel.relational.TableSpecification; import org.hibernate.metamodel.relational.Tuple; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLAnyElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLBagElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLCacheElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLColumnElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLComponentElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLDynamicComponentElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLIdbagElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinedSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLListElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLMapElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLOneToOneElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLParamElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLPropertiesElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLPropertyElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSetElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlDeleteElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlInsertElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlUpdateElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSynchronizeElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLTuplizerElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLUnionSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLAnyElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLBagElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLCacheElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLColumnElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLComponentElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLDynamicComponentElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLIdbagElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLJoinElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLJoinedSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLListElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLManyToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLMapElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLOneToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLParamElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLPropertiesElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLPropertyElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSetElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlDeleteElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlInsertElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlUpdateElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSynchronizeElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLTuplizerElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLUnionSubclassElement; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.entity.EntityTuplizer; @@ -601,7 +602,8 @@ public class BindingCreator { } private void bindProperty(XMLPropertyElement property, EntityBinding entityBinding) { - SimpleAttributeBinding attributeBinding = entityBinding.makeSimpleAttributeBinding( property.getName() ); + SingularAttribute attr = entityBinding.getEntity().locateOrCreateSingularAttribute( property.getName() ); + SimpleAttributeBinding attributeBinding = entityBinding.makeSimpleAttributeBinding( attr ); resolveTypeInformation( property, attributeBinding ); attributeBinding.setInsertable( Helper.getBooleanValue( property.isInsert(), true ) ); @@ -840,7 +842,7 @@ public class BindingCreator { private void bindSecondaryTables(EntitySourceInformation entitySourceInfo, EntityBinding entityBinding) { final EntityElement entityElement = entitySourceInfo.getEntityElement(); - if ( ! ( entityElement instanceof JoinElementSource ) ) { + if ( ! ( entityElement instanceof JoinElementSource) ) { return; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchy.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchy.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchy.java index f624660b47..933023a839 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchy.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchy.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import org.hibernate.metamodel.binding.InheritanceType; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; /** * Models the source view of an entity hierarchy. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchySubEntity.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchySubEntity.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchySubEntity.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchySubEntity.java index 16ab8c846c..ba5dc913e7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntityHierarchySubEntity.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntityHierarchySubEntity.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; /** * A sub entity within an entity hierarchy. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntitySourceInformation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntitySourceInformation.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntitySourceInformation.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntitySourceInformation.java index b2d2b6aee7..a02553db8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/EntitySourceInformation.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/EntitySourceInformation.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; /** * An aggregation of information about the source of an entity mapping. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmBindingContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmBindingContext.java similarity index 80% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmBindingContext.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmBindingContext.java index c4f2713e24..f8fff0ad7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmBindingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmBindingContext.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.List; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLFetchProfileElement; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLFetchProfileElement; /** * Defines features specific to the {@code hbm.xml} variety of a {@link BindingContext} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmSourceProcessorImpl.java similarity index 90% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmSourceProcessorImpl.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmSourceProcessorImpl.java index 493f4aeaf3..8581a143c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HbmSourceProcessorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmSourceProcessorImpl.java @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.ArrayList; import java.util.List; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.SourceProcessor; -import org.hibernate.metamodel.binder.source.internal.JaxbRoot; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.SourceProcessor; +import org.hibernate.metamodel.source.internal.JaxbRoot; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; /** * The {@link SourceProcessor} implementation responsible for processing {@code hbm.xml} sources. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/Helper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java index 24315d6ccb..ece88bb44b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.Collections; import java.util.HashSet; @@ -31,16 +31,16 @@ import java.util.StringTokenizer; import org.hibernate.MappingException; import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.CustomSqlElement; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.CustomSqlElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; import org.hibernate.metamodel.binding.CustomSQL; import org.hibernate.metamodel.binding.InheritanceType; import org.hibernate.metamodel.binding.MetaAttribute; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinedSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLMetaElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLUnionSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLJoinedSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLMetaElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLUnionSubclassElement; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.classloading.spi.ClassLoadingException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HibernateMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HibernateMappingProcessor.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java index effc489369..a9a0e777d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HibernateMappingProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.HashMap; import java.util.HashSet; @@ -32,9 +32,9 @@ import java.util.Set; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.MappingException; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MappingException; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.binding.FetchProfile; import org.hibernate.metamodel.binding.TypeDef; import org.hibernate.metamodel.relational.AuxiliaryDatabaseObject; @@ -55,7 +55,7 @@ import org.hibernate.type.Type; /** * Responsible for processing a {@code } element. Allows processing to be coordinated across * all hbm files in an ordered fashion. The order is essentially the same as defined in - * {@link org.hibernate.metamodel.binder.source.SourceProcessor} + * {@link org.hibernate.metamodel.source.SourceProcessor} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HierarchyBuilder.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HierarchyBuilder.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HierarchyBuilder.java index 662b0859ff..7d24fdec2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/HierarchyBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HierarchyBuilder.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.ArrayList; import java.util.HashMap; @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; import org.hibernate.MappingException; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.SubEntityElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinedSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSubclassElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLUnionSubclassElement; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.SubEntityElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLJoinedSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSubclassElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLUnionSubclassElement; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/MappingDocument.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDocument.java similarity index 86% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/MappingDocument.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDocument.java index feb941cfc6..4e1488964a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/MappingDocument.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDocument.java @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; import java.util.List; import org.hibernate.cfg.NamingStrategy; import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement; -import org.hibernate.metamodel.binder.source.internal.JaxbRoot; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement; +import org.hibernate.metamodel.source.internal.JaxbRoot; import org.hibernate.metamodel.domain.Type; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLFetchProfileElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLFetchProfileElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; import org.hibernate.service.ServiceRegistry; /** @@ -146,6 +146,11 @@ public class MappingDocument { return Helper.determineEntityName( entityElement, getMappingDefaults().getPackageName() ); } + @Override + public boolean isGloballyQuotedIdentifiers() { + return metadata.getOptions().isGloballyQuotedIdentifiers(); + } + @Override public void processFetchProfiles(List fetchProfiles, String containingEntityName) { // todo : this really needs to not be part of the context diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/SubEntityContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/SubEntityContainer.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/SubEntityContainer.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/SubEntityContainer.java index 09bb98b4d3..d54cd95c58 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/SubEntityContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/SubEntityContainer.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm; +package org.hibernate.metamodel.source.hbm; /** * Contract for elements within a {@link EntityHierarchy} which can contain sub elements. Essentially this diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/CustomSqlElement.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/CustomSqlElement.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/CustomSqlElement.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/CustomSqlElement.java index 63330b6fbf..14d850d044 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/CustomSqlElement.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/CustomSqlElement.java @@ -21,9 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.xml.mapping; - -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLCheckAttribute; +package org.hibernate.metamodel.source.hbm.jaxb.mapping; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/EntityElement.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/EntityElement.java similarity index 73% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/EntityElement.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/EntityElement.java index 5b94d87e70..efe6ec4e75 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/EntityElement.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/EntityElement.java @@ -21,20 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.xml.mapping; +package org.hibernate.metamodel.source.hbm.jaxb.mapping; import java.util.List; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLFetchProfileElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLLoaderElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLResultsetElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlDeleteElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlInsertElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlUpdateElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSynchronizeElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLTuplizerElement; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/JoinElementSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/JoinElementSource.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/JoinElementSource.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/JoinElementSource.java index a3cf6122be..f5f5d2cd48 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/JoinElementSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/JoinElementSource.java @@ -21,12 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.xml.mapping; +package org.hibernate.metamodel.source.hbm.jaxb.mapping; import java.util.List; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLJoinElement; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/MetaAttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/MetaAttributeContainer.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/MetaAttributeContainer.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/MetaAttributeContainer.java index 1c153dbd37..6da5521d4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/MetaAttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/MetaAttributeContainer.java @@ -21,12 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.xml.mapping; +package org.hibernate.metamodel.source.hbm.jaxb.mapping; import java.util.List; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLMetaElement; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/SubEntityElement.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/SubEntityElement.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/SubEntityElement.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/SubEntityElement.java index eaea4c68c8..5055587a01 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/xml/mapping/SubEntityElement.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/jaxb/mapping/SubEntityElement.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.xml.mapping; +package org.hibernate.metamodel.source.hbm.jaxb.mapping; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/AbstractHbmAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/AbstractHbmAttributeBindingState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java index 5c49d38376..39d7052f93 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/AbstractHbmAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.binding; +package org.hibernate.metamodel.source.hbm.state.binding; import java.util.HashSet; import java.util.Map; @@ -30,10 +30,10 @@ import java.util.Set; import org.hibernate.MappingException; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.state.AttributeBindingState; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmDiscriminatorBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java similarity index 88% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmDiscriminatorBindingState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java index 5ef1a4a63f..f899d8a090 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmDiscriminatorBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.binding; +package org.hibernate.metamodel.source.hbm.state.binding; import java.util.Set; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.state.DiscriminatorBindingState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java index 1d7e038efa..1b15eb1d80 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.binding; +package org.hibernate.metamodel.source.hbm.state.binding; import java.util.Set; import org.hibernate.FetchMode; import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.state.ManyToOneAttributeBindingState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLManyToOneElement; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmPluralAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmPluralAttributeBindingState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java index 7d74f1c686..c94f45c12f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmPluralAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.binding; +package org.hibernate.metamodel.source.hbm.state.binding; import java.util.Comparator; import java.util.HashMap; @@ -29,18 +29,18 @@ import java.util.HashSet; import java.util.Set; import org.hibernate.FetchMode; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.CustomSQL; import org.hibernate.metamodel.binding.state.PluralAttributeBindingState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLBagElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlDeleteAllElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlDeleteElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlInsertElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlUpdateElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSynchronizeElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLBagElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlDeleteAllElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlDeleteElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlInsertElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSqlUpdateElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLSynchronizeElement; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmSimpleAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmSimpleAttributeBindingState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java index db60f625cb..808d4836b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/binding/HbmSimpleAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.binding; +package org.hibernate.metamodel.source.hbm.state.binding; import java.util.HashMap; import java.util.Map; @@ -29,17 +29,17 @@ import java.util.Set; import org.hibernate.MappingException; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binder.source.BindingContext; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.BindingContext; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.binding.CascadeType; import org.hibernate.metamodel.binding.state.SimpleAttributeBindingState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLId; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLVersion; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLParamElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLPropertyElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLId; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLVersion; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLParamElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLPropertyElement; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmColumnRelationalState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmColumnRelationalState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java index e470631ce5..ddffd88f5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmColumnRelationalState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.relational; +package org.hibernate.metamodel.source.hbm.state.relational; import java.util.Set; import org.hibernate.MappingException; import org.hibernate.cfg.NamingStrategy; -import org.hibernate.metamodel.binder.source.hbm.Helper; +import org.hibernate.metamodel.source.hbm.Helper; import org.hibernate.metamodel.relational.Size; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLColumnElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLId; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLVersion; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLPropertyElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLColumnElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLId; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLVersion; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLManyToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLPropertyElement; import org.hibernate.metamodel.relational.state.ColumnRelationalState; // TODO: remove duplication after Id, Discriminator, Version, Timestamp, and Property extend a common interface. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmDerivedValueRelationalState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmDerivedValueRelationalState.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmDerivedValueRelationalState.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmDerivedValueRelationalState.java index 120d77b7de..f160d074ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmDerivedValueRelationalState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmDerivedValueRelationalState.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.relational; +package org.hibernate.metamodel.source.hbm.state.relational; import org.hibernate.metamodel.relational.state.DerivedValueRelationalState; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java index 878b519273..806a06a962 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.relational; +package org.hibernate.metamodel.source.hbm.state.relational; -import org.hibernate.metamodel.binder.source.BindingContext; +import org.hibernate.metamodel.source.BindingContext; import org.hibernate.metamodel.relational.state.ManyToOneRelationalState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLManyToOneElement; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java index 71e142b492..9092a6e70b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.hbm.state.relational; +package org.hibernate.metamodel.source.hbm.state.relational; import java.util.ArrayList; import java.util.Collections; @@ -30,17 +30,17 @@ import java.util.Set; import org.hibernate.MappingException; import org.hibernate.cfg.NamingStrategy; -import org.hibernate.metamodel.binder.source.BindingContext; +import org.hibernate.metamodel.source.BindingContext; import org.hibernate.metamodel.binding.HibernateTypeDescriptor; import org.hibernate.metamodel.relational.state.SimpleValueRelationalState; import org.hibernate.metamodel.relational.state.TupleRelationalState; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLColumnElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLId; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLVersion; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLPropertyElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLColumnElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLId; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLTimestamp; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping.XMLClass.XMLVersion; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLManyToOneElement; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLPropertyElement; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/AttributeTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/AttributeTypeResolver.java index 85a8bb112c..b27526c6ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/AttributeTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/AttributeTypeResolver.java @@ -36,7 +36,7 @@ import org.hibernate.metamodel.domain.JavaType; import org.hibernate.metamodel.relational.Datatype; import org.hibernate.metamodel.relational.SimpleValue; import org.hibernate.metamodel.relational.Value; -import org.hibernate.metamodel.source.spi.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.type.AbstractStandardBasicType; import org.hibernate.type.Type; @@ -98,19 +98,19 @@ class AttributeTypeResolver { // this only works for singular basic types private void resolveJavaType(Attribute attribute, Type type) { - if ( ! ( type instanceof AbstractStandardBasicType ) || ! attribute.isSingular() ) { - return; - } - // Converting to SingularAttributeImpl is bad, but this resolver is TEMPORARY! - AbstractAttributeContainer.SingularAttributeImpl singularAttribute = - ( AbstractAttributeContainer.SingularAttributeImpl ) attribute; - if ( ! singularAttribute.isTypeResolved() ) { - singularAttribute.resolveType( - new BasicType( - new JavaType( ( ( AbstractStandardBasicType) type ).getJavaTypeDescriptor().getJavaTypeClass() ) - ) - ); - } +// if ( ! ( type instanceof AbstractStandardBasicType ) || ! attribute.isSingular() ) { +// return; +// } +// // Converting to SingularAttributeImpl is bad, but this resolver is TEMPORARY! +// AbstractAttributeContainer.SingularAttributeImpl singularAttribute = +// ( AbstractAttributeContainer.SingularAttributeImpl ) attribute; +// if ( ! singularAttribute.isTypeResolved() ) { +// singularAttribute.resolveType( +// new BasicType( +// new JavaType( ( ( AbstractStandardBasicType) type ).getJavaTypeDescriptor().getJavaTypeClass() ) +// ) +// ); +// } } // this only works for singular basic types @@ -131,7 +131,7 @@ class AttributeTypeResolver { // TODO: this does not work for components private static String getQualifiedAttributeName(AttributeBinding attributebinding) { return new StringBuilder() - .append( attributebinding.getEntityBinding().getEntity().getJavaType().getName() ) + .append( attributebinding.getEntityBinding().getEntity().getName() ) .append( "." ) .append( attributebinding.getAttribute().getName() ) .toString(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/EntityReferenceResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/EntityReferenceResolver.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/EntityReferenceResolver.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/EntityReferenceResolver.java index 9e4de6227d..2aa3ace0bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/EntityReferenceResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/EntityReferenceResolver.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import org.hibernate.MappingException; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.binding.AttributeBinding; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.binding.EntityReferencingAttributeBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java index d0042dac3f..64d4fd28d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import java.io.IOException; import java.io.InputStream; @@ -51,11 +51,11 @@ import org.w3c.dom.Element; import org.xml.sax.SAXException; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.MappingException; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.XsdException; +import org.hibernate.metamodel.source.MappingException; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.XsdException; import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; -import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping; +import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; import org.hibernate.service.classloading.spi.ClassLoaderService; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbRoot.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbRoot.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbRoot.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbRoot.java index 4152de5308..888b05aecb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/JaxbRoot.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbRoot.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; -import org.hibernate.metamodel.binder.Origin; +import org.hibernate.metamodel.source.Origin; /** * Holds information about a JAXB-unmarshalled XML document. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataBuilderImpl.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java index bc22b1c112..0bb2ea2cce 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import javax.persistence.SharedCacheMode; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataImpl.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java index eb0ee4a5c7..6811d33a44 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/MetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import java.io.Serializable; import java.util.ArrayList; @@ -48,12 +48,11 @@ import org.hibernate.internal.util.Value; import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.SessionFactoryBuilder; import org.hibernate.metamodel.SourceProcessingOrder; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetaAttributeContext; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.SourceProcessor; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsSourceProcessor; -import org.hibernate.metamodel.binder.source.hbm.HbmSourceProcessorImpl; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetaAttributeContext; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.SourceProcessor; +import org.hibernate.metamodel.source.hbm.HbmSourceProcessorImpl; import org.hibernate.metamodel.binding.AttributeBinding; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.binding.FetchProfile; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/OverriddenMappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/OverriddenMappingDefaults.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/OverriddenMappingDefaults.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/OverriddenMappingDefaults.java index c2ea71f529..170361272c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/OverriddenMappingDefaults.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/OverriddenMappingDefaults.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.metamodel.binder.source.MappingDefaults; +import org.hibernate.metamodel.source.MappingDefaults; /** * Represents a "nested level" in the mapping defaults stack. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImpl.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/SessionFactoryBuilderImpl.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImpl.java index 3908ac359f..3be406488b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/internal/SessionFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImpl.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.internal; +package org.hibernate.metamodel.source.internal; import java.io.Serializable; @@ -31,7 +31,7 @@ import org.hibernate.ObjectNotFoundException; import org.hibernate.SessionFactory; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.metamodel.SessionFactoryBuilder; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.proxy.EntityNotFoundDelegate; /** diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java index aa086af441..0703c5743a 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java @@ -32,7 +32,7 @@ import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.binding.PluralAttributeBinding; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java index 01a24332f0..774ce9871a 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java @@ -31,7 +31,7 @@ import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.metamodel.binding.PluralAttributeBinding; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java index 8e926af56f..a58edfb79d 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java @@ -25,7 +25,7 @@ package org.hibernate.service.internal; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.Service; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceRegistryFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java index 82f5f04647..759b3f2bb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java @@ -25,7 +25,7 @@ package org.hibernate.service.internal; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.Service; import org.hibernate.service.StandardSessionFactoryServiceInitiators; import org.hibernate.service.spi.ServiceInitiator; diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java index c646784c85..59448c1cdf 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java @@ -25,7 +25,7 @@ package org.hibernate.service.spi; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.Service; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java index f1e7206e2f..33ae849622 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java @@ -25,7 +25,7 @@ package org.hibernate.service.spi; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.Service; import org.hibernate.service.internal.SessionFactoryServiceRegistryImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java index 212850290f..373f8600fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java @@ -29,7 +29,7 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.binder.source.MetadataImplementor; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.config.spi.ConfigurationService; import org.hibernate.service.spi.ServiceRegistryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java b/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java index ee23c08945..f18ed95c6e 100755 --- a/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java @@ -84,8 +84,8 @@ public class PojoInstantiator implements Instantiator, Serializable { } public PojoInstantiator(EntityBinding entityBinding, ReflectionOptimizer.InstantiationOptimizer optimizer) { - this.mappedClass = entityBinding.getEntity().getJavaType().getClassReference(); - this.proxyInterface = entityBinding.getProxyInterfaceType().getClassReference(); + this.mappedClass = entityBinding.getEntity().getClassReference(); + this.proxyInterface = entityBinding.getProxyInterfaceType().getValue(); this.embeddedIdentifier = entityBinding.getEntityIdentifier().isEmbedded(); this.optimizer = optimizer; diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java index 2f23d04551..6ff5e12423 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java @@ -133,7 +133,7 @@ public class PropertyFactory { else { return new IdentifierProperty( property.getAttribute().getName(), - property.getNodeName(), + null, type, mappedEntity.getEntityIdentifier().isEmbedded(), unsavedValue, @@ -201,7 +201,7 @@ public class PropertyFactory { return new VersionProperty( property.getAttribute().getName(), - property.getNodeName(), + null, property.getHibernateTypeDescriptor().getExplicitType(), lazy, property.isInsertable(), @@ -283,7 +283,7 @@ public class PropertyFactory { SimpleAttributeBinding simpleProperty = ( SimpleAttributeBinding ) property; return new StandardProperty( simpleProperty.getAttribute().getName(), - simpleProperty.getNodeName(), + null, type, lazyAvailable && simpleProperty.isLazy(), simpleProperty.isInsertable(), @@ -306,7 +306,7 @@ public class PropertyFactory { return new StandardProperty( pluralProperty.getAttribute().getName(), - pluralProperty.getNodeName(), + null, type, lazyAvailable && pluralProperty.isLazy(), // TODO: fix this when HHH-6356 is fixed; for now assume PluralAttributeBinding is updatable and insertable @@ -345,12 +345,12 @@ public class PropertyFactory { } private static Constructor getConstructor(EntityBinding entityBinding) { - if ( entityBinding == null || entityBinding.getEntity().getJavaType() == null ) { + if ( entityBinding == null || entityBinding.getEntity() == null ) { return null; } try { - return ReflectHelper.getDefaultConstructor( entityBinding.getEntity().getJavaType().getClassReference() ); + return ReflectHelper.getDefaultConstructor( entityBinding.getEntity().getClassReference() ); } catch( Throwable t ) { return null; @@ -367,13 +367,13 @@ public class PropertyFactory { } private static Getter getGetter(AttributeBinding mappingProperty) { - if ( mappingProperty == null || mappingProperty.getEntityBinding().getEntity().getJavaType() == null ) { + if ( mappingProperty == null || mappingProperty.getEntityBinding().getEntity() == null ) { return null; } PropertyAccessor pa = PropertyAccessorFactory.getPropertyAccessor( mappingProperty, EntityMode.POJO ); return pa.getGetter( - mappingProperty.getEntityBinding().getEntity().getJavaType().getClassReference(), + mappingProperty.getEntityBinding().getEntity().getClassReference(), mappingProperty.getAttribute().getName() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java index 626b9ac2ce..73ccd8c088 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java @@ -115,8 +115,8 @@ public class PojoEntityTuplizer extends AbstractEntityTuplizer { public PojoEntityTuplizer(EntityMetamodel entityMetamodel, EntityBinding mappedEntity) { super( entityMetamodel, mappedEntity ); - this.mappedClass = mappedEntity.getEntity().getJavaType().getClassReference(); - this.proxyInterface = mappedEntity.getProxyInterfaceType().getClassReference(); + this.mappedClass = mappedEntity.getEntity().getClassReference(); + this.proxyInterface = mappedEntity.getProxyInterfaceType().getValue(); this.lifecycleImplementor = Lifecycle.class.isAssignableFrom( mappedClass ); for ( AttributeBinding property : mappedEntity.getAttributeBindingClosure() ) { @@ -262,8 +262,8 @@ public class PojoEntityTuplizer extends AbstractEntityTuplizer { HashSet proxyInterfaces = new HashSet(); proxyInterfaces.add( HibernateProxy.class ); - Class mappedClass = entityBinding.getEntity().getJavaType().getClassReference(); - Class proxyInterface = entityBinding.getProxyInterfaceType().getClassReference(); + Class mappedClass = entityBinding.getEntity().getClassReference(); + Class proxyInterface = entityBinding.getProxyInterfaceType().getValue(); if ( proxyInterface!=null && !mappedClass.equals( proxyInterface ) ) { if ( ! proxyInterface.isInterface() ) { @@ -461,14 +461,14 @@ public class PojoEntityTuplizer extends AbstractEntityTuplizer { private Getter getGetter(AttributeBinding mappedProperty) throws PropertyNotFoundException, MappingException { return getPropertyAccessor( mappedProperty ).getGetter( - mappedProperty.getEntityBinding().getEntity().getJavaType().getClassReference(), + mappedProperty.getEntityBinding().getEntity().getClassReference(), mappedProperty.getAttribute().getName() ); } private Setter getSetter(AttributeBinding mappedProperty) throws PropertyNotFoundException, MappingException { return getPropertyAccessor( mappedProperty ).getSetter( - mappedProperty.getEntityBinding().getEntity().getJavaType().getClassReference(), + mappedProperty.getEntityBinding().getEntity().getClassReference(), mappedProperty.getAttribute().getName() ); } @@ -476,7 +476,7 @@ public class PojoEntityTuplizer extends AbstractEntityTuplizer { private PropertyAccessor getPropertyAccessor(AttributeBinding mappedProperty) throws MappingException { // TODO: Fix this then backrefs are working in new metamodel return PropertyAccessorFactory.getPropertyAccessor( - mappedProperty.getEntityBinding().getEntity().getJavaType().getClassReference(), + mappedProperty.getEntityBinding().getEntity().getClassReference(), mappedProperty.getPropertyAccessorName() ); } diff --git a/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb b/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb index 34668f34c7..74dcd601f6 100644 --- a/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb +++ b/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb @@ -19,30 +19,30 @@ - org.hibernate.metamodel.binder.source.hbm.xml.mapping.EntityElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.JoinElementSource + org.hibernate.metamodel.source.hbm.jaxb.mapping.EntityElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.JoinElementSource - org.hibernate.metamodel.binder.source.hbm.xml.mapping.SubEntityElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.JoinElementSource + org.hibernate.metamodel.source.hbm.jaxb.mapping.SubEntityElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.JoinElementSource - org.hibernate.metamodel.binder.source.hbm.xml.mapping.SubEntityElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.SubEntityElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.SubEntityElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.SubEntityElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.CustomSqlElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.CustomSqlElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.CustomSqlElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.CustomSqlElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.CustomSqlElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.CustomSqlElement - org.hibernate.metamodel.binder.source.hbm.xml.mapping.CustomSqlElement + org.hibernate.metamodel.source.hbm.jaxb.mapping.CustomSqlElement diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java index 80cd39066f..ca7f01602f 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java @@ -27,14 +27,13 @@ import java.sql.Types; import java.util.Iterator; import java.util.Set; -import junit.framework.Assert; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.MetadataImplementor; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.metamodel.domain.BasicType; import org.hibernate.metamodel.domain.SingularAttribute; import org.hibernate.metamodel.domain.TypeNature; @@ -143,9 +142,8 @@ public abstract class AbstractBasicBindingTests extends BaseUnitTestCase { assertTrue( idAttributeBinding.getAttribute().isSingular() ); assertNotNull( idAttributeBinding.getAttribute() ); SingularAttribute singularIdAttribute = ( SingularAttribute ) idAttributeBinding.getAttribute(); - assertSame( TypeNature.BASIC, singularIdAttribute.getSingularAttributeType().getNature() ); BasicType basicIdAttributeType = ( BasicType ) singularIdAttribute.getSingularAttributeType(); - assertSame( Long.class, basicIdAttributeType.getJavaType().getClassReference() ); + assertSame( Long.class, basicIdAttributeType.getClassReference() ); assertNotNull( idAttributeBinding.getValue() ); assertTrue( idAttributeBinding.getValue() instanceof Column ); @@ -163,9 +161,8 @@ public abstract class AbstractBasicBindingTests extends BaseUnitTestCase { assertTrue( nameBinding.getAttribute().isSingular() ); assertNotNull( nameBinding.getAttribute() ); SingularAttribute singularNameAttribute = ( SingularAttribute ) nameBinding.getAttribute(); - assertSame( TypeNature.BASIC, singularNameAttribute.getSingularAttributeType().getNature() ); BasicType basicNameAttributeType = ( BasicType ) singularNameAttribute.getSingularAttributeType(); - assertSame( String.class, basicNameAttributeType.getJavaType().getClassReference() ); + assertSame( String.class, basicNameAttributeType.getClassReference() ); assertNotNull( nameBinding.getValue() ); // until HHH-6380 is fixed, need to call getValues() diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java index e6aedf4e9e..2d907b2993 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java @@ -24,7 +24,7 @@ package org.hibernate.metamodel.binding; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.internal.MetadataImpl; /** * Basic tests of annotation based binding code diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicHbmBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicHbmBindingTests.java index 34fcbbe37a..927354b15e 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicHbmBindingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicHbmBindingTests.java @@ -24,7 +24,7 @@ package org.hibernate.metamodel.binding; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.internal.MetadataImpl; /** * Basic tests of {@code hbm.xml} binding code diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/MiscAnnotationBindingTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/MiscAnnotationBindingTest.java index c99f767194..71ba4f96f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/MiscAnnotationBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/MiscAnnotationBindingTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.hibernate.annotations.Where; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/TestAnnotationsBindingContextImpl.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/TestAnnotationsBindingContextImpl.java index 5864344a7c..dcc2ba7946 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/TestAnnotationsBindingContextImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/TestAnnotationsBindingContextImpl.java @@ -38,9 +38,8 @@ import org.hibernate.cfg.EJB3NamingStrategy; import org.hibernate.cfg.NamingStrategy; import org.hibernate.cfg.NotYetImplementedException; import org.hibernate.internal.util.Value; -import org.hibernate.metamodel.binder.source.MappingDefaults; -import org.hibernate.metamodel.binder.source.MetadataImplementor; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; +import org.hibernate.metamodel.source.MappingDefaults; +import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.metamodel.domain.Type; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java index c13ebf165f..82f16f8daf 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java @@ -26,7 +26,7 @@ package org.hibernate.metamodel.source.annotations.entity; import org.junit.After; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/TableNameTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/TableNameTest.java index 875518f42a..b485639be7 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/TableNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/TableNameTest.java @@ -39,10 +39,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.hibernate.metamodel.binder.source.annotations.AnnotationsBindingContext; -import org.hibernate.metamodel.binder.source.annotations.ConfiguredClassHierarchyBuilder; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.ConfiguredClassHierarchyBuilder; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.binding.InheritanceType; import org.hibernate.metamodel.source.annotations.TestAnnotationsBindingContextImpl; import org.hibernate.service.ServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java index f739fea717..ea1ed2fbc1 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java @@ -32,9 +32,8 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; import org.hibernate.annotations.FetchProfiles; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.global.FetchProfileBinder; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.internal.BasicServiceRegistryImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java index 9256059831..c1cac6f3df 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java @@ -35,7 +35,7 @@ import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.spi.NamedSQLQueryDefinition; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.source.annotations.util.JandexHelper; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java index 4b11db1ff4..f48b097597 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java @@ -31,9 +31,9 @@ import org.jboss.jandex.Index; import org.junit.After; import org.junit.Before; -import org.hibernate.metamodel.binder.source.annotations.ConfiguredClassHierarchyBuilder; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.ConfiguredClassHierarchyBuilder; +import org.hibernate.metamodel.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; import org.hibernate.metamodel.source.annotations.TestAnnotationsBindingContextImpl; import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; import org.hibernate.metamodel.source.annotations.entity.EntityClass; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/EntityHierarchyTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/EntityHierarchyTest.java index 25b2229eb7..da208e172f 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/EntityHierarchyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/EntityHierarchyTest.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; import org.hibernate.metamodel.binding.InheritanceType; import org.hibernate.metamodel.source.annotations.entity.EmbeddableClass; import org.hibernate.metamodel.source.annotations.entity.EntityClass; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/GenericTypeDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/GenericTypeDiscoveryTest.java index 49581b4bc3..ae59a5ea2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/GenericTypeDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/GenericTypeDiscoveryTest.java @@ -35,8 +35,8 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.junit.Test; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClass; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; import org.hibernate.metamodel.source.annotations.attribute.MappedAttribute; import org.hibernate.metamodel.source.annotations.entity.EntityClass; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java index 24dede1a19..5486b9dc90 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java @@ -42,9 +42,9 @@ import org.junit.Test; import org.hibernate.AssertionFailure; import org.hibernate.annotations.NamedNativeQuery; -import org.hibernate.metamodel.binder.source.annotations.HibernateDotNames; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.JandexHelper; +import org.hibernate.metamodel.source.annotations.HibernateDotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.internal.BasicServiceRegistryImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/TypeDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/TypeDiscoveryTest.java index 995d5a2ab7..34cfafc58f 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/TypeDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/TypeDiscoveryTest.java @@ -32,8 +32,8 @@ import org.junit.Test; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClass; -import org.hibernate.metamodel.binder.source.annotations.entity.ConfiguredClassHierarchy; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClass; +import org.hibernate.metamodel.source.annotations.entity.ConfiguredClassHierarchy; import org.hibernate.metamodel.source.annotations.attribute.MappedAttribute; import org.hibernate.metamodel.source.annotations.entity.EntityClass; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java index aef0e32a01..3ec69c3e47 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java @@ -26,8 +26,8 @@ package org.hibernate.metamodel.source.annotations.xml; import org.junit.Test; import org.hibernate.metamodel.MetadataSources; -import org.hibernate.metamodel.binder.MappingException; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; +import org.hibernate.metamodel.source.MappingException; +import org.hibernate.metamodel.source.internal.MetadataImpl; import org.hibernate.metamodel.binding.EntityBinding; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMockerTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java index 528f9f9a45..745a50a705 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/AbstractMockerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.io.IOException; import java.io.InputStream; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Author.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Author.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Author.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Author.java index 1237a50416..0a2868d18d 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Author.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Author.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMockerTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java index 84b89b0de2..dfeea93066 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/BasicMockerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; @@ -33,7 +33,7 @@ import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; import org.hibernate.metamodel.source.annotation.xml.XMLEntity; import org.hibernate.metamodel.source.annotation.xml.XMLGeneratedValue; import org.hibernate.metamodel.source.annotation.xml.XMLId; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Book.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Book.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Book.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Book.java index ecb6024f80..ccfebfa64e 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Book.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.ArrayList; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java index f936857cf5..223d545089 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java @@ -1,4 +1,4 @@ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.HashMap; import java.util.HashSet; @@ -19,7 +19,7 @@ import org.jboss.jandex.Index; import org.junit.Test; import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityListenerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityListenerTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityListenerTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityListenerTest.java index 6f1ee777b0..392e5430ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/EntityListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityListenerTest.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.Test; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; -import org.hibernate.metamodel.binder.source.annotations.xml.PseudoJpaDotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilderTest.java similarity index 73% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilderTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilderTest.java index e539d3222d..52d1189241 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/IndexBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilderTest.java @@ -1,4 +1,4 @@ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Item.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Item.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Item.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Item.java index cd4a40a19c..fa5be30fc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Item.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ItemListener.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/ItemListener.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ItemListener.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/ItemListener.java index 93ea7eead8..dc1852b0b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/ItemListener.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/ItemListener.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OverrideTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java index f718ff6229..b1729dffb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/OverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.util.List; @@ -33,7 +33,7 @@ import org.jboss.jandex.Index; import org.junit.Test; import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.binder.source.annotations.JPADotNames; +import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java index b93cfbdd2a..26b966f801 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMockerTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import javax.persistence.AccessType; @@ -30,7 +30,7 @@ import org.jboss.jandex.Index; import org.junit.Test; import static org.junit.Assert.*; -import org.hibernate.metamodel.binder.source.annotations.xml.PseudoJpaDotNames; +import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Topic.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Topic.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Topic.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Topic.java index 94daf79c1b..cf74904525 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/Topic.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/Topic.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/XmlHelper.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/XmlHelper.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/XmlHelper.java rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/XmlHelper.java index 753a9e6436..a6f0115d8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/binder/source/annotations/xml/mocker/XmlHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/XmlHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source.annotations.xml.mocker; +package org.hibernate.metamodel.source.annotations.xml.mocker; import java.io.InputStream; import java.net.URL; @@ -37,8 +37,8 @@ import org.hibernate.internal.CoreMessageLogger; import org.jboss.logging.Logger; import org.xml.sax.SAXException; -import org.hibernate.metamodel.binder.Origin; -import org.hibernate.metamodel.binder.source.internal.JaxbRoot; +import org.hibernate.metamodel.source.Origin; +import org.hibernate.metamodel.source.internal.JaxbRoot; import org.hibernate.service.classloading.spi.ClassLoaderService; /** diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java index 0ff4808c7c..79326d60c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java @@ -32,8 +32,6 @@ import org.hibernate.SessionFactory; import org.hibernate.metamodel.Metadata; import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.SessionFactoryBuilder; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; -import org.hibernate.metamodel.binder.source.internal.SessionFactoryBuilderImpl; import org.hibernate.metamodel.binding.FetchProfile; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java index 18a156e36b..75c5ec0ef1 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java @@ -37,8 +37,6 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.SessionFactoryBuilder; -import org.hibernate.metamodel.binder.source.internal.MetadataImpl; -import org.hibernate.metamodel.binder.source.internal.SessionFactoryBuilderImpl; import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/listener.xml b/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/listener.xml index 97c4a81d11..8095ad48ca 100644 --- a/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/listener.xml +++ b/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/listener.xml @@ -8,7 +8,7 @@ FIELD - + @@ -18,7 +18,7 @@ org.hibernate.metamodel.binder.source.annotations.xml.mocker - + diff --git a/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/persistence-metadata.xml b/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/persistence-metadata.xml index 6611bce577..6148c06247 100644 --- a/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/persistence-metadata.xml +++ b/hibernate-core/src/test/resources/org/hibernate/metamodel/binder/source/annotations/xml/mocker/persistence-metadata.xml @@ -8,7 +8,7 @@ FIELD - + diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/RootEntityDescriptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java similarity index 52% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/RootEntityDescriptor.java rename to hibernate-testing/src/main/java/org/hibernate/testing/Skip.java index 5dd824d10e..b71877f27d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binder/source/RootEntityDescriptor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java @@ -21,30 +21,51 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binder.source; +package org.hibernate.testing; -import org.hibernate.engine.OptimisticLockStyle; -import org.hibernate.metamodel.binding.Caching; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** + * An annotation, used in combination with {@link Matcher}, to determine when/if tests should be skipped. + * * @author Steve Ebersole */ -public interface RootEntityDescriptor extends EntityDescriptor { - public boolean isMutable(); +@Retention( RetentionPolicy.RUNTIME ) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface Skip { + /** + * The condition which causes a skip + * + * @return The condition + */ + Class condition(); - public boolean isExplicitPolymorphism(); + /** + * A message describing the reason for the skip + * + * @return Descriptive message + */ + String message(); - public String getWhereFilter(); + /** + * Simple boolean assertion + */ + public static interface Matcher { + /** + * Do we have a match to the underlying condition? + * + * @return True/false ;) + */ + public boolean isMatch(); + } - public String getRowId(); - - public Caching getCaching(); - - public OptimisticLockStyle getOptimisticLockStyle(); - - public TableDescriptor getBaseTable(); - - // todo : add -> - // 1) identifier descriptor - // 2) discriminator descriptor + public static class AlwaysSkip implements Matcher { + @Override + public boolean isMatch() { + return true; + } + } } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java index a16abc9455..8c44e40de5 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java @@ -25,8 +25,6 @@ package org.hibernate.testing; import org.jboss.logging.Logger; -import org.hibernate.testing.junit4.SkipMarker; - /** * Well-known-location lookup for the test-skip log... * @@ -35,10 +33,6 @@ import org.hibernate.testing.junit4.SkipMarker; public class SkipLog { private static final Logger log = Logger.getLogger( SkipLog.class ); - public static void reportSkip(SkipMarker skipMarker) { - log.info( "*** skipping test [" + skipMarker.getTestName() + "] - " + skipMarker.getReason(), new Exception() ); - } - public static void reportSkip(String message) { log.info( "*** skipping test - " + message, new Exception() ); }