HHH-19183 Remove commit 9728694 by Peter Holvenstot

Author: marko-bekhta

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

@@ -4,17 +4,10 @@
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.boot.MappingException;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmColumnType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmFilterType;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmManyToOneType;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmRootEntityType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmSynchronizeType;
 import org.hibernate.boot.jaxb.hbm.spi.PluralAttributeInfo;
 import org.hibernate.boot.model.source.spi.Caching;
@@ -72,75 +65,11 @@ protected AbstractPluralAttributeSourceImpl(
 		this.attributeRole = container.getAttributeRoleBase().append( pluralAttributeJaxbMapping.getName() );
 		this.attributePath = container.getAttributePathBase().append( pluralAttributeJaxbMapping.getName() );
 
-		Optional<JaxbHbmManyToOneType> jaxbHbmManyToOneTypeOptional = Optional.empty();
-
-		// Our goal here is to find the inverse side of a one to many to figure out against what to join
-		if ( pluralAttributeJaxbMapping.isInverse() && pluralAttributeJaxbMapping.getOneToMany() != null && pluralAttributeJaxbMapping.getKey().getPropertyRef() == null ) {
-			String childClass = pluralAttributeJaxbMapping.getOneToMany().getClazz();
-
-			if ( childClass != null ) {
-				// We match by columns as defined in the key
-				final List<String> keyColumnNames;
-				if ( pluralAttributeJaxbMapping.getKey().getColumnAttribute() == null ) {
-					keyColumnNames = new ArrayList<>( pluralAttributeJaxbMapping.getKey().getColumn().size() );
-					for ( JaxbHbmColumnType jaxbHbmColumnType : pluralAttributeJaxbMapping.getKey().getColumn() ) {
-						keyColumnNames.add( jaxbHbmColumnType.getName() );
-					}
-				}
-				else {
-					keyColumnNames = new ArrayList<>( 1 );
-					keyColumnNames.add( pluralAttributeJaxbMapping.getKey().getColumnAttribute() );
-				}
-				jaxbHbmManyToOneTypeOptional = mappingDocument.getDocumentRoot().getClazz()
-						.stream()
-						.filter( (JaxbHbmRootEntityType entityType) -> childClass.equals( entityType.getName() ) )
-						.flatMap( jaxbHbmRootEntityType -> jaxbHbmRootEntityType.getAttributes().stream() )
-						.filter( attribute -> {
-							if ( attribute instanceof JaxbHbmManyToOneType manyToOneType ) {
-								String manyToOneTypeClass = manyToOneType.getClazz();
-								String containerClass = container.getAttributeRoleBase().getFullPath();
-								// Consider many to ones that have no class defined or equal the owner class of the one to many
-								if ( manyToOneTypeClass == null || manyToOneTypeClass.equals( containerClass ) ) {
-									if ( manyToOneType.getColumnAttribute() == null ) {
-										List<Serializable> columns = manyToOneType.getColumnOrFormula();
-										if ( columns.size() != keyColumnNames.size() ) {
-											return false;
-										}
-										for ( int i = 0; i < columns.size(); i++ ) {
-											Serializable column = columns.get( i );
-											String keyColumn = keyColumnNames.get( i );
-											if ( !( column instanceof JaxbHbmColumnType ) || !( (JaxbHbmColumnType) column )
-													.getName()
-													.equals( keyColumn ) ) {
-												return false;
-											}
-										}
-									}
-									else {
-										return keyColumnNames.size() == 1 && keyColumnNames.get( 0 )
-												.equals( manyToOneType.getColumnAttribute() );
-									}
-									return true;
-								}
-							}
-							return false;
-						})
-						.map( JaxbHbmManyToOneType.class::cast )
-						.findFirst();
-			}
-		}
-
-		this.keySource = jaxbHbmManyToOneTypeOptional
-				.map( jaxbHbmManyToOneType -> new PluralAttributeKeySourceImpl(
-						sourceMappingDocument(),
-						pluralAttributeJaxbMapping.getKey(),
-						jaxbHbmManyToOneType,
-						container
-				) ).orElseGet( () -> new PluralAttributeKeySourceImpl(
-						sourceMappingDocument(),
-						pluralAttributeJaxbMapping.getKey(),
-						container
-				) );
+		this.keySource = new PluralAttributeKeySourceImpl(
+				sourceMappingDocument(),
+				pluralAttributeJaxbMapping.getKey(),
+				container
+		);
 
 		this.typeInformation = new HibernateTypeSourceImpl( pluralAttributeJaxbMapping.getCollectionType() );
 

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

@@ -7,7 +7,6 @@
 import java.util.List;
 
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmKeyType;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmManyToOneType;
 import org.hibernate.boot.model.source.spi.AttributeSourceContainer;
 import org.hibernate.boot.model.source.spi.PluralAttributeKeySource;
 import org.hibernate.boot.model.source.spi.RelationalValueSource;
@@ -70,62 +69,6 @@ public List getColumnOrFormulaElements() {
 		);
 	}
 
-	public PluralAttributeKeySourceImpl(
-			MappingDocument mappingDocument,
-			final JaxbHbmKeyType jaxbKey,
-			final JaxbHbmManyToOneType jaxbManyToOne,
-			final AttributeSourceContainer container) {
-		super( mappingDocument );
-
-		this.explicitFkName = StringHelper.nullIfEmpty( jaxbManyToOne.getForeignKey() );
-		this.referencedPropertyName = StringHelper.nullIfEmpty( jaxbManyToOne.getPropertyRef() );
-		if ( jaxbKey.getOnDelete() == null ) {
-			this.cascadeDeletesAtFkLevel = jaxbManyToOne.getOnDelete() != null && "cascade".equals( jaxbManyToOne.getOnDelete().value() );
-		}
-		else {
-			this.cascadeDeletesAtFkLevel = "cascade".equals( jaxbKey.getOnDelete().value() );
-		}
-		if ( jaxbKey.isNotNull() == null ) {
-			this.nullable = jaxbManyToOne.isNotNull() == null || !jaxbManyToOne.isNotNull();
-		}
-		else {
-			this.nullable = !jaxbKey.isNotNull();
-		}
-		if ( jaxbKey.isUpdate() == null ) {
-			this.updateable = jaxbManyToOne.isUpdate();
-		}
-		else {
-			this.updateable = jaxbKey.isUpdate();
-		}
-
-		this.valueSources = RelationalValueSourceHelper.buildValueSources(
-				sourceMappingDocument(),
-				null, // todo : collection table name
-				new RelationalValueSourceHelper.AbstractColumnsAndFormulasSource() {
-					@Override
-					public XmlElementMetadata getSourceType() {
-						return XmlElementMetadata.KEY;
-					}
-
-					@Override
-					public String getSourceName() {
-						return null;
-					}
-
-					@Override
-					public String getColumnAttribute() {
-						return StringHelper.nullIfEmpty( jaxbKey.getColumnAttribute() );
-					}
-
-					@Override
-					public List getColumnOrFormulaElements() {
-						return jaxbKey.getColumn();
-					}
-
-				}
-		);
-	}
-
 	@Override
 	public String getExplicitForeignKeyName() {
 		return explicitFkName;