From c4b0a717220b29559bb1281dd432c020390e2151 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Wed, 9 Aug 2023 12:17:55 +0200 Subject: [PATCH] HHH-17061 Remove PersistentClass#getKeyClosureIterator --- .../main/java/org/hibernate/mapping/PersistentClass.java | 3 --- .../src/main/java/org/hibernate/mapping/RootClass.java | 5 ----- .../src/main/java/org/hibernate/mapping/Subclass.java | 9 --------- 3 files changed, 17 deletions(-) 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 bce17caa6c..14ad02841e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -358,9 +358,6 @@ public abstract class PersistentClass implements IdentifiableTypeClass, Attribut public abstract List getKeyClosure(); - @Deprecated(since = "6.0") @Remove - public abstract Iterator getKeyClosureIterator(); - protected void addSubclassProperty(Property prop) { subclassProperties.add( prop ); } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index 583bbf7f64..3496c0020f 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -141,11 +141,6 @@ public class RootClass extends PersistentClass implements TableOwner { return List.of( getTable() ); } - @Override @Deprecated - public Iterator getKeyClosureIterator() { - return new SingletonIterator<>( getKey() ); - } - @Override public List getKeyClosure() { return List.of( getKey() ); 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 de33283815..1a968f630c 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java @@ -16,7 +16,6 @@ import org.hibernate.engine.OptimisticLockStyle; import org.hibernate.internal.FilterConfiguration; import org.hibernate.internal.util.collections.JoinedIterator; import org.hibernate.internal.util.collections.JoinedList; -import org.hibernate.internal.util.collections.SingletonIterator; import org.hibernate.persister.entity.EntityPersister; /** @@ -138,14 +137,6 @@ public class Subclass extends PersistentClass { ); } - @Override @Deprecated - public Iterator getKeyClosureIterator() { - return new JoinedIterator<>( - getSuperclass().getKeyClosureIterator(), - new SingletonIterator<>( getKey() ) - ); - } - @Override public List getKeyClosure() { return new JoinedList<>(