HHH-7772 Remove obsolete Type, AssociationType, and TypeFactory methods

Author: Nikolay Shestakov

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

@@ -1402,15 +1402,6 @@ public static void bindCollection(Element node, Collection collection, String cl
 		String nodeName = node.attributeValue( "node" );
 		if ( nodeName == null ) nodeName = node.attributeValue( "name" );
 		collection.setNodeName( nodeName );
-		String embed = node.attributeValue( "embed-xml" );
-		// sometimes embed is set to the default value when not specified in the mapping,
-		// so can't seem to determine if an attribute was explicitly set;
-		// log a warning if embed has a value different from the default.
-		if ( !StringHelper.isEmpty( embed ) &&  !"true".equals( embed ) ) {
-			LOG.embedXmlAttributesNoLongerSupported();
-		}
-		collection.setEmbedded( embed==null || "true".equals(embed) );
-
 
 		// PERSISTER
 		Attribute persisterNode = node.attribute( "persister" );
@@ -1631,15 +1622,6 @@ public static void bindManyToOne(Element node, ManyToOne manyToOne, String path,
 
 		manyToOne.setReferencedEntityName( getEntityName( node, mappings ) );
 
-		String embed = node.attributeValue( "embed-xml" );
-		// sometimes embed is set to the default value when not specified in the mapping,
-		// so can't seem to determine if an attribute was explicitly set;
-		// log a warning if embed has a value different from the default.
-		if ( !StringHelper.isEmpty( embed ) &&  !"true".equals( embed ) ) {
-			LOG.embedXmlAttributesNoLongerSupported();
-		}
-		manyToOne.setEmbedded( embed == null || "true".equals( embed ) );
-
 		String notFound = node.attributeValue( "not-found" );
 		manyToOne.setIgnoreNotFound( "ignore".equals( notFound ) );
 
@@ -1714,15 +1696,6 @@ public static void bindOneToOne(Element node, OneToOne oneToOne, String path, bo
 		initOuterJoinFetchSetting( node, oneToOne );
 		initLaziness( node, oneToOne, mappings, true );
 
-		String embed = node.attributeValue( "embed-xml" );
-		// sometimes embed is set to the default value when not specified in the mapping,
-		// so can't seem to determine if an attribute was explicitly set;
-		// log a warning if embed has a value different from the default.
-		if ( !StringHelper.isEmpty( embed ) &&  !"true".equals( embed ) ) {
-			LOG.embedXmlAttributesNoLongerSupported();
-		}
-		oneToOne.setEmbedded( "true".equals( embed ) );
-
 		Attribute fkNode = node.attribute( "foreign-key" );
 		if ( fkNode != null ) oneToOne.setForeignKeyName( fkNode.getValue() );
 
@@ -1748,15 +1721,6 @@ public static void bindOneToMany(Element node, OneToMany oneToMany, Mappings map
 
 		oneToMany.setReferencedEntityName( getEntityName( node, mappings ) );
 
-		String embed = node.attributeValue( "embed-xml" );
-		// sometimes embed is set to the default value when not specified in the mapping,
-		// so can't seem to determine if an attribute was explicitly set;
-		// log a warning if embed has a value different from the default.
-		if ( !StringHelper.isEmpty( embed ) &&  !"true".equals( embed ) ) {
-			LOG.embedXmlAttributesNoLongerSupported();
-		}
-		oneToMany.setEmbedded( embed == null || "true".equals( embed ) );
-
 		String notFound = node.attributeValue( "not-found" );
 		oneToMany.setIgnoreNotFound( "ignore".equals( notFound ) );
 

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

@@ -183,7 +183,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/internal/CoreMessageLogger.java

@@ -1601,13 +1601,13 @@ void cannotResolveNonNullableTransientDependencies(String transientEntityString,
 	)
 	void aliasSpecificLockingWithFollowOnLocking(LockMode lockMode);
 
-	@LogMessage(level = WARN)
-	@Message(
-			value = "embed-xml attributes were intended to be used for DOM4J entity mode. Since that entity mode has been " +
-					"removed, embed-xml attributes are no longer supported and should be removed from mappings.",
-			id = 446
-	)
-	void embedXmlAttributesNoLongerSupported();
+//	@LogMessage(level = WARN)
+//	@Message(
+//			value = "embed-xml attributes were intended to be used for DOM4J entity mode. Since that entity mode has been " +
+//					"removed, embed-xml attributes are no longer supported and should be removed from mappings.",
+//			id = 446
+//	)
+//	void embedXmlAttributesNoLongerSupported();
 
 	@LogMessage(level = WARN)
 	@Message(

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

@@ -77,7 +77,6 @@ public abstract class Collection implements Fetchable, Value, Filterable {
 	private boolean orphanDelete;
 	private int batchSize = -1;
 	private FetchMode fetchMode;
-	private boolean embedded = true;
 	private boolean optimisticLocked = true;
 	private Class collectionPersisterClass;
 	private String typeName;
@@ -612,24 +611,6 @@ 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;
 	}

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

@@ -42,7 +42,6 @@ public class OneToMany implements Value {
 
 	private String referencedEntityName;
 	private PersistentClass associatedClass;
-	private boolean embedded;
 	private boolean ignoreNotFound;
 
 	private EntityType getEntityType() {
@@ -150,24 +149,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

@@ -38,7 +38,6 @@ public abstract class ToOne extends SimpleValue implements Fetchable {
 	private FetchMode fetchMode;
 	protected String referencedPropertyName;
 	private String referencedEntityName;
-	private boolean embedded;
 	private boolean lazy = true;
 	protected boolean unwrapProxy;
 
@@ -89,24 +88,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/type/AbstractStandardBasicType.java

@@ -177,10 +177,6 @@ public final boolean isAnyType() {
 		return false;
 	}
 
-	public final boolean isXMLElement() {
-		return false;
-	}
-
 	@SuppressWarnings({ "unchecked" })
 	public final boolean isSame(Object x, Object y) {
 		return isEqual( x, y );

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

@@ -62,10 +62,6 @@ public boolean isEntityType() {
 		return false;
 	}
 
-	public boolean isXMLElement() {
-		return false;
-	}
-
 	public int compare(Object x, Object y) {
 		return ( (Comparable) x ).compareTo(y);
 	}
@@ -145,16 +141,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

@@ -374,10 +374,6 @@ public String getLHSPropertyName() {
 	public boolean isAlwaysDirtyChecked() {
 		return false;
 	}
-
-	public boolean isEmbeddedInXML() {
-		return false;
-	}
 
 	public boolean[] toColumnNullness(Object value, Mapping mapping) {
 		boolean[] result = new boolean[ getColumnSpan(mapping) ];

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

@@ -47,17 +47,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 Class getElementClass() {
 		return elementClass;
 	}