From 14efea6e21b0763a56cccec45ef87ffb1a2bd9b9 Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Thu, 19 May 2011 15:32:00 +0200 Subject: [PATCH] HHH-6171 Moving MappingDefaults and MappingHelper into sub-packages of hbm binding --- .../java/org/hibernate/metamodel/binding/EntityBinding.java | 3 ++- .../hibernate/metamodel/binding/PluralAttributeBinding.java | 4 ---- .../metamodel/source/annotations/xml/OrmXmlParser.java | 5 ----- .../java/org/hibernate/metamodel/source/hbm/HbmHelper.java | 2 +- .../metamodel/source/hbm/HibernateMappingBinder.java | 3 +-- .../metamodel/{binding => source/hbm}/MappingDefaults.java | 2 +- .../hbm/state/binding/AbstractHbmAttributeBindingState.java | 4 ++-- .../hbm/state/binding/HbmDiscriminatorBindingState.java | 2 +- .../hbm/state/binding/HbmManyToOneAttributeBindingState.java | 4 ++-- .../hbm/state/binding/HbmPluralAttributeBindingState.java | 4 ++-- .../hbm/state/binding/HbmSimpleAttributeBindingState.java | 4 ++-- .../hbm/state/relational/HbmColumnRelationalState.java | 2 +- .../relational/HbmManyToOneRelationalStateContainer.java | 2 +- .../relational/HbmSimpleValueRelationalStateContainer.java | 2 +- .../metamodel/source/{ => hbm}/util/MappingHelper.java | 3 +-- 15 files changed, 18 insertions(+), 28 deletions(-) rename hibernate-core/src/main/java/org/hibernate/metamodel/{binding => source/hbm}/MappingDefaults.java (97%) rename hibernate-core/src/main/java/org/hibernate/metamodel/source/{ => hbm}/util/MappingHelper.java (96%) 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 f256b96cc5..83effb1d8b 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 @@ -39,12 +39,13 @@ import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.relational.Column; import org.hibernate.metamodel.relational.TableSpecification; import org.hibernate.metamodel.source.hbm.HbmHelper; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass; 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.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * Provides the link between the domain and the relational model for an entity. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/PluralAttributeBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/PluralAttributeBinding.java index 8db29c61a7..c34b1e8b50 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/PluralAttributeBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/PluralAttributeBinding.java @@ -119,10 +119,6 @@ public abstract class PluralAttributeBinding extends AbstractAttributeBinding { loaderName = state.getLoaderName(); } - protected boolean isLazyDefault(MappingDefaults defaults) { - return defaults.isDefaultLazy(); - } - @Override public boolean isSimpleValue() { return false; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParser.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParser.java index 9243eae1f4..01c9d433dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParser.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParser.java @@ -10,8 +10,6 @@ import org.hibernate.metamodel.source.annotations.xml.mocker.EntityMappingsMocke import org.hibernate.metamodel.source.internal.JaxbRoot; import org.hibernate.metamodel.source.internal.MetadataImpl; -//import org.hibernate.metamodel.source.util.xml.XmlHelper; - /** * @author Hardy Ferentschik * @todo Need some create some XMLContext as well which can be populated w/ information which can not be expressed via annotations @@ -40,9 +38,6 @@ public class OrmXmlParser { list, annotationIndex, meta.getServiceRegistry() ).mockNewIndex(); } - - - } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmHelper.java index f7ea3f2552..a6ce83aadd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HbmHelper.java @@ -36,7 +36,7 @@ import org.hibernate.metamodel.binding.CustomSQL; import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLMetaElement; -import org.hibernate.metamodel.source.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * TODO : javadoc diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingBinder.java index 5221233eb8..f03287d2e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingBinder.java @@ -32,7 +32,6 @@ import org.hibernate.MappingException; import org.hibernate.cfg.NamingStrategy; import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.MetadataSource; -import org.hibernate.metamodel.binding.MappingDefaults; import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.source.Origin; import org.hibernate.metamodel.source.internal.JaxbRoot; @@ -46,7 +45,7 @@ import org.hibernate.metamodel.source.hbm.xml.mapping.XMLQueryElement; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSqlQueryElement; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLSubclassElement; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLUnionSubclassElement; -import org.hibernate.metamodel.source.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; import org.hibernate.service.ServiceRegistry; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/MappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDefaults.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/binding/MappingDefaults.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDefaults.java index 1c0ae529db..3b38477c2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/MappingDefaults.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/MappingDefaults.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.binding; +package org.hibernate.metamodel.source.hbm; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java index 96e74b6426..bce8b9e8c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/AbstractHbmAttributeBindingState.java @@ -28,10 +28,10 @@ import java.util.Map; import org.hibernate.MappingException; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.binding.state.AttributeBindingState; import org.hibernate.metamodel.domain.MetaAttribute; -import org.hibernate.metamodel.source.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java index c15ffa1bc1..65956dc093 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmDiscriminatorBindingState.java @@ -23,7 +23,7 @@ */ package org.hibernate.metamodel.source.hbm.state.binding; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.binding.state.DiscriminatorBindingState; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLClass.XMLDiscriminator; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java index 934465c769..bd088ae261 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmManyToOneAttributeBindingState.java @@ -27,12 +27,12 @@ import java.util.Map; import org.hibernate.FetchMode; import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.binding.state.ManyToOneAttributeBindingState; import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.source.hbm.HbmHelper; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; -import org.hibernate.metamodel.source.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java index 2769239c27..291934739a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmPluralAttributeBindingState.java @@ -30,7 +30,7 @@ import java.util.Map; import org.hibernate.FetchMode; import org.hibernate.metamodel.binding.CustomSQL; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.binding.state.PluralAttributeBindingState; import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.source.hbm.HbmHelper; @@ -40,7 +40,7 @@ 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.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java index 10563ade7a..55ed3e3f83 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/binding/HbmSimpleAttributeBindingState.java @@ -28,7 +28,7 @@ import java.util.Map; import org.hibernate.MappingException; import org.hibernate.mapping.PropertyGeneration; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.binding.state.SimpleAttributeBindingState; import org.hibernate.metamodel.domain.MetaAttribute; import org.hibernate.metamodel.source.hbm.HbmHelper; @@ -37,7 +37,7 @@ import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLCla 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.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; /** * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java index 4e790206d7..53b2b222bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmColumnRelationalState.java @@ -35,7 +35,7 @@ import org.hibernate.metamodel.source.hbm.xml.mapping.XMLHibernateMapping.XMLCla 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.util.MappingHelper; +import org.hibernate.metamodel.source.hbm.util.MappingHelper; 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/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java index 94f5d8422a..75af93de1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmManyToOneRelationalStateContainer.java @@ -23,7 +23,7 @@ */ package org.hibernate.metamodel.source.hbm.state.relational; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.relational.state.ManyToOneRelationalState; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLManyToOneElement; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java index 5794c17887..74fc36f239 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/relational/HbmSimpleValueRelationalStateContainer.java @@ -31,7 +31,7 @@ import java.util.Set; import org.hibernate.MappingException; import org.hibernate.cfg.NamingStrategy; import org.hibernate.metamodel.binding.HibernateTypeDescriptor; -import org.hibernate.metamodel.binding.MappingDefaults; +import org.hibernate.metamodel.source.hbm.MappingDefaults; import org.hibernate.metamodel.relational.state.SimpleValueRelationalState; import org.hibernate.metamodel.relational.state.TupleRelationalState; import org.hibernate.metamodel.source.hbm.xml.mapping.XMLColumnElement; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/util/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/util/MappingHelper.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/metamodel/source/util/MappingHelper.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/util/MappingHelper.java index e7ad7eb669..cc4864b7e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/util/MappingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/util/MappingHelper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.metamodel.source.util; +package org.hibernate.metamodel.source.hbm.util; import java.util.Collections; import java.util.HashSet; @@ -29,7 +29,6 @@ import java.util.Set; import java.util.StringTokenizer; import org.hibernate.MappingException; -import org.hibernate.metamodel.source.spi.MetadataImplementor; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.classloading.spi.ClassLoadingException;