HHH-10073 Removing methods scheduled for removal in 5.0

Author: gunnarmorling

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

@@ -2115,7 +2115,6 @@ public void bindOneToOne(
 		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 @@ private void bindManyToOneAttribute(
 		if ( manyToOneSource.isEmbedXml() == Boolean.TRUE ) {
 			DeprecationLogger.DEPRECATION_LOGGER.logDeprecationOfEmbedXmlSupport();
 		}
-		manyToOneBinding.setEmbedded( manyToOneSource.isEmbedXml() != Boolean.FALSE );
 
 		manyToOneBinding.setIgnoreNotFound( manyToOneSource.isIgnoreNotFound() );
 

hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java

@@ -176,7 +176,6 @@ else if ( otherSideProperty.getValue() instanceof ManyToOne ) {
 					//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() );

hibernate-core/src/main/java/org/hibernate/mapping/Collection.java

@@ -661,29 +661,10 @@ public void setElementNodeName(String elementNodeName) {
 		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;
 	}

hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java

@@ -142,24 +142,6 @@ public boolean[] getColumnUpdateability() {
 		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;
 	}

hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java

@@ -76,24 +76,6 @@ public Object accept(ValueVisitor visitor) {
 		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");

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

@@ -137,13 +137,4 @@ public Size[] defaultSizes(Mapping mapping) throws MappingException {
 	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;
-	}
-
 }

hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java

@@ -273,15 +273,6 @@ public final String toLoggableString(Object value, SessionFactoryImplementor fac
 		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();
 	}

hibernate-core/src/main/java/org/hibernate/type/AbstractType.java

@@ -45,10 +45,6 @@ public boolean isEntityType() {
 		return false;
 	}
 
-	public boolean isXMLElement() {
-		return false;
-	}
-
 	public int compare(Object x, Object y) {
 		return ( (Comparable) x ).compareTo(y);
 	}
@@ -128,16 +124,6 @@ public int getHashCode(Object x, SessionFactoryImplementor factory) {
 		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;
 	}

hibernate-core/src/main/java/org/hibernate/type/AnyType.java

@@ -361,18 +361,6 @@ public Object semiResolve(Object value, SessionImplementor session, Object owner
 		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 boolean isAlwaysDirtyChecked() {
 		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");

hibernate-core/src/main/java/org/hibernate/type/ArrayType.java

@@ -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;

hibernate-core/src/main/java/org/hibernate/type/AssociationType.java

@@ -75,17 +75,4 @@ public String getOnCondition(String alias, SessionFactoryImplementor factory, Ma
 	 * 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();
 }
-
-
-
-
-
-

hibernate-core/src/main/java/org/hibernate/type/BagType.java

@@ -18,15 +18,6 @@
 
 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 );
 	}

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -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 String getLHSPropertyName() {
 		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 

hibernate-core/src/main/java/org/hibernate/type/ComponentType.java

@@ -702,21 +702,6 @@ public boolean[] getPropertyNullability() {
 		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 )];

hibernate-core/src/main/java/org/hibernate/type/CompositeCustomType.java

@@ -254,15 +254,6 @@ public boolean[] getPropertyNullability() {
 		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 ) {

hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java

@@ -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,

hibernate-core/src/main/java/org/hibernate/type/CustomType.java

@@ -190,15 +190,6 @@ public Object seed(SessionImplementor session) {
 		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 ) {