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

HHH-6212 Renaming SimpleAttribute to BasicAttribute

This commit is contained in:
Hardy Ferentschik 2011-07-25 14:58:32 +02:00
parent ae8a29bdb2
commit 9eb049040a
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/AssociationAttribute.java
View File

@ -40,7 +40,7 @@ import org.hibernate.metamodel.source.annotations.JandexHelper;
/**
* @author Hardy Ferentschik
*/
public class AssociationAttribute extends SimpleAttribute {
public class AssociationAttribute extends BasicAttribute {
private final AttributeType associationType;
private final boolean ignoreNotFound;
private final String referencedEntityType;

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/ColumnSourceImpl.java
View File

@ -27,9 +27,9 @@ package org.hibernate.metamodel.source.annotations.attribute;
* @author Hardy Ferentschik
*/
public class ColumnSourceImpl extends ColumnValuesSourceImpl {
private final SimpleAttribute attribute;
private final BasicAttribute attribute;
ColumnSourceImpl(SimpleAttribute attribute) {
ColumnSourceImpl(BasicAttribute attribute) {
super( attribute.getColumnValues() );
this.attribute = attribute;
}

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SimpleIdentifierSourceImpl.java
View File

@ -31,9 +31,9 @@ import org.hibernate.metamodel.source.binder.SingularAttributeSource;
* @author Hardy Ferentschik
*/
public class SimpleIdentifierSourceImpl implements SimpleIdentifierSource {
private final SimpleAttribute attribute;
private final BasicAttribute attribute;
public SimpleIdentifierSourceImpl(SimpleAttribute attribute) {
public SimpleIdentifierSourceImpl(BasicAttribute attribute) {
this.attribute = attribute;
}

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/SingularAttributeSourceImpl.java
View File

@ -39,9 +39,9 @@ import org.hibernate.metamodel.source.binder.SingularAttributeSource;
* @author Hardy Ferentschik
*/
public class SingularAttributeSourceImpl implements SingularAttributeSource {
private final SimpleAttribute attribute;
private final BasicAttribute attribute;
public SingularAttributeSourceImpl(SimpleAttribute attribute) {
public SingularAttributeSourceImpl(BasicAttribute attribute) {
this.attribute = attribute;
}

20
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/ConfiguredClass.java
View File

@ -61,7 +61,7 @@ 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.attribute.BasicAttribute;
/**
* Base class for a configured entity, mapped super class or embeddable
@ -99,7 +99,7 @@ public class ConfiguredClass {
/**
* The id attributes
*/
private final Map<String, SimpleAttribute> idAttributeMap;
private final Map<String, BasicAttribute> idAttributeMap;
/**
* The mapped association attributes for this entity
@ -109,12 +109,12 @@ public class ConfiguredClass {
/**
* The mapped simple attributes for this entity
*/
private final Map<String, SimpleAttribute> simpleAttributeMap;
private final Map<String, BasicAttribute> simpleAttributeMap;
/**
* The version attribute or {@code null} in case none exists.
*/
private SimpleAttribute versionAttribute;
private BasicAttribute versionAttribute;
/**
* The embedded classes for this entity
@ -143,8 +143,8 @@ public class ConfiguredClass {
this.clazz = context.locateClassByName( classInfo.toString() );
this.configuredClassType = determineType();
this.classAccessType = determineClassAccessType( defaultAccessType );
this.simpleAttributeMap = new TreeMap<String, SimpleAttribute>();
this.idAttributeMap = new TreeMap<String, SimpleAttribute>();
this.simpleAttributeMap = new TreeMap<String, BasicAttribute>();
this.idAttributeMap = new TreeMap<String, BasicAttribute>();
this.associationAttributeMap = new TreeMap<String, AssociationAttribute>();
collectAttributes();
@ -175,15 +175,15 @@ public class ConfiguredClass {
return configuredClassType;
}
public Iterable<SimpleAttribute> getSimpleAttributes() {
public Iterable<BasicAttribute> getSimpleAttributes() {
return simpleAttributeMap.values();
}
public Iterable<SimpleAttribute> getIdAttributes() {
public Iterable<BasicAttribute> getIdAttributes() {
return idAttributeMap.values();
}
public SimpleAttribute getVersionAttribute() {
public BasicAttribute getVersionAttribute() {
return versionAttribute;
}
@ -445,7 +445,7 @@ public class ConfiguredClass {
String accessTypeString = accessType.toString().toLowerCase();
switch ( attributeNature ) {
case BASIC: {
SimpleAttribute attribute = SimpleAttribute.createSimpleAttribute(
BasicAttribute attribute = BasicAttribute.createSimpleAttribute(
attributeName, attributeType, annotations, accessTypeString
);
if ( attribute.isId() ) {

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/RootEntitySourceImpl.java
View File

@ -28,7 +28,7 @@ import org.hibernate.EntityMode;
import org.hibernate.engine.OptimisticLockStyle;
import org.hibernate.metamodel.binding.Caching;
import org.hibernate.metamodel.source.annotations.attribute.DiscriminatorSourceImpl;
import org.hibernate.metamodel.source.annotations.attribute.SimpleAttribute;
import org.hibernate.metamodel.source.annotations.attribute.BasicAttribute;
import org.hibernate.metamodel.source.annotations.attribute.SimpleIdentifierSourceImpl;
import org.hibernate.metamodel.source.annotations.attribute.SingularAttributeSourceImpl;
import org.hibernate.metamodel.source.binder.DiscriminatorSource;
@ -49,7 +49,7 @@ public class RootEntitySourceImpl extends EntitySourceImpl implements RootEntity
IdType idType = getEntityClass().getIdType();
switch ( idType ) {
case SIMPLE: {
SimpleAttribute attribute = getEntityClass().getIdAttributes().iterator().next();
BasicAttribute attribute = getEntityClass().getIdAttributes().iterator().next();
return new SimpleIdentifierSourceImpl( attribute );
}
case COMPOSED: {