diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java index 14ad02841e..f2f1570e60 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -727,11 +727,6 @@ public abstract class PersistentClass implements IdentifiableTypeClass, Attribut return joins.iterator(); } - @Deprecated(since = "6.0") - public Iterator getJoinClosureIterator() { - return joins.iterator(); - } - public void addJoin(Join join) { if ( !joins.contains(join) ) { joins.add( join ); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java index 1a968f630c..532a7cd5b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java @@ -246,15 +246,6 @@ public class Subclass extends PersistentClass { return new JoinedList<>( getSuperclass().getJoinClosure(), super.getJoinClosure() ); } - @Deprecated(since = "6.0") @SuppressWarnings("deprecation") - public Iterator getJoinClosureIterator() { - return new JoinedIterator<>( - getSuperclass().getJoinClosureIterator(), - super.getJoinClosureIterator() - ); - } - - @Override public boolean isClassOrSuperclassJoin(Join join) { return super.isClassOrSuperclassJoin( join ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java index d6f647fa89..0e94198b6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.fail; public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { @Test public void testDefaultValue() { - Join join = metadata().getEntityBinding( Life.class.getName() ).getJoinClosureIterator().next(); + Join join = metadata().getEntityBinding( Life.class.getName() ).getJoinClosure().get( 0 ); assertEquals( "ExtendedLife", join.getTable().getName() ); org.hibernate.mapping.Column owner = new org.hibernate.mapping.Column(); owner.setName( "LIFE_ID" ); @@ -63,7 +63,7 @@ public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { @Test public void testCompositePK() { - Join join = metadata().getEntityBinding( Dog.class.getName() ).getJoinClosureIterator().next(); + Join join = metadata().getEntityBinding( Dog.class.getName() ).getJoinClosure().get( 0 ); assertEquals( "DogThoroughbred", join.getTable().getName() ); org.hibernate.mapping.Column owner = new org.hibernate.mapping.Column(); owner.setName( "OWNER_NAME" );