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

HHH-17055 Remove deprecated method Value#getColumnIterator()

This commit is contained in:
Sanne Grinovero 2023-08-07 18:13:53 +02:00 committed by Sanne Grinovero
parent 3b5d0d6bfb
commit b602c9bddf
61 changed files with 135 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
View File

@ -221,7 +221,7 @@ public class TemporaryTable implements Exportable, Contributable {
.getEntityBinding( pluralAttribute.findContainingEntityMapping().getEntityName() );
final Property property = findPropertyByName( declaringClass, attributeName );
assert property != null;
final Iterator<Selectable> columnIterator = ( (Collection) property.getValue() ).getKey().getColumnIterator();
final Iterator<Selectable> columnIterator = ( (Collection) property.getValue() ).getKey().getSelectables().iterator();
fkTarget.forEachSelectable(
(columnIndex, selection) -> {
final Selectable selectable = columnIterator.next();

34
hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
View File

@ -6,9 +6,7 @@
*/
package org.hibernate.id;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import org.hibernate.FetchMode;
import org.hibernate.MappingException;
@ -76,11 +74,6 @@ public class ExportableColumn extends Column {
return 1;
}
@Override @Deprecated
public Iterator<Selectable> getColumnIterator() {
return new ColumnIterator( column );
}
@Override
public List<Selectable> getSelectables() {
return List.of( column );
@ -194,31 +187,4 @@ public class ExportableColumn extends Column {
}
}
public static class ColumnIterator implements Iterator<Selectable> {
private final ExportableColumn column;
private int count = 0;
public ColumnIterator(ExportableColumn column) {
this.column = column;
}
@Override
public boolean hasNext() {
return count == 0;
}
@Override
public ExportableColumn next() {
if ( count > 0 ) {
throw new NoSuchElementException( "The single element has already been read" );
}
count++;
return column;
}
@Override
public void remove() {
throw new UnsupportedOperationException( "Cannot remove" );
}
}
}

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

@ -407,11 +407,6 @@ public abstract class Collection implements Fetchable, Value, Filterable {
}
}
@Deprecated
public Iterator<Selectable> getColumnIterator() {
return Collections.emptyIterator();
}
@Override
public List<Selectable> getSelectables() {
return Collections.emptyList();

21
hibernate-core/src/main/java/org/hibernate/mapping/Component.java
View File

@ -170,22 +170,6 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
throw new UnsupportedOperationException("Cant add a column to a component");
}
@Override
public int getColumnSpan() {
return getSelectables().size();
}
@Override @Deprecated @SuppressWarnings("deprecation")
public Iterator<Selectable> getColumnIterator() {
@SuppressWarnings("unchecked")
Iterator<Selectable>[] iters = new Iterator[ getPropertySpan() ];
int i = 0;
for ( Property property : getProperties() ) {
iters[i++] = property.getColumnIterator();
}
return new JoinedIterator<>( iters );
}
@Override
public List<Selectable> getSelectables() {
if ( cachedSelectables == null ) {
@ -222,6 +206,11 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
notifyPropertiesAboutAggregateColumn( aggregateColumn, this );
}
@Override
public int getColumnSpan() {
return getSelectables().size();
}
public List<Column> getAggregatedColumns() {
final List<Column> aggregatedColumns = new ArrayList<>( getPropertySpan() );
collectAggregatedColumns( aggregatedColumns, this );

5
hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java
View File

@ -140,11 +140,6 @@ public abstract class Constraint implements Exportable, Serializable {
return columns.get( i );
}
@Deprecated(since = "6.0")
public Iterator<Column> getColumnIterator() {
return getColumns().iterator();
}
public Table getTable() {
return table;
}

8
hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java
View File

@ -88,14 +88,6 @@ public class DenormalizedTable extends Table {
return superColumn != null ? superColumn : includedTable.getColumn(name);
}
@Override @Deprecated
public Iterator<Column> getColumnIterator() {
if ( reorderedColumns != null ) {
return reorderedColumns.iterator();
}
return new JoinedIterator<>( includedTable.getColumnIterator(), super.getColumnIterator() );
}
@Override
public Collection<Column> getColumns() {
if ( reorderedColumns != null ) {

5
hibernate-core/src/main/java/org/hibernate/mapping/Index.java
View File

@ -105,11 +105,6 @@ public class Index implements Exportable, Serializable {
return columns.size();
}
@Deprecated
public Iterator<Column> getColumnIterator() {
return getColumns().iterator();
}
public java.util.List<Column> getColumns() {
return unmodifiableList( columns );
}

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

@ -94,11 +94,6 @@ public class OneToMany implements Value {
public void createUniqueKey() {
}
@Deprecated
public Iterator<Selectable> getColumnIterator() {
return associatedClass.getKey().getColumnIterator();
}
@Override
public List<Selectable> getSelectables() {
return associatedClass.getKey().getSelectables();

2
hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
View File

@ -119,7 +119,7 @@ public class OneToOne extends ToOne {
@Override
public Iterator<Selectable> getConstraintColumnIterator() {
return identifier.getColumnIterator();
return identifier.getSelectables().iterator();
}
/**

8
hibernate-core/src/main/java/org/hibernate/mapping/Property.java
View File

@ -87,14 +87,6 @@ public class Property implements Serializable, MetaAttributable {
return value.getColumnSpan();
}
/**
* @deprecated moving away from the use of {@link Iterator} as a return type
*/
@Deprecated(since = "6.0")
public Iterator<Selectable> getColumnIterator() {
return value.getColumnIterator();
}
/**
* Delegates to {@link Value#getSelectables()}.
*/

7
hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
View File

@ -266,11 +266,6 @@ public abstract class SimpleValue implements KeyValue {
return columns.get( position );
}
@Override @Deprecated
public Iterator<Selectable> getColumnIterator() {
return columns.iterator();
}
@Override
public List<Selectable> getSelectables() {
return columns;
@ -288,7 +283,7 @@ public abstract class SimpleValue implements KeyValue {
}
public Iterator<Selectable> getConstraintColumnIterator() {
return getColumnIterator();
return getSelectables().iterator();
}
public String getTypeName() {

2
hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java
View File

@ -43,7 +43,7 @@ public class SingleTableSubclass extends Subclass {
@Deprecated @SuppressWarnings("deprecation")
protected Iterator<Selectable> getDiscriminatorColumnIterator() {
return isDiscriminatorInsertable() && !getDiscriminator().hasFormula()
? getDiscriminator().getColumnIterator()
? getDiscriminator().getSelectables().iterator()
: super.getDiscriminatorColumnIterator();
}

5
hibernate-core/src/main/java/org/hibernate/mapping/Table.java
View File

@ -302,11 +302,6 @@ public class Table implements Serializable, ContributableDatabaseObject {
return columns.size();
}
@Deprecated(since = "6.0")
public Iterator<Column> getColumnIterator() {
return getColumns().iterator();
}
public Collection<Column> getColumns() {
return columns.values();
}

6
hibernate-core/src/main/java/org/hibernate/mapping/Value.java
View File

@ -42,12 +42,6 @@ public interface Value extends Serializable {
*/
int getColumnSpan();
/**
* @deprecated moving away from the use of {@link Iterator} as a return type
*/
@Deprecated(since = "6.0")
Iterator<Selectable> getColumnIterator();
/**
* The mapping to columns and formulas.
*/

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
View File

@ -68,7 +68,7 @@ public class DiscriminatedAssociationMapping implements MappingType, FetchOption
);
assert bootValueMapping.getColumnSpan() == 2;
final Iterator<Selectable> columnIterator = bootValueMapping.getColumnIterator();
final Iterator<Selectable> columnIterator = bootValueMapping.getSelectables().iterator();
assert columnIterator.hasNext();
final Selectable metaSelectable = columnIterator.next();

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
View File

@ -916,7 +916,7 @@ public class MappingModelCreationHelper {
if ( fkTarget instanceof BasicValuedModelPart ) {
final BasicValuedModelPart simpleFkTarget = (BasicValuedModelPart) fkTarget;
final Iterator<Selectable> columnIterator = bootValueMapping.getColumnIterator();
final Iterator<Selectable> columnIterator = bootValueMapping.getSelectables().iterator();
final Table table = bootValueMapping.getTable();
final String tableExpression = getTableIdentifierExpression( table, creationProcess );
final PropertyAccess declaringKeyPropertyAccess;

31
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
View File

@ -675,24 +675,21 @@ public class ToOneAttributeMapping
}
private static boolean equal(Value lhsValue, Value rhsValue) {
//noinspection deprecation
Iterator<Selectable> lhsColumns = lhsValue.getColumnIterator();
//noinspection deprecation
Iterator<Selectable> rhsColumns = rhsValue.getColumnIterator();
boolean hasNext;
do {
final Selectable lhs = lhsColumns.next();
final Selectable rhs = rhsColumns.next();
if ( !lhs.getText().equals( rhs.getText() ) ) {
return false;
List<Selectable> lhsColumns = lhsValue.getSelectables();
List<Selectable> rhsColumns = rhsValue.getSelectables();
if ( lhsColumns.size() != rhsColumns.size() ) {
return false;
}
else {
for ( int i=0; i<lhsColumns.size(); i++ ) {
Selectable lhs = lhsColumns.get( i );
Selectable rhs = rhsColumns.get( i );
if ( !lhs.getText().equals( rhs.getText() ) ) {
return false;
}
}
hasNext = lhsColumns.hasNext();
if ( hasNext != rhsColumns.hasNext() ) {
return false;
}
} while ( hasNext );
return true;
return true;
}
}
static String findMapsIdPropertyName(EntityMappingType entityMappingType, String referencedPropertyName) {

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java
View File

@ -45,7 +45,7 @@ public class BeanValidationDisabledTest extends BaseNonConfigCoreFunctionalTestC
@Test
public void testDDLDisabled() {
PersistentClass classMapping = metadata().getEntityBinding( Address.class.getName() );
Column countryColumn = (Column) classMapping.getProperty( "country" ).getColumnIterator().next();
Column countryColumn = (Column) classMapping.getProperty( "country" ).getSelectables().get( 0 );
assertTrue( "DDL constraints are applied", countryColumn.isNullable() );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
View File

@ -95,7 +95,7 @@ public class DDLWithoutCallbackTest extends BaseNonConfigCoreFunctionalTestCase
@Test
public void testDDLEnabled() {
PersistentClass classMapping = metadata().getEntityBinding( Address.class.getName() );
Column countryColumn = (Column) classMapping.getProperty( "country" ).getColumnIterator().next();
Column countryColumn = (Column) classMapping.getProperty( "country" ).getSelectables().get( 0 );
assertFalse( "DDL constraints are not applied", countryColumn.isNullable() );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java
View File

@ -406,7 +406,7 @@ public class DefaultNamingCollectionElementTest {
);
// The default owner join column can only be computed if it has a PK with 1 column.
assertEquals( 1, ownerCollection.getOwner().getKey().getColumnSpan() );
assertEquals( ownerForeignKeyNameExpected, ownerCollection.getKey().getColumnIterator().next().getText() );
assertEquals( ownerForeignKeyNameExpected, ownerCollection.getKey().getSelectables().get( 0 ).getText() );
boolean hasOwnerFK = false;
for (Iterator it = ownerCollection.getCollectionTable().getForeignKeys().values().iterator(); it.hasNext(); ) {

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
View File

@ -52,7 +52,7 @@ public class NestedEmbeddableMetadataTest {
Component investmentMetadata = (Component) investmentsValue.getElement();
Value descriptionValue = investmentMetadata.getProperty( "description" ).getValue();
assertEquals( 1, descriptionValue.getColumnSpan() );
Column selectable = (Column) descriptionValue.getColumnIterator().next();
Column selectable = (Column) descriptionValue.getSelectables().get( 0 );
assertEquals( (Long) 500L, selectable.getLength() );
Component amountMetadata = (Component) investmentMetadata.getProperty( "amount" ).getValue();
SimpleValue currencyMetadata = (SimpleValue) amountMetadata.getProperty( "currency" ).getValue();

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/FieldAccessedNestedEmbeddableMetadataTest.java
View File

@ -48,7 +48,7 @@ public class FieldAccessedNestedEmbeddableMetadataTest {
Component investmentMetadata = (Component) investmentsValue.getElement();
Value descriptionValue = investmentMetadata.getProperty( "description" ).getValue();
assertEquals( 1, descriptionValue.getColumnSpan() );
Column selectable = (Column) descriptionValue.getColumnIterator().next();
Column selectable = (Column) descriptionValue.getSelectables().get( 0 );
assertEquals( (Long) 500L, selectable.getLength() );
Component amountMetadata = (Component) investmentMetadata.getProperty( "amount" ).getValue();
SimpleValue currencyMetadata = (SimpleValue) amountMetadata.getProperty( "currency" ).getValue();

4
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java
View File

@ -321,8 +321,8 @@ public class IdTest {
Column idCol = (Column) scope.getMetadataImplementor().getEntityBinding( Ball.class.getName() )
.getIdentifierProperty()
.getValue()
.getColumnIterator()
.next();
.getSelectables()
.get( 0 );
assertEquals( "ball_id", idCol.getName() );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java
View File

@ -314,7 +314,7 @@ public class IdTest {
@Test
public void testColumnDefinition(SessionFactoryScope scope) {
Column idCol = (Column) scope.getMetadataImplementor().getEntityBinding( Ball.class.getName() )
.getIdentifierProperty().getValue().getColumnIterator().next();
.getIdentifierProperty().getValue().getSelectables().get( 0 );
assertEquals( "ball_id", idCol.getName() );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java
View File

@ -75,7 +75,7 @@ public class ListMappingTest {
org.hibernate.mapping.List asList = (org.hibernate.mapping.List) lineItemsBinding;
// assert the OrderColumn details
final Column positionColumn = (Column) asList.getIndex().getColumnIterator().next();
final Column positionColumn = (Column) asList.getIndex().getSelectables().get( 0 );
assertThat( positionColumn.getName(), equalTo( "position" ) );
// make sure the OrderColumn is part of the collection table

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java
View File

@ -197,7 +197,7 @@ public class ManyToManyImplicitNamingTest extends BaseNonConfigCoreFunctionalTes
);
assertEquals(
inverseForeignKeyNameExpected,
inverseCollection.getKey().getColumnIterator().next().getText()
inverseCollection.getKey().getSelectables().get( 0 ).getText()
);
}
boolean hasOwnerFK = false;

4
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java
View File

@ -76,9 +76,9 @@ public class NamingStrategyTest extends BaseUnitTestCase {
PersistentClass entityBinding = metadata.getEntityBinding( A.class.getName() );
assertEquals("NAME",
((Selectable) entityBinding.getProperty( "name" ).getColumnIterator().next()).getText());
((Selectable) entityBinding.getProperty( "name" ).getSelectables().get( 0 ) ).getText());
assertEquals("VALUE",
((Selectable) entityBinding.getProperty( "value" ).getColumnIterator().next()).getText());
((Selectable) entityBinding.getProperty( "value" ).getSelectables().get( 0 ) ).getText());
}
@Test

4
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java
View File

@ -61,7 +61,7 @@ public class EmbeddedOverrideTests {
final Property homeAddressStateProperty = homeAddressMapping.getProperty( "state" );
final ToOne homeAddressStateMapping = (ToOne) homeAddressStateProperty.getValue();
assertThat( homeAddressStateMapping.getColumnSpan(), is( 1 ) );
final org.hibernate.mapping.Column homeAddressStateJoinColumn = (org.hibernate.mapping.Column) homeAddressStateMapping.getColumnIterator().next();
final org.hibernate.mapping.Column homeAddressStateJoinColumn = (org.hibernate.mapping.Column) homeAddressStateMapping.getSelectables().get( 0 );
assertThat( homeAddressStateJoinColumn.getName(), is ( "home_state_id" ) );
final Property workAddressProperty = contactBinding.getProperty( "workAddress" );
@ -69,7 +69,7 @@ public class EmbeddedOverrideTests {
final Property workAddressStateProperty = workAddressMapping.getProperty( "state" );
final ToOne workAddressStateMapping = (ToOne) workAddressStateProperty.getValue();
assertThat( workAddressStateMapping.getColumnSpan(), is( 1 ) );
final org.hibernate.mapping.Column workAddressStateJoinColumn = (org.hibernate.mapping.Column) workAddressStateMapping.getColumnIterator().next();
final org.hibernate.mapping.Column workAddressStateJoinColumn = (org.hibernate.mapping.Column) workAddressStateMapping.getSelectables().get( 0 );
assertThat( workAddressStateJoinColumn.getName(), is ( "work_state_id" ) );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java
View File

@ -78,7 +78,7 @@ public class PluralEmbeddedOverrideTests {
assertThat( mapKey.getColumnSpan(), is( 1 ) );
final org.hibernate.mapping.Column mapKeyColumn = assertTyping(
org.hibernate.mapping.Column.class,
mapKey.getColumnIterator().next()
mapKey.getSelectables().get( 0 )
);
assertThat( mapKeyColumn.getName(), equalTo( "attribute_name" ) );

2
hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
View File

@ -60,7 +60,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest {
PersistentClass user = metadata.getEntityBinding( User.class.getName() );
org.hibernate.mapping.Property personProperty = user.getProperty( "person" );
Component component = ( Component ) personProperty.getValue();
Formula f = ( Formula ) component.getProperty( "yob" ).getValue().getColumnIterator().next();
Formula f = ( Formula ) component.getProperty( "yob" ).getValue().getSelectables().get( 0 );
String pattern = metadata.getDatabase().getJdbcEnvironment().getDialect().extractPattern( TemporalUnit.YEAR );
String formula = pattern.replace( "?1", "YEAR" ).replace( "?2", "dob" );

2
hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
View File

@ -41,7 +41,7 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase {
protected void afterMetadataBuilt(Metadata metadata) {
Collection children = metadata.getCollectionBinding( Parent.class.getName() + ".children" );
Component childComponents = ( Component ) children.getElement();
Formula f = ( Formula ) childComponents.getProperty( "bioLength" ).getValue().getColumnIterator().next();
Formula f = ( Formula ) childComponents.getProperty( "bioLength" ).getValue().getSelectables().get( 0 );
// SQLFunction lengthFunction = metadata.getDatabase().getJdbcEnvironment().getDialect().getFunctions().get( "length" );
// if ( lengthFunction != null ) {

6
hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
View File

@ -50,17 +50,17 @@ public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase {
@TestForIssue( jiraKey = "HHH-7797" )
public void testUniqueConstraints() {
Column column = (Column) metadata().getEntityBinding( DataPoint.class.getName() )
.getProperty( "foo1" ).getColumnIterator().next();
.getProperty( "foo1" ).getSelectables().get( 0 );
assertFalse( column.isNullable() );
assertTrue( column.isUnique() );
column = (Column) metadata().getEntityBinding( DataPoint.class.getName() )
.getProperty( "foo2" ).getColumnIterator().next();
.getProperty( "foo2" ).getSelectables().get( 0 );
assertTrue( column.isNullable() );
assertTrue( column.isUnique() );
column = (Column) metadata().getEntityBinding( DataPoint.class.getName() )
.getProperty( "id" ).getColumnIterator().next();
.getProperty( "id" ).getSelectables().get( 0 );
assertFalse( column.isNullable() );
assertTrue( column.isUnique() );
}

2
hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java
View File

@ -158,7 +158,7 @@ public class NonRootTablePolymorphicTests {
assertThat( toOne.getTable().getName(), is( "sub_parent" ) );
assertThat( toOne.getColumnSpan(), is( 1 ) );
final Selectable selectable = toOne.getColumnIterator().next();
final Selectable selectable = toOne.getSelectables().get( 0 );
assertThat( selectable.getText(), is( "parent_sub_fk" ) );
assertThat( subParent.getTable().getForeignKeys().size(), is( 1 ) );

6
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java
View File

@ -47,7 +47,7 @@ public class NamingStrategyTest extends BaseSessionFactoryFunctionalTest {
@Test
public void testDatabaseColumnNames() {
PersistentClass classMapping = getMetadata().getEntityBinding( Customers.class.getName() );
Column stateColumn = (Column) classMapping.getProperty( "specified_column" ).getColumnIterator().next();
Column stateColumn = (Column) classMapping.getProperty( "specified_column" ).getSelectables().get( 0 );
assertEquals( "CN_specified_column", stateColumn.getName() );
}
@ -55,9 +55,9 @@ public class NamingStrategyTest extends BaseSessionFactoryFunctionalTest {
@TestForIssue(jiraKey = "HHH-5848")
public void testDatabaseTableNames() {
PersistentClass classMapping = getMetadata().getEntityBinding( Item.class.getName() );
Column secTabColumn = (Column) classMapping.getProperty( "specialPrice" ).getColumnIterator().next();
Column secTabColumn = (Column) classMapping.getProperty( "specialPrice" ).getSelectables().get( 0 );
assertEquals( "TAB_ITEMS_SEC", secTabColumn.getValue().getTable().getName() );
Column tabColumn = (Column) classMapping.getProperty( "price" ).getColumnIterator().next();
Column tabColumn = (Column) classMapping.getProperty( "price" ).getSelectables().get( 0 );
assertEquals( "TAB_ITEMS", tabColumn.getValue().getTable().getName() );
}
}

40
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java
View File

@ -68,16 +68,16 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateCustomerPrimaryTableName( customerBinding.getTable().getQuotedName() );
assertEquals( 1, customerBinding.getIdentifier().getColumnSpan() );
validateCustomerPrimaryKeyColumn( (Column) customerBinding.getIdentifier().getColumnIterator().next() );
validateCustomerPrimaryKeyColumn( (Column) customerBinding.getIdentifier().getSelectables().get( 0 ) );
assertNotNull( customerBinding.getVersion() );
assertEquals( 1, customerBinding.getVersion().getColumnSpan() );
validateCustomerVersionColumn( (Column) customerBinding.getVersion().getColumnIterator().next() );
validateCustomerVersionColumn( (Column) customerBinding.getVersion().getSelectables().get( 0 ) );
final Property nameBinding = customerBinding.getProperty( "name" );
assertNotNull( nameBinding );
assertEquals( 1, nameBinding.getColumnSpan() );
validateCustomerNameColumn( (Column) nameBinding.getColumnIterator().next() );
validateCustomerNameColumn( (Column) nameBinding.getSelectables().get( 0 ) );
final Property hqAddressBinding = customerBinding.getProperty( "hqAddress" );
assertNotNull( hqAddressBinding );
@ -103,27 +103,27 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateOrderPrimaryTableName( orderBinding.getTable().getQuotedName() );
assertEquals( 1, orderBinding.getIdentifier().getColumnSpan() );
validateOrderPrimaryKeyColumn( (Column) orderBinding.getIdentifier().getColumnIterator().next() );
validateOrderPrimaryKeyColumn( (Column) orderBinding.getIdentifier().getSelectables().get( 0 ) );
final Property referenceCodeBinding = orderBinding.getProperty( "referenceCode" );
assertNotNull( referenceCodeBinding );
assertEquals( 1, referenceCodeBinding.getColumnSpan() );
validateOrderReferenceCodeColumn( (Column) referenceCodeBinding.getColumnIterator().next() );
validateOrderReferenceCodeColumn( (Column) referenceCodeBinding.getSelectables().get( 0 ) );
final Property placedBinding = orderBinding.getProperty( "placed" );
assertNotNull( placedBinding );
assertEquals( 1, placedBinding.getColumnSpan() );
validateOrderPlacedColumn( (Column) placedBinding.getColumnIterator().next() );
validateOrderPlacedColumn( (Column) placedBinding.getSelectables().get( 0 ) );
final Property fulfilledBinding = orderBinding.getProperty( "fulfilled" );
assertNotNull( fulfilledBinding );
assertEquals( 1, fulfilledBinding.getColumnSpan() );
validateOrderFulfilledColumn( (Column) fulfilledBinding.getColumnIterator().next() );
validateOrderFulfilledColumn( (Column) fulfilledBinding.getSelectables().get( 0 ) );
final Property customerBinding = orderBinding.getProperty( "customer" );
assertNotNull( customerBinding );
assertEquals( 1, customerBinding.getColumnSpan() );
validateOrderCustomerColumn( (Column) customerBinding.getColumnIterator().next() );
validateOrderCustomerColumn( (Column) customerBinding.getSelectables().get( 0 ) );
}
protected abstract void validateOrderPrimaryTableName(String name);
@ -147,22 +147,22 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateZipCodePrimaryTableName( zipCodeBinding.getTable().getQuotedName() );
assertEquals( 1, zipCodeBinding.getIdentifier().getColumnSpan() );
validateZipCodePrimaryKeyColumn( (Column) zipCodeBinding.getIdentifier().getColumnIterator().next() );
validateZipCodePrimaryKeyColumn( (Column) zipCodeBinding.getIdentifier().getSelectables().get( 0 ) );
final Property codeBinding = zipCodeBinding.getProperty( "code" );
assertNotNull( codeBinding );
assertEquals( 1, codeBinding.getColumnSpan() );
validateZipCodeCodeColumn( (Column) codeBinding.getColumnIterator().next() );
validateZipCodeCodeColumn( (Column) codeBinding.getSelectables().get( 0 ) );
final Property cityBinding = zipCodeBinding.getProperty( "city" );
assertNotNull( cityBinding );
assertEquals( 1, cityBinding.getColumnSpan() );
validateZipCodeCityColumn( (Column) cityBinding.getColumnIterator().next() );
validateZipCodeCityColumn( (Column) cityBinding.getSelectables().get( 0 ) );
final Property stateBinding = zipCodeBinding.getProperty( "state" );
assertNotNull( stateBinding );
assertEquals( 1, stateBinding.getColumnSpan() );
validateZipCodeStateColumn( (Column) stateBinding.getColumnIterator().next() );
validateZipCodeStateColumn( (Column) stateBinding.getSelectables().get( 0 ) );
}
protected abstract void validateZipCodePrimaryTableName(String name);
@ -183,13 +183,13 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateCustomerRegisteredTrademarksTableName( collectionBinding.getCollectionTable().getQuotedName() );
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
validateCustomerRegisteredTrademarksKeyColumn( (Column) collectionBinding.getKey().getColumnIterator().next() );
validateCustomerRegisteredTrademarksKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
validateCustomerRegisteredTrademarksElementColumn(
(Column) collectionBinding.getElement()
.getColumnIterator()
.next()
.getSelectables()
.get( 0 )
);
}
@ -207,7 +207,7 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateCustomerAddressesTableName( collectionBinding.getCollectionTable().getQuotedName() );
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
validateCustomerAddressesKeyColumn( (Column) collectionBinding.getKey().getColumnIterator().next() );
validateCustomerAddressesKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
assertEquals( 3, collectionBinding.getElement().getColumnSpan() );
validateCustomerAddressesElementComponent( assertTyping( Component.class, collectionBinding.getElement() ) );
@ -227,10 +227,10 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateCustomerOrdersTableName( collectionBinding.getCollectionTable().getQuotedName() );
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
validateCustomerOrdersKeyColumn( (Column) collectionBinding.getKey().getColumnIterator().next() );
validateCustomerOrdersKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
validateCustomerOrdersElementColumn( (Column) collectionBinding.getElement().getColumnIterator().next() );
validateCustomerOrdersElementColumn( (Column) collectionBinding.getElement().getSelectables().get( 0 ) );
}
protected abstract void validateCustomerOrdersTableName(String name);
@ -246,10 +246,10 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
validateCustomerIndustriesTableName( collectionBinding.getCollectionTable().getQuotedName() );
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
validateCustomerIndustriesKeyColumn( (Column) collectionBinding.getKey().getColumnIterator().next() );
validateCustomerIndustriesKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
validateCustomerIndustriesElementColumn( (Column) collectionBinding.getElement().getColumnIterator().next() );
validateCustomerIndustriesElementColumn( (Column) collectionBinding.getElement().getSelectables().get( 0 ) );
}
protected abstract void validateCustomerIndustriesTableName(String name);

4
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java
View File

@ -52,7 +52,7 @@ public class LegacyJpaNamingWithAnnotationBindingTests extends BaseAnnotationBin
@Override
protected void validateCustomerHqAddressComponent(Component component) {
assertEquals( 3, component.getColumnSpan() );
Iterator<Selectable> selectables = component.getColumnIterator();
Iterator<Selectable> selectables = component.getSelectables().iterator();
int pass = 1;
while ( selectables.hasNext() ) {
final Column column = assertTyping( Column.class, selectables.next() );
@ -156,7 +156,7 @@ public class LegacyJpaNamingWithAnnotationBindingTests extends BaseAnnotationBin
@Override
protected void validateCustomerAddressesElementComponent(Component component) {
assertEquals( 3, component.getColumnSpan() );
Iterator<Selectable> selectables = component.getColumnIterator();
Iterator<Selectable> selectables = component.getSelectables().iterator();
int pass = 1;
while ( selectables.hasNext() ) {
final Column column = assertTyping( Column.class, selectables.next() );

4
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java
View File

@ -58,7 +58,7 @@ public class LegacyJpaNamingWithHbmBindingTests extends BaseHbmBindingTests {
@Override
protected void validateCustomerHqAddressComponent(Component component) {
assertEquals( 3, component.getColumnSpan() );
Iterator<Selectable> selectables = component.getColumnIterator();
Iterator<Selectable> selectables = component.getSelectables().iterator();
int pass = 1;
while ( selectables.hasNext() ) {
final Column column = assertTyping( Column.class, selectables.next() );
@ -158,7 +158,7 @@ public class LegacyJpaNamingWithHbmBindingTests extends BaseHbmBindingTests {
@Override
protected void validateCustomerAddressesElementComponent(Component component) {
assertEquals( 3, component.getColumnSpan() );
Iterator<Selectable> selectables = component.getColumnIterator();
Iterator<Selectable> selectables = component.getSelectables().iterator();
int pass = 1;
while ( selectables.hasNext() ) {
final Column column = assertTyping( Column.class, selectables.next() );

2
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java
View File

@ -95,7 +95,7 @@ public class ComponentNamingStrategyForJoinColumnTest {
assertEquals( 1, collection.getOwner().getKey().getColumnSpan() );
assertEquals(
ownerForeignKeyNameExpected,
collection.getKey().getColumnIterator().next().getText()
collection.getKey().getSelectables().get( 0 ).getText()
);
int columnNumber = table.getColumnSpan();

4
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java
View File

@ -53,7 +53,7 @@ public class ComponentNamingStrategyTest {
Bag value = assertTyping( Bag.class, p.getValue() );
SimpleValue elementValue = assertTyping( SimpleValue.class, value.getElement() );
assertEquals( 1, elementValue.getColumnSpan() );
Column column = assertTyping( Column.class, elementValue.getColumnIterator().next() );
Column column = assertTyping( Column.class, elementValue.getSelectables().get( 0 ) );
assertEquals( column.getName(), "name" );
}
finally {
@ -81,7 +81,7 @@ public class ComponentNamingStrategyTest {
Bag value = assertTyping( Bag.class, p.getValue() );
SimpleValue elementValue = assertTyping( SimpleValue.class, value.getElement() );
assertEquals( 1, elementValue.getColumnSpan() );
Column column = assertTyping( Column.class, elementValue.getColumnIterator().next() );
Column column = assertTyping( Column.class, elementValue.getSelectables().get( 0 ) );
assertEquals( "items_name", column.getName() );
}
finally {

10
hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java
View File

@ -7,6 +7,7 @@
package org.hibernate.orm.test.namingstrategy.ejb3joincolumn;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import org.hibernate.boot.Metadata;
@ -21,13 +22,13 @@ import org.hibernate.cfg.Environment;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Selectable;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.BaseUnitTest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@ -60,10 +61,9 @@ public class Tests {
final PersistentClass languageBinding = metadata.getEntityBinding( Language.class.getName() );
final Property property = languageBinding.getProperty( "fallBack" );
Iterator itr = property.getValue().getColumnIterator();
assertTrue( itr.hasNext() );
final Column column = (Column) itr.next();
assertFalse( itr.hasNext() );
List<Selectable> selectables = property.getValue().getSelectables();
assertTrue( selectables.size() == 1 );
final Column column = (Column) selectables.get( 0 );
assertEquals( "C_FALLBACK_ID", column.getName().toUpperCase( Locale.ROOT ) );
}

26
hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java
View File

@ -6,7 +6,8 @@
*/
package org.hibernate.orm.test.quote;
import java.util.Iterator;
import java.util.List;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@ -21,9 +22,11 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Selectable;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.BaseUnitTest;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -51,10 +54,10 @@ public class ColumnDefinitionQuotingTest {
PersistentClass entityBinding = metadata.getEntityBinding( E1.class.getName() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getColumnIterator() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getSelectables() );
assertTrue( isQuoted( idColumn.getSqlType(), ssr ) );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getColumnIterator() );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getSelectables() );
assertTrue( isQuoted( otherColumn.getSqlType(), ssr ) );
}
}
@ -78,18 +81,19 @@ public class ColumnDefinitionQuotingTest {
PersistentClass entityBinding = metadata.getEntityBinding( E1.class.getName() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getColumnIterator() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getSelectables() );
assertTrue( isQuoted( idColumn.getSqlType(), ssr ) );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getColumnIterator() );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getSelectables() );
assertTrue( isQuoted( otherColumn.getSqlType(), ssr ) );
}
}
);
}
private org.hibernate.mapping.Column extractColumn(Iterator columnIterator) {
return (org.hibernate.mapping.Column) columnIterator.next();
private org.hibernate.mapping.Column extractColumn(List<Selectable> columns) {
Assert.assertEquals( 1, columns.size() );
return (org.hibernate.mapping.Column) columns.get( 0 );
}
private boolean isQuoted(String sqlType, StandardServiceRegistry ssr) {
@ -115,10 +119,10 @@ public class ColumnDefinitionQuotingTest {
PersistentClass entityBinding = metadata.getEntityBinding( E2.class.getName() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getColumnIterator() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getSelectables() );
assertTrue( isQuoted( idColumn.getSqlType(), ssr ) );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getColumnIterator() );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getSelectables() );
assertTrue( isQuoted( otherColumn.getSqlType(), ssr ) );
}
}
@ -142,10 +146,10 @@ public class ColumnDefinitionQuotingTest {
PersistentClass entityBinding = metadata.getEntityBinding( E2.class.getName() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getColumnIterator() );
org.hibernate.mapping.Column idColumn = extractColumn( entityBinding.getIdentifier().getSelectables() );
assertTrue( !isQuoted( idColumn.getSqlType(), ssr ) );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getColumnIterator() );
org.hibernate.mapping.Column otherColumn = extractColumn( entityBinding.getProperty( "other" ).getSelectables() );
assertTrue( !isQuoted( otherColumn.getSqlType(), ssr ) );
}
}

2
hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ImprovedModifiedColumnNamingStrategy.java
View File

@ -42,7 +42,7 @@ public class ImprovedModifiedColumnNamingStrategy extends LegacyModifiedColumnNa
if ( basicType || toOneType ) {
if ( value.getColumnSpan() == 1 ) {
Selectable selectable = value.getColumnIterator().next();
Selectable selectable = value.getSelectables().get( 0 );
if ( selectable instanceof Column ) {
// This should not be applied for formulas
final String columnName;

7
hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ColumnContainer.java
View File

@ -6,7 +6,6 @@
*/
package org.hibernate.envers.boot.model;
import java.util.Iterator;
import java.util.List;
import org.hibernate.mapping.Selectable;
@ -38,9 +37,9 @@ public interface ColumnContainer {
* @param value the value mapping
*/
default void addColumnsFromValue(Value value) {
final Iterator<Selectable> iterator = value.getColumnIterator();
while ( iterator.hasNext() ) {
addColumn( Column.from( iterator.next() ) );
final List<Selectable> selectables = value.getSelectables();
for ( Selectable s : selectables ) {
addColumn( Column.from( s ) );
}
}
}

2
hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorType.java
View File

@ -30,7 +30,7 @@ public class DiscriminatorType implements Bindable<JaxbHbmEntityDiscriminatorTyp
final JaxbHbmEntityDiscriminatorType mapping = new JaxbHbmEntityDiscriminatorType();
mapping.setType( discriminator.getType().getName() );
final Iterator<Selectable> iterator = discriminator.getColumnIterator();
final Iterator<Selectable> iterator = discriminator.getSelectables().iterator();
while ( iterator.hasNext() ) {
final Selectable selectable = iterator.next();
if ( selectable.isFormula() ) {

7
hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Join.java
View File

@ -7,7 +7,6 @@
package org.hibernate.envers.boot.model;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmKeyType;
@ -70,9 +69,9 @@ public class Join implements AttributeContainer, Bindable<JaxbHbmSecondaryTableT
}
public void addKeyColumnsFromValue(Value value) {
final Iterator<Selectable> iterator = value.getColumnIterator();
while ( iterator.hasNext() ) {
keyColumns.add( Column.from( iterator.next() ) );
final List<Selectable> selectables = value.getSelectables();
for ( Selectable s : selectables ) {
keyColumns.add( Column.from( s ) );
}
}

8
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
View File

@ -147,8 +147,8 @@ public class ClassesAuditingData {
private void addSyntheticIndexProperty(List value, String propertyAccessorName, ClassAuditingData classAuditingData) {
final Value indexValue = value.getIndex();
if ( indexValue != null && indexValue.getColumnIterator().hasNext() ) {
final String indexColumnName = indexValue.getColumnIterator().next().getText();
if ( indexValue != null && indexValue.getSelectables().size() > 0 ) {
final String indexColumnName = indexValue.getSelectables().get( 0 ).getText();
if ( indexColumnName != null ) {
final PropertyAuditingData auditingData = new PropertyAuditingData(
indexColumnName,
@ -166,8 +166,8 @@ public class ClassesAuditingData {
private void addMapEnumeratedKey(Value value, String propertyAccessorName, ClassAuditingData classAuditingData) {
if ( value instanceof org.hibernate.mapping.Map ) {
final Value indexValue = ( (org.hibernate.mapping.Map) value ).getIndex();
if ( indexValue != null && indexValue.getColumnIterator().hasNext() ) {
final String indexColumnName = indexValue.getColumnIterator().next().getText();
if ( indexValue != null && indexValue.getSelectables().size() > 0 ) {
final String indexColumnName = indexValue.getSelectables().get( 0 ).getText();
if ( !StringTools.isEmpty( indexColumnName ) ) {
final PropertyAuditingData propertyAuditingData = new PropertyAuditingData(
indexColumnName,

2
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractCollectionMetadataGenerator.java
View File

@ -279,7 +279,7 @@ public abstract class AbstractCollectionMetadataGenerator extends AbstractMetada
columnNameIterator = joinTableData.getInverseJoinColumnNamesIterator();
}
else {
columnNameIterator = ColumnNameIterator.from( value.getColumnIterator() );
columnNameIterator = ColumnNameIterator.from( value.getSelectables().iterator() );
}
addAttributesToEntity(

2
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
View File

@ -209,7 +209,7 @@ public class JoinColumnCollectionMetadataGenerator extends AbstractCollectionMet
return context.getPropertyAuditingData().getPositionMappedBy();
}
else if ( hasCollectionIndex( context ) ) {
return ( (IndexedCollection) context.getCollection() ).getIndex().getColumnIterator().next().getText();
return ( (IndexedCollection) context.getCollection() ).getIndex().getSelectables().get( 0 ).getText();
}
return null;
}

2
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
View File

@ -143,7 +143,7 @@ public class MiddleTableCollectionMetadataGenerator extends AbstractCollectionMe
middleEntity,
getPrefixedIdAttributes(
referencingPrefixRelated,
ColumnNameIterator.from( context.getCollection().getKey().getColumnIterator() ),
ColumnNameIterator.from( context.getCollection().getKey().getSelectables().iterator() ),
referencingIdMapping
)
);

2
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
View File

@ -85,7 +85,7 @@ public final class ToOneRelationMetadataGenerator extends AbstractMetadataGenera
// Adding an element to the mapping corresponding to the references entity id's
idMapping.getRelation()
.getAttributesPrefixed( lastPropertyPrefix, value.getColumnIterator(), false, insertable )
.getAttributesPrefixed( lastPropertyPrefix, value.getSelectables().iterator(), false, insertable )
.forEach( mapping::addAttribute );
boolean lazy = ( (ToOne) value ).isLazy();

6
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
View File

@ -231,7 +231,7 @@ public class VersionsJoinTableRangeComponentNamingTest extends
assert auditClass != null;
@SuppressWarnings("unchecked")
Iterator<Column> columns = auditClass.getTable().getColumnIterator();
Iterator<Column> columns = auditClass.getTable().getColumns().iterator();
boolean id1Found = false;
boolean id2Found = false;
@ -258,7 +258,7 @@ public class VersionsJoinTableRangeComponentNamingTest extends
assert auditClass != null;
@SuppressWarnings("unchecked")
Iterator<Column> columns = auditClass.getTable().getColumnIterator();
Iterator<Column> columns = auditClass.getTable().getColumns().iterator();
boolean id1Found = false;
boolean id2Found = false;
@ -291,7 +291,7 @@ public class VersionsJoinTableRangeComponentNamingTest extends
assert auditClass != null;
@SuppressWarnings("unchecked")
Iterator<Column> columns = auditClass.getTable().getColumnIterator();
Iterator<Column> columns = auditClass.getTable().getColumns().iterator();
boolean auditColumn1Found = false;
boolean auditColumn2Found = false;

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
View File

@ -8,6 +8,7 @@
package org.hibernate.envers.test.integration.reventity;
import java.util.Iterator;
import java.util.List;
import org.hibernate.mapping.Selectable;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
@ -37,14 +38,14 @@ public class LongRevEntityInheritanceChildAuditing extends BaseEnversJPAFunction
public void testChildRevColumnType() {
// Hibernate now sorts columns that are part of the key and therefore this test needs to test
// for the existence of the specific key column rather than the expectation that is exists at
// a specific order in the iterator.
Iterator<Selectable> childEntityKeyColumnsIterator = metadata()
// a specific order.
List<Selectable> childEntityKeyColumns = metadata()
.getEntityBinding( ChildEntity.class.getName() + "_AUD" )
.getKey()
.getColumnIterator();
.getSelectables();
final String revisionColumnName = getConfiguration().getRevisionFieldName();
Column column = getColumnFromIteratorByName( childEntityKeyColumnsIterator, revisionColumnName );
Column column = getColumnFromIteratorByName( childEntityKeyColumns, revisionColumnName );
assertNotNull( column );
assertEquals( column.getSqlType(), "int" );
}

7
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
View File

@ -7,7 +7,6 @@
package org.hibernate.orm.test.envers;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.hibernate.testing.cleaner.DatabaseCleaner;
@ -51,9 +50,9 @@ public abstract class AbstractEnversTest {
return auditStrategy;
}
protected Column getColumnFromIteratorByName(Iterator<Selectable> iterator, String columnName) {
while ( iterator.hasNext() ) {
Column column = (Column) iterator.next();
protected Column getColumnFromIteratorByName(List<Selectable> selectables, String columnName) {
for ( Selectable s : selectables ) {
Column column = (Column) s;
if ( column.getName().equals( columnName) ) {
return column;
}

2
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
View File

@ -87,6 +87,6 @@ public class ChildPrimaryKeyJoinAuditing extends BaseEnversJPAFunctionalTestCase
// for the existence of the specific key column rather than the expectation that is exists at
// a specific order in the iterator.
final PersistentClass persistentClass = metadata().getEntityBinding( ChildPrimaryKeyJoinEntity.class.getName() + "_AUD" );
Assert.assertNotNull( getColumnFromIteratorByName( persistentClass.getKey().getColumnIterator(), "other_id" ) );
Assert.assertNotNull( getColumnFromIteratorByName( persistentClass.getKey().getSelectables(), "other_id" ) );
}
}

2
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
View File

@ -94,7 +94,7 @@ public class DiscriminatorFormulaTest extends BaseEnversJPAFunctionalTestCase {
@Test
public void testDiscriminatorFormulaInAuditTable() {
assert parentAudit.getDiscriminator().hasFormula();
Iterator iterator = parentAudit.getDiscriminator().getColumnIterator();
Iterator iterator = parentAudit.getDiscriminator().getSelectables().iterator();
while ( iterator.hasNext() ) {
Object o = iterator.next();
if ( o instanceof Formula ) {

2
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java
View File

@ -113,7 +113,7 @@ public class JoinNaming extends BaseEnversJPAFunctionalTestCase {
public void testJoinColumnName() {
Iterator<Selectable> columns = metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.naming.JoinNamingRefIngEntity_AUD"
).getProperty( "reference_id" ).getColumnIterator();
).getProperty( "reference_id" ).getSelectables().iterator();
assertTrue( columns.hasNext() );
assertEquals( "jnree_column_reference", columns.next().getText() );
assertFalse( columns.hasNext() );

2
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java
View File

@ -95,7 +95,7 @@ public class OneToManyUnidirectionalNaming extends BaseEnversJPAFunctionalTestCa
@Test
public void testJoinColumnName() {
Iterator<Column> columns =
metadata().getEntityBinding( MIDDLE_VERSIONS_ENTITY_NAME ).getTable().getColumnIterator();
metadata().getEntityBinding( MIDDLE_VERSIONS_ENTITY_NAME ).getTable().getColumns().iterator();
boolean id1Found = false;
boolean id2Found = false;

2
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java
View File

@ -100,7 +100,7 @@ public class VersionsJoinTableNaming extends BaseEnversJPAFunctionalTestCase {
@Test
public void testJoinColumnName() {
Iterator<Column> columns =
metadata().getEntityBinding( MIDDLE_VERSIONS_ENTITY_NAME ).getTable().getColumnIterator();
metadata().getEntityBinding( MIDDLE_VERSIONS_ENTITY_NAME ).getTable().getColumns().iterator();
boolean id1Found = false;
boolean id2Found = false;

4
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java
View File

@ -126,7 +126,7 @@ public class JoinEmbIdNaming extends BaseEnversJPAFunctionalTestCase {
public void testJoinColumnNames() {
Iterator<Selectable> columns = metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD"
).getProperty( "reference_x" ).getColumnIterator();
).getProperty( "reference_x" ).getSelectables().iterator();
assertTrue( columns.hasNext() );
assertEquals( "XX_reference", columns.next().getText() );
@ -134,7 +134,7 @@ public class JoinEmbIdNaming extends BaseEnversJPAFunctionalTestCase {
columns = metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD"
).getProperty( "reference_y" ).getColumnIterator();
).getProperty( "reference_y" ).getSelectables().iterator();
assertTrue( columns.hasNext() );
assertEquals( "YY_reference", columns.next().getText() );

4
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java
View File

@ -126,7 +126,7 @@ public class JoinMulIdNaming extends BaseEnversJPAFunctionalTestCase {
public void testJoinColumnNames() {
Iterator<Selectable> columns = metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD"
).getProperty( "reference_id1" ).getColumnIterator();
).getProperty( "reference_id1" ).getSelectables().iterator();
assertTrue( columns.hasNext() );
assertEquals( "ID1_reference", columns.next().getText() );
@ -134,7 +134,7 @@ public class JoinMulIdNaming extends BaseEnversJPAFunctionalTestCase {
columns = metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD"
).getProperty( "reference_id2" ).getColumnIterator();
).getProperty( "reference_id2" ).getSelectables().iterator();
assertTrue( columns.hasNext() );
assertEquals( "ID2_reference", columns.next().getText() );

6
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java
View File

@ -7,6 +7,7 @@
package org.hibernate.orm.test.envers.integration.naming.quotation;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import jakarta.persistence.EntityManager;
@ -101,9 +102,8 @@ public class QuotedFieldsTest extends BaseEnversJPAFunctionalTestCase {
}
private Column getColumnByName(Table table, String columnName) {
Iterator<Column> columnIterator = table.getColumnIterator();
while ( columnIterator.hasNext() ) {
Column column = columnIterator.next();
Collection<Column> columns = table.getColumns();
for ( Column column : columns ) {
if ( columnName.equals( column.getName() ) ) {
return column;
}