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

HHH-10073 Removing methods scheduled for removal in 5.0 

(cherry picked from commit 47b8ed5121)
This commit is contained in:
Gunnar Morling 2015-09-01 10:10:41 +02:00 committed by Steve Ebersole
parent 36584f337e
commit 73d4420bda
32 changed files with 1 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
View File

@ -2115,7 +2115,6 @@ public class ModelBinder {
if ( oneToOneSource.isEmbedXml() == Boolean.TRUE ) {
DeprecationLogger.DEPRECATION_LOGGER.logDeprecationOfEmbedXmlSupport();
}
oneToOneBinding.setEmbedded( oneToOneSource.isEmbedXml() != Boolean.FALSE );
if ( StringHelper.isNotEmpty( oneToOneSource.getExplicitForeignKeyName() ) ) {
oneToOneBinding.setForeignKeyName( oneToOneSource.getExplicitForeignKeyName() );
@ -2234,7 +2233,6 @@ public class ModelBinder {
if ( manyToOneSource.isEmbedXml() == Boolean.TRUE ) {
DeprecationLogger.DEPRECATION_LOGGER.logDeprecationOfEmbedXmlSupport();
}
manyToOneBinding.setEmbedded( manyToOneSource.isEmbedXml() != Boolean.FALSE );
manyToOneBinding.setIgnoreNotFound( manyToOneSource.isIgnoreNotFound() );

1
hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java
View File

@ -176,7 +176,6 @@ public class OneToOneSecondPass implements SecondPass {
//FIXME use ignore not found here
manyToOne.setIgnoreNotFound( ignoreNotFound );
manyToOne.setCascadeDeleteEnabled( value.isCascadeDeleteEnabled() );
manyToOne.setEmbedded( value.isEmbedded() );
manyToOne.setFetchMode( value.getFetchMode() );
manyToOne.setLazy( value.isLazy() );
manyToOne.setReferencedEntityName( value.getReferencedEntityName() );

19
hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
View File

@ -661,29 +661,10 @@ public abstract class Collection implements Fetchable, Value, Filterable {
this.elementNodeName = elementNodeName;
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public boolean isEmbedded() {
return embedded;
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public void setEmbedded(boolean embedded) {
this.embedded = embedded;
}
public boolean isSubselectLoadable() {
return subselectLoadable;
}
public void setSubselectLoadable(boolean subqueryLoadable) {
this.subselectLoadable = subqueryLoadable;
}

18
hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
View File

@ -142,24 +142,6 @@ public class OneToMany implements Value {
throw new UnsupportedOperationException();
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public boolean isEmbedded() {
return embedded;
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public void setEmbedded(boolean embedded) {
this.embedded = embedded;
}
public boolean isIgnoreNotFound() {
return ignoreNotFound;
}

18
hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
View File

@ -76,24 +76,6 @@ public abstract class ToOne extends SimpleValue implements Fetchable {
return visitor.accept(this);
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public boolean isEmbedded() {
return embedded;
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public void setEmbedded(boolean embedded) {
this.embedded = embedded;
}
public boolean isValid(Mapping mapping) throws MappingException {
if (referencedEntityName==null) {
throw new MappingException("association must specify the referenced entity");

9
hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java
View File

@ -137,13 +137,4 @@ public class DiscriminatorType extends AbstractType {
public int getColumnSpan(Mapping mapping) throws MappingException {
return underlyingType.getColumnSpan( mapping );
}
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) throws HibernateException {
}
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
// todo : ???
return null;
}
}

9
hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
View File

@ -273,15 +273,6 @@ public abstract class AbstractStandardBasicType<T>
return javaTypeDescriptor.extractLoggableRepresentation( (T) value );
}
@SuppressWarnings({ "unchecked" })
public final void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) {
node.setText( toString( (T) value ) );
}
public final Object fromXMLNode(Node xml, Mapping factory) {
return fromString( xml.getText() );
}
public final boolean isMutable() {
return getMutabilityPlan().isMutable();
}

14
hibernate-core/src/main/java/org/hibernate/type/AbstractType.java
View File

@ -45,10 +45,6 @@ public abstract class AbstractType implements Type {
return false;
}
public boolean isXMLElement() {
return false;
}
public int compare(Object x, Object y) {
return ( (Comparable) x ).compareTo(y);
}
@ -128,16 +124,6 @@ public abstract class AbstractType implements Type {
return getHashCode(x );
}
protected static void replaceNode(Node container, Element value) {
if ( container!=value ) { //not really necessary, I guess...
Element parent = container.getParent();
container.detach();
value.setName( container.getName() );
value.detach();
parent.add(value);
}
}
public Type getSemiResolvedType(SessionFactoryImplementor factory) {
return this;
}

17
hibernate-core/src/main/java/org/hibernate/type/AnyType.java
View File

@ -361,18 +361,6 @@ public class AnyType extends AbstractType implements CompositeType, AssociationT
throw new UnsupportedOperationException( "any mappings may not form part of a property-ref" );
}
@Override
public void setToXMLNode(Node xml, Object value, SessionFactoryImplementor factory) {
throw new UnsupportedOperationException("any types cannot be stringified");
}
@Override
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
throw new UnsupportedOperationException();
}
// CompositeType implementation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@Override
@ -474,11 +462,6 @@ public class AnyType extends AbstractType implements CompositeType, AssociationT
return false;
}
@Override
public boolean isEmbeddedInXML() {
return false;
}
@Override
public Joinable getAssociatedJoinable(SessionFactoryImplementor factory) {
throw new UnsupportedOperationException("any types do not have a unique referenced persister");

11
hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
View File

@ -30,17 +30,6 @@ public class ArrayType extends CollectionType {
private final Class elementClass;
private final Class arrayClass;
/**
* @deprecated Use {@link #ArrayType(TypeFactory.TypeScope, String, String, Class )} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public ArrayType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Class elementClass, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
this.elementClass = elementClass;
arrayClass = Array.newInstance(elementClass, 0).getClass();
}
public ArrayType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Class elementClass) {
super( typeScope, role, propertyRef );
this.elementClass = elementClass;

13
hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
View File

@ -75,17 +75,4 @@ public interface AssociationType extends Type {
* no columns to be updated?
*/
public abstract boolean isAlwaysDirtyChecked();
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public boolean isEmbeddedInXML();
}

9
hibernate-core/src/main/java/org/hibernate/type/BagType.java
View File

@ -18,15 +18,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class BagType extends CollectionType {
/**
* @deprecated Use {@link #BagType(TypeFactory.TypeScope, String, String )}
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public BagType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public BagType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

40
hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
View File

@ -65,30 +65,11 @@ public abstract class CollectionType extends AbstractType implements Association
private final TypeFactory.TypeScope typeScope;
private final String role;
private final String foreignKeyPropertyName;
private final boolean isEmbeddedInXML;
/**
* @deprecated Use {@link #CollectionType(TypeFactory.TypeScope, String, String)} instead
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType(TypeFactory.TypeScope typeScope, String role, String foreignKeyPropertyName, boolean isEmbeddedInXML) {
this.typeScope = typeScope;
this.role = role;
this.foreignKeyPropertyName = foreignKeyPropertyName;
this.isEmbeddedInXML = isEmbeddedInXML;
}
public CollectionType(TypeFactory.TypeScope typeScope, String role, String foreignKeyPropertyName) {
this.typeScope = typeScope;
this.role = role;
this.foreignKeyPropertyName = foreignKeyPropertyName;
this.isEmbeddedInXML = true;
}
@Override
public boolean isEmbeddedInXML() {
return isEmbeddedInXML;
}
public String getRole() {
@ -795,27 +776,6 @@ public abstract class CollectionType extends AbstractType implements Association
return foreignKeyPropertyName;
}
@Override
public boolean isXMLElement() {
return true;
}
@Override
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
return xml;
}
@Override
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory)
throws HibernateException {
if ( !isEmbeddedInXML ) {
node.detach();
}
else {
replaceNode( node, (Element) value );
}
}
/**
* We always need to dirty check the collection because we sometimes
* need to incremement version number of owner and also because of

15
hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
View File

@ -702,21 +702,6 @@ public class ComponentType extends AbstractType implements CompositeType, Proced
return propertyNullability;
}
@Override
public boolean isXMLElement() {
return true;
}
@Override
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
return xml;
}
@Override
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) throws HibernateException {
replaceNode( node, (Element) value );
}
@Override
public boolean[] toColumnNullness(Object value, Mapping mapping) {
boolean[] result = new boolean[getColumnSpan( mapping )];

9
hibernate-core/src/main/java/org/hibernate/type/CompositeCustomType.java
View File

@ -254,15 +254,6 @@ public class CompositeCustomType extends AbstractType implements CompositeType,
return null;
}
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
return xml;
}
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory)
throws HibernateException {
replaceNode( node, (Element) value );
}
public boolean[] toColumnNullness(Object value, Mapping mapping) {
boolean[] result = new boolean[getColumnSpan( mapping )];
if ( value == null ) {

16
hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
View File

@ -31,22 +31,6 @@ public class CustomCollectionType extends CollectionType {
private final UserCollectionType userType;
private final boolean customLogging;
/**
* @deprecated Use {@link #CustomCollectionType(TypeFactory.TypeScope, Class, String, String )} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CustomCollectionType(
TypeFactory.TypeScope typeScope,
Class userTypeClass,
String role,
String foreignKeyPropertyName,
boolean isEmbeddedInXML) {
super( typeScope, role, foreignKeyPropertyName, isEmbeddedInXML );
userType = createUserCollectionType( userTypeClass );
customLogging = LoggableUserType.class.isAssignableFrom( userTypeClass );
}
public CustomCollectionType(
TypeFactory.TypeScope typeScope,
Class userTypeClass,

9
hibernate-core/src/main/java/org/hibernate/type/CustomType.java
View File

@ -190,15 +190,6 @@ public class CustomType
return ( (UserVersionType) userType ).seed( session );
}
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
return fromXMLString( xml.getText(), factory );
}
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory)
throws HibernateException {
node.setText( toXMLString(value, factory) );
}
public String toLoggableString(Object value, SessionFactoryImplementor factory)
throws HibernateException {
if ( value == null ) {

92
hibernate-core/src/main/java/org/hibernate/type/EntityType.java
View File

@ -13,7 +13,6 @@ import java.util.Map;
import java.util.Set;
import org.hibernate.AssertionFailure;
import org.hibernate.EntityMode;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
import org.hibernate.engine.internal.ForeignKeys;
@ -27,10 +26,6 @@ import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.Joinable;
import org.hibernate.persister.entity.UniqueKeyLoadable;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.tuple.ElementWrapper;
import org.dom4j.Element;
import org.dom4j.Node;
/**
* Base for types which map associations to persistent entities.
@ -42,7 +37,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
private final TypeFactory.TypeScope scope;
private final String associatedEntityName;
protected final String uniqueKeyPropertyName;
protected final boolean isEmbeddedInXML;
private final boolean eager;
private final boolean unwrapProxy;
private final boolean referenceToPrimaryKey;
@ -64,33 +58,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
private transient Class returnedClass;
/**
* Constructs the requested entity type mapping.
*
* @param scope The type scope
* @param entityName The name of the associated entity.
* @param uniqueKeyPropertyName The property-ref name, or null if we
* reference the PK of the associated entity.
* @param eager Is eager fetching enabled.
* @param isEmbeddedInXML Should values of this mapping be embedded in XML modes?
* @param unwrapProxy Is unwrapping of proxies allowed for this association; unwrapping
* says to return the "implementation target" of lazy prooxies; typically only possible
* with lazy="no-proxy".
*
* @deprecated Use {@link #EntityType(org.hibernate.type.TypeFactory.TypeScope, String, boolean, String, boolean, boolean)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
protected EntityType(
TypeFactory.TypeScope scope,
String entityName,
String uniqueKeyPropertyName,
boolean eager,
boolean isEmbeddedInXML,
boolean unwrapProxy) {
this( scope, entityName, uniqueKeyPropertyName == null, uniqueKeyPropertyName, eager, unwrapProxy );
}
/**
* Constructs the requested entity type mapping.
*
@ -138,7 +105,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
this.scope = scope;
this.associatedEntityName = entityName;
this.uniqueKeyPropertyName = uniqueKeyPropertyName;
this.isEmbeddedInXML = true;
this.eager = eager;
this.unwrapProxy = unwrapProxy;
this.referenceToPrimaryKey = referenceToPrimaryKey;
@ -429,37 +395,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
.isEqual( xid, yid, factory );
}
@Override
public boolean isEmbeddedInXML() {
return isEmbeddedInXML;
}
@Override
public boolean isXMLElement() {
return isEmbeddedInXML;
}
@Override
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
if ( !isEmbeddedInXML ) {
return getIdentifierType( factory ).fromXMLNode( xml, factory );
}
else {
return xml;
}
}
@Override
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) throws HibernateException {
if ( !isEmbeddedInXML ) {
getIdentifierType( factory ).setToXMLNode( node, value, factory );
}
else {
Element elt = (Element) value;
replaceNode( node, new ElementWrapper( elt ) );
}
}
@Override
public String getOnCondition(String alias, SessionFactoryImplementor factory, Map enabledFilters) {
return getOnCondition( alias, factory, enabledFilters, null );
@ -484,10 +419,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
*/
@Override
public Object resolve(Object value, SessionImplementor session, Object owner) throws HibernateException {
if ( isNotEmbedded( session ) ) {
return value;
}
if ( value != null && !isNull( owner, session ) ) {
if ( isReferenceToPrimaryKey() ) {
return resolveIdentifier( (Serializable) value, session );
@ -520,10 +451,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
}
protected final Object getIdentifier(Object value, SessionImplementor session) throws HibernateException {
if ( isNotEmbedded( session ) ) {
return value;
}
if ( isReferenceToPrimaryKey() || uniqueKeyPropertyName == null ) {
return ForeignKeys.getEntityIdentifierIfNotUnsaved(
getAssociatedEntityName(),
@ -549,16 +476,6 @@ public abstract class EntityType extends AbstractType implements AssociationType
}
}
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
protected boolean isNotEmbedded(SessionImplementor session) {
// return !isEmbeddedInXML;
return false;
}
/**
* Generate a loggable representation of an instance of the value mapped by this type.
*
@ -579,15 +496,8 @@ public abstract class EntityType extends AbstractType implements AssociationType
StringBuilder result = new StringBuilder().append( associatedEntityName );
if ( persister.hasIdentifierProperty() ) {
final EntityMode entityMode = persister.getEntityMode();
final Serializable id;
if ( entityMode == null ) {
if ( isEmbeddedInXML ) {
throw new ClassCastException( value.getClass().getName() );
}
id = (Serializable) value;
}
else if ( value instanceof HibernateProxy ) {
if ( value instanceof HibernateProxy ) {
HibernateProxy proxy = (HibernateProxy) value;
id = proxy.getHibernateLazyInitializer().getIdentifier();
}

15
hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
View File

@ -17,15 +17,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class IdentifierBagType extends CollectionType {
/**
* @deprecated Use {@link #IdentifierBagType(org.hibernate.type.TypeFactory.TypeScope, String, String)}
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public IdentifierBagType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public IdentifierBagType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}
@ -51,9 +42,3 @@ public class IdentifierBagType extends CollectionType {
}
}

9
hibernate-core/src/main/java/org/hibernate/type/ListType.java
View File

@ -17,15 +17,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class ListType extends CollectionType {
/**
* @deprecated Use {@link #ListType(org.hibernate.type.TypeFactory.TypeScope, String, String)}
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public ListType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public ListType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

24
hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
View File

@ -70,22 +70,6 @@ public class ManyToOneType extends EntityType {
this( scope, referencedEntityName, uniqueKeyPropertyName == null, uniqueKeyPropertyName, lazy, unwrapProxy, ignoreNotFound, isLogicalOneToOne );
}
/**
* @deprecated Use {@link #ManyToOneType(TypeFactory.TypeScope, String, boolean, String, boolean, boolean, boolean, boolean ) } instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public ManyToOneType(
TypeFactory.TypeScope scope,
String referencedEntityName,
String uniqueKeyPropertyName,
boolean lazy,
boolean unwrapProxy,
boolean ignoreNotFound,
boolean isLogicalOneToOne) {
this( scope, referencedEntityName, uniqueKeyPropertyName == null, uniqueKeyPropertyName, lazy, unwrapProxy, ignoreNotFound, isLogicalOneToOne );
}
public ManyToOneType(
TypeFactory.TypeScope scope,
String referencedEntityName,
@ -230,10 +214,6 @@ public class ManyToOneType extends EntityType {
SessionImplementor session,
Object owner) throws HibernateException {
if ( isNotEmbedded( session ) ) {
return getIdentifierType( session ).disassemble( value, session, owner );
}
if ( value == null ) {
return null;
}
@ -265,10 +245,6 @@ public class ManyToOneType extends EntityType {
Serializable id = assembleId( oid, session );
if ( isNotEmbedded( session ) ) {
return id;
}
if ( id == null ) {
return null;
}

9
hibernate-core/src/main/java/org/hibernate/type/MapType.java
View File

@ -20,15 +20,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class MapType extends CollectionType {
/**
* @deprecated Use {@link #MapType(TypeFactory.TypeScope, String, String) } instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public MapType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public MapType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

8
hibernate-core/src/main/java/org/hibernate/type/MetaType.java
View File

@ -142,14 +142,6 @@ public class MetaType extends AbstractType {
return false;
}
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
return fromXMLString( xml.getText(), factory );
}
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) throws HibernateException {
node.setText( toXMLString(value, factory) );
}
public boolean[] toColumnNullness(Object value, Mapping mapping) {
throw new UnsupportedOperationException();
}

19
hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
View File

@ -30,25 +30,6 @@ public class OneToOneType extends EntityType {
private final String propertyName;
private final String entityName;
/**
* @deprecated Use {@link #OneToOneType(TypeFactory.TypeScope, String, ForeignKeyDirection, boolean, String, boolean, boolean, String, String)}
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public OneToOneType(
TypeFactory.TypeScope scope,
String referencedEntityName,
ForeignKeyDirection foreignKeyType,
String uniqueKeyPropertyName,
boolean lazy,
boolean unwrapProxy,
boolean isEmbeddedInXML,
String entityName,
String propertyName) {
this( scope, referencedEntityName, foreignKeyType, uniqueKeyPropertyName == null, uniqueKeyPropertyName, lazy, unwrapProxy, entityName, propertyName );
}
/**
* @deprecated Use {@link #OneToOneType(TypeFactory.TypeScope, String, ForeignKeyDirection, boolean, String, boolean, boolean, String, String)}
* instead.

17
hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
View File

@ -12,23 +12,6 @@ import java.util.LinkedHashMap;
*/
public class OrderedMapType extends MapType {
/**
* Constructs a map type capable of creating ordered maps of the given
* role.
*
* @param role The collection role name.
* @param propertyRef The property ref name.
* @param isEmbeddedInXML Is this collection to embed itself in xml
*
* @deprecated Use {@link #OrderedMapType(TypeFactory.TypeScope, String, String)} instead.
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public OrderedMapType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public OrderedMapType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

18
hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
View File

@ -12,24 +12,6 @@ import java.util.LinkedHashSet;
*/
public class OrderedSetType extends SetType {
/**
* Constructs a set type capable of creating ordered sets of the given
* role.
*
* @param typeScope The scope for this type instance.
* @param role The collection role name.
* @param propertyRef The property ref name.
* @param isEmbeddedInXML Is this collection to embed itself in xml
*
* @deprecated Use {@link #OrderedSetType(org.hibernate.type.TypeFactory.TypeScope, String, String)}
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public OrderedSetType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public OrderedSetType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

9
hibernate-core/src/main/java/org/hibernate/type/SetType.java
View File

@ -16,15 +16,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class SetType extends CollectionType {
/**
* @deprecated Use {@link #SetType(org.hibernate.type.TypeFactory.TypeScope, String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public SetType(TypeFactory.TypeScope typeScope, String role, String propertyRef, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
}
public SetType(TypeFactory.TypeScope typeScope, String role, String propertyRef) {
super( typeScope, role, propertyRef );
}

11
hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
View File

@ -20,17 +20,6 @@ public class SortedMapType extends MapType {
private final Comparator comparator;
/**
* @deprecated Use {@link #SortedMapType(org.hibernate.type.TypeFactory.TypeScope, String, String, java.util.Comparator)}
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public SortedMapType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Comparator comparator, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
this.comparator = comparator;
}
public SortedMapType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Comparator comparator) {
super( typeScope, role, propertyRef );
this.comparator = comparator;

11
hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
View File

@ -18,17 +18,6 @@ import org.hibernate.persister.collection.CollectionPersister;
public class SortedSetType extends SetType {
private final Comparator comparator;
/**
* @deprecated Use {@link #SortedSetType(org.hibernate.type.TypeFactory.TypeScope, String, String, java.util.Comparator)}
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public SortedSetType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Comparator comparator, boolean isEmbeddedInXML) {
super( typeScope, role, propertyRef, isEmbeddedInXML );
this.comparator = comparator;
}
public SortedSetType(TypeFactory.TypeScope typeScope, String role, String propertyRef, Comparator comparator) {
super( typeScope, role, propertyRef );
this.comparator = comparator;

8
hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java
View File

@ -98,10 +98,6 @@ public class SpecialOneToOneType extends OneToOneType {
public Serializable disassemble(Object value, SessionImplementor session, Object owner)
throws HibernateException {
if ( isNotEmbedded(session) ) {
return getIdentifierType(session).disassemble(value, session, owner);
}
if (value==null) {
return null;
}
@ -125,10 +121,6 @@ public class SpecialOneToOneType extends OneToOneType {
// change to unique key property of the associated object)
Serializable id = (Serializable) getIdentifierType(session).assemble(oid, session, null); //the owner of the association is not the owner of the id
if ( isNotEmbedded(session) ) {
return id;
}
if (id==null) {
return null;
}

40
hibernate-core/src/main/java/org/hibernate/type/Type.java
View File

@ -150,14 +150,6 @@ public interface Type extends Serializable {
*/
public Class getReturnedClass();
/**
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@SuppressWarnings( {"UnusedDeclaration"})
@Deprecated
public boolean isXMLElement();
/**
* Compare two instances of the class mapped by this type for persistence "equality" (equality of persistent
* state) taking a shortcut for entity references.
@ -372,38 +364,6 @@ public interface Type extends Serializable {
public String toLoggableString(Object value, SessionFactoryImplementor factory)
throws HibernateException;
/**
* A representation of the value to be embedded in an XML element.
*
* @param node The XML node to which to write the value
* @param value The value to write
* @param factory The session factory
*
* @throws HibernateException An error from Hibernate
*
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory)
throws HibernateException;
/**
* Parse the XML representation of an instance.
*
* @param xml The XML node from which to read the value
* @param factory The session factory
*
* @return an instance of the {@link #getReturnedClass() mapped class}
*
* @throws HibernateException An error from Hibernate
*
* @deprecated To be removed in 5. Removed as part of removing the notion of DOM entity-mode.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException;
/**
* Returns the abbreviated name of the type.
*

140
hibernate-core/src/main/java/org/hibernate/type/TypeFactory.java
View File

@ -148,32 +148,6 @@ public final class TypeFactory implements Serializable {
}
}
/**
* @deprecated Use {@link #customCollection(String, java.util.Properties, String, String)}
* instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType customCollection(
String typeName,
Properties typeParameters,
String role,
String propertyRef,
boolean embedded) {
Class typeClass;
try {
typeClass = ReflectHelper.classForName( typeName );
}
catch (ClassNotFoundException cnfe) {
throw new MappingException( "user collection type class not found: " + typeName, cnfe );
}
CustomCollectionType result = new CustomCollectionType( typeScope, typeClass, role, propertyRef, embedded );
if ( typeParameters != null ) {
injectParameters( result.getUserType(), typeParameters );
}
return result;
}
public CollectionType customCollection(
String typeName,
Properties typeParameters,
@ -268,30 +242,6 @@ public final class TypeFactory implements Serializable {
return new ManyToOneType( typeScope, persistentClass, lazy );
}
/**
* @deprecated Use {@link #manyToOne(String, boolean, String, boolean, boolean, boolean, boolean)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public EntityType manyToOne(
String persistentClass,
String uniqueKeyPropertyName,
boolean lazy,
boolean unwrapProxy,
boolean isEmbeddedInXML,
boolean ignoreNotFound,
boolean isLogicalOneToOne) {
return manyToOne(
persistentClass,
uniqueKeyPropertyName == null,
uniqueKeyPropertyName,
lazy,
unwrapProxy,
ignoreNotFound,
isLogicalOneToOne
);
}
/**
* @deprecated Use {@link #manyToOne(String, boolean, String, boolean, boolean, boolean, boolean)} instead.
*/
@ -336,132 +286,42 @@ public final class TypeFactory implements Serializable {
// collection type builders ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/**
* @deprecated Use {@link #array(String, String, Class)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType array(String role, String propertyRef, boolean embedded, Class elementClass) {
return new ArrayType( typeScope, role, propertyRef, elementClass, embedded );
}
public CollectionType array(String role, String propertyRef, Class elementClass) {
return new ArrayType( typeScope, role, propertyRef, elementClass );
}
/**
* @deprecated Use {@link #list(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType list(String role, String propertyRef, boolean embedded) {
return new ListType( typeScope, role, propertyRef, embedded );
}
public CollectionType list(String role, String propertyRef) {
return new ListType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #bag(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType bag(String role, String propertyRef, boolean embedded) {
return new BagType( typeScope, role, propertyRef, embedded );
}
public CollectionType bag(String role, String propertyRef) {
return new BagType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #idbag(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType idbag(String role, String propertyRef, boolean embedded) {
return new IdentifierBagType( typeScope, role, propertyRef, embedded );
}
public CollectionType idbag(String role, String propertyRef) {
return new IdentifierBagType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #map(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType map(String role, String propertyRef, boolean embedded) {
return new MapType( typeScope, role, propertyRef, embedded );
}
public CollectionType map(String role, String propertyRef) {
return new MapType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #orderedMap(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType orderedMap(String role, String propertyRef, boolean embedded) {
return new OrderedMapType( typeScope, role, propertyRef, embedded );
}
public CollectionType orderedMap(String role, String propertyRef) {
return new OrderedMapType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #sortedMap(String, String, java.util.Comparator)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType sortedMap(String role, String propertyRef, boolean embedded, Comparator comparator) {
return new SortedMapType( typeScope, role, propertyRef, comparator, embedded );
}
public CollectionType sortedMap(String role, String propertyRef, Comparator comparator) {
return new SortedMapType( typeScope, role, propertyRef, comparator );
}
/**
* @deprecated Use {@link #set(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType set(String role, String propertyRef, boolean embedded) {
return new SetType( typeScope, role, propertyRef, embedded );
}
public CollectionType set(String role, String propertyRef) {
return new SetType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #orderedSet(String, String)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType orderedSet(String role, String propertyRef, boolean embedded) {
return new OrderedSetType( typeScope, role, propertyRef, embedded );
}
public CollectionType orderedSet(String role, String propertyRef) {
return new OrderedSetType( typeScope, role, propertyRef );
}
/**
* @deprecated Use {@link #sortedSet(String, String, java.util.Comparator)} instead.
* See Jira issue: <a href="https://hibernate.onjira.com/browse/HHH-7771">HHH-7771</a>
*/
@Deprecated
public CollectionType sortedSet(String role, String propertyRef, boolean embedded, Comparator comparator) {
return new SortedSetType( typeScope, role, propertyRef, comparator, embedded );
}
public CollectionType sortedSet(String role, String propertyRef, Comparator comparator) {
return new SortedSetType( typeScope, role, propertyRef, comparator );
}