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

HHH-17061 Remove deprecated method PersistentClass#getJoinIterator

This commit is contained in:
Sanne Grinovero 2023-08-09 16:02:48 +02:00 committed by Sanne Grinovero
parent 6970ddbbbf
commit aea84e3fdc
8 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,11 +720,6 @@ public abstract class PersistentClass implements IdentifiableTypeClass, Attribut
return joins;
}
@Deprecated(since = "6.0")
public Iterator<Join> getJoinIterator() {
return joins.iterator();
}
public void addJoin(Join join) {
if ( !joins.contains(join) ) {
joins.add( join );

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
View File

@ -79,7 +79,7 @@ public abstract class AbstractJPAIndexTest extends BaseNonConfigCoreFunctionalTe
public void testSecondaryTableIndex(){
PersistentClass entity = metadata().getEntityBinding( Car.class.getName() );
Join join = (Join)entity.getJoinIterator().next();
Join join = entity.getJoins().get( 0 );
Iterator<Index> itr = join.getTable().getIndexes().values().iterator();
assertTrue( itr.hasNext() );
Index index = itr.next();

3
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java
View File

@ -308,8 +308,7 @@ public class OneToOneTest extends BaseNonConfigCoreFunctionalTestCase {
@TestForIssue( jiraKey = "HHH-4606" )
public void testJoinColumnConfiguredInXml() {
PersistentClass pc = metadata().getEntityBinding( Son.class.getName() );
Iterator<Join> iter = pc.getJoinIterator();
Table table = iter.next().getTable();
Table table = pc.getJoins().get( 0 ).getTable();
Iterator<Column> columnIter = table.getColumns().iterator();
boolean fooFound = false;
boolean barFound = false;

4
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
View File

@ -144,7 +144,7 @@ public final class AuditMetadataGenerator extends AbstractMetadataGenerator {
}
private void createJoins(PersistentClass persistentClass, JoinAwarePersistentEntity entity, ClassAuditingData auditingData) {
final Iterator<org.hibernate.mapping.Join> joins = persistentClass.getJoinIterator();
final Iterator<org.hibernate.mapping.Join> joins = persistentClass.getJoins().iterator();
final Map<org.hibernate.mapping.Join, Join> joinElements = new HashMap<>();
entityJoins.put( persistentClass.getEntityName(), joinElements );
@ -196,7 +196,7 @@ public final class AuditMetadataGenerator extends AbstractMetadataGenerator {
String entityName,
EntityMappingData mappingData,
boolean firstPass) {
final Iterator<org.hibernate.mapping.Join> joins = persistentClass.getJoinIterator();
final Iterator<org.hibernate.mapping.Join> joins = persistentClass.getJoins().iterator();
while ( joins.hasNext() ) {
final org.hibernate.mapping.Join join = joins.next();

7
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java
View File

@ -14,6 +14,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.mapping.Join;
import org.junit.Assert;
import org.junit.Test;
/**
@ -71,13 +72,11 @@ public class BasicSecondary extends BaseEnversJPAFunctionalTestCase {
@SuppressWarnings("unchecked")
@Test
public void testTableNames() {
assert "secondary_AUD".equals(
((Iterator<Join>)
Assert.assertEquals("secondary_AUD",
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.SecondaryTestEntity_AUD"
)
.getJoinIterator())
.next().getTable().getName()
.getJoins().get( 0 ).getTable().getName()
);
}
}

15
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java
View File

@ -7,13 +7,12 @@
package org.hibernate.orm.test.envers.integration.secondary;
import java.util.Arrays;
import java.util.Iterator;
import jakarta.persistence.EntityManager;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.mapping.Join;
import org.junit.Assert;
import org.junit.Test;
/**
@ -71,13 +70,11 @@ public class NamingSecondary extends BaseEnversJPAFunctionalTestCase {
@SuppressWarnings("unchecked")
@Test
public void testTableNames() {
assert "sec_versions".equals(
((Iterator<Join>)
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.SecondaryNamingTestEntity_AUD"
)
.getJoinIterator())
.next().getTable().getName()
Assert.assertEquals( "sec_versions",
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.SecondaryNamingTestEntity_AUD"
)
.getJoins().get( 0 ).getTable().getName()
);
}
}

12
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java
View File

@ -7,14 +7,13 @@
package org.hibernate.orm.test.envers.integration.secondary.ids;
import java.util.Arrays;
import java.util.Iterator;
import jakarta.persistence.EntityManager;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.orm.test.envers.entities.ids.EmbId;
import org.hibernate.mapping.Join;
import org.junit.Assert;
import org.junit.Test;
/**
@ -70,11 +69,10 @@ public class EmbIdSecondary extends BaseEnversJPAFunctionalTestCase {
@SuppressWarnings("unchecked")
@Test
public void testTableNames() {
assert "sec_embid_versions".equals(
((Iterator<Join>)
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryEmbIdTestEntity_AUD"
).getJoinIterator()).next().getTable().getName()
Assert.assertEquals( "sec_embid_versions",
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryEmbIdTestEntity_AUD"
).getJoins().get( 0 ).getTable().getName()
);
}
}

18
hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java
View File

@ -7,14 +7,14 @@
package org.hibernate.orm.test.envers.integration.secondary.ids;
import java.util.Arrays;
import java.util.Iterator;
import jakarta.persistence.EntityManager;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.orm.test.envers.entities.ids.MulId;
import org.hibernate.mapping.Join;
import org.junit.Assert;
import org.junit.Test;
/**
@ -25,7 +25,7 @@ public class MulIdSecondary extends BaseEnversJPAFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] {SecondaryMulIdTestEntity.class};
return new Class[] { SecondaryMulIdTestEntity.class };
}
@Test
@ -70,13 +70,11 @@ public class MulIdSecondary extends BaseEnversJPAFunctionalTestCase {
@SuppressWarnings("unchecked")
@Test
public void testTableNames() {
assert "sec_mulid_versions".equals(
((Iterator<Join>)
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryMulIdTestEntity_AUD"
)
.getJoinIterator())
.next().getTable().getName()
Assert.assertEquals(
"sec_mulid_versions",
metadata().getEntityBinding(
"org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryMulIdTestEntity_AUD"
).getJoins().get( 0 ).getTable().getName()
);
}
}