diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java index 8cc7411d0a..03d6c00449 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java @@ -709,16 +709,6 @@ public interface SessionFactoryBuilder { */ SessionFactoryBuilder enableJpaTransactionCompliance(boolean enabled); - /** - * @see JpaCompliance#isJpaListComplianceEnabled() - * - * @see org.hibernate.cfg.AvailableSettings#JPA_LIST_COMPLIANCE - * - * @deprecated Use {@link org.hibernate.cfg.AvailableSettings#DEFAULT_LIST_SEMANTICS} instead - */ - @Deprecated( since = "6.0" ) - SessionFactoryBuilder enableJpaListCompliance(boolean enabled); - /** * @deprecated No longer has any effect. * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java index da9e6b6944..299b5f0776 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java @@ -404,12 +404,6 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilderImplement return this; } - @Override - public SessionFactoryBuilder enableJpaListCompliance(boolean enabled) { - this.optionsBuilder.enableJpaListCompliance( enabled ); - return this; - } - @Override public SessionFactoryBuilder enableJpaCascadeCompliance(boolean enabled) { this.optionsBuilder.enableJpaCascadeCompliance( enabled ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index bcc5043bab..01630fc862 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -1574,10 +1574,6 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions { mutableJpaCompliance().setTransactionCompliance( enabled ); } - public void enableJpaListCompliance(boolean enabled) { - mutableJpaCompliance().setListCompliance( enabled ); - } - public void enableJpaCascadeCompliance(boolean enabled) { mutableJpaCompliance().setCascadeCompliance( enabled ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java index 78eee51539..01c1cf54da 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java @@ -374,12 +374,6 @@ public abstract class AbstractDelegatingSessionFactoryBuilder configurationSettings, boolean jpaByDefault) { final Object legacyQueryCompliance = configurationSettings.get( AvailableSettings.JPAQL_STRICT_COMPLIANCE ); - //noinspection deprecation - listCompliance = ConfigurationHelper.getBoolean( - AvailableSettings.JPA_LIST_COMPLIANCE, - configurationSettings, - jpaByDefault - ); proxyCompliance = ConfigurationHelper.getBoolean( AvailableSettings.JPA_PROXY_COMPLIANCE, configurationSettings, @@ -100,11 +93,6 @@ public class MutableJpaComplianceImpl implements MutableJpaCompliance { return true; } - @Override - public boolean isJpaListComplianceEnabled() { - return listCompliance; - } - @Override public boolean isJpaClosedComplianceEnabled() { return closedCompliance; @@ -138,11 +126,6 @@ public class MutableJpaComplianceImpl implements MutableJpaCompliance { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Mutators - @Override - public void setListCompliance(boolean listCompliance) { - this.listCompliance = listCompliance; - } - @Override public void setCascadeCompliance(boolean cascadeCompliance) { } @@ -189,8 +172,7 @@ public class MutableJpaComplianceImpl implements MutableJpaCompliance { @Override public JpaCompliance immutableCopy() { JpaComplianceImpl.JpaComplianceBuilder builder = new JpaComplianceImpl.JpaComplianceBuilder(); - builder = builder.setListCompliance( listCompliance ) - .setProxyCompliance( proxyCompliance ) + builder = builder.setProxyCompliance( proxyCompliance ) .setOrderByMappingCompliance( orderByMappingCompliance ) .setGlobalGeneratorNameCompliance( generatorNameScopeCompliance ) .setQueryCompliance( queryCompliance ) diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java index dc47ff00a9..2ca821c0bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java @@ -42,28 +42,6 @@ public interface JpaCompliance { */ boolean isJpaTransactionComplianceEnabled(); - /** - * Controls how Hibernate interprets a mapped {@link java.util.List} - * without no {@linkplain jakarta.persistence.OrderColumn order column} - * specified. Historically Hibernate treats this as a "bag", which is a - * concept JPA does not have. - * - * - * @return {@code true} indicates to behave in the spec-defined way, - * interpreting the mapping as a "list", rather than a "bag" - * - * @see org.hibernate.cfg.AvailableSettings#JPA_LIST_COMPLIANCE - * - * @deprecated Use {@link org.hibernate.cfg.AvailableSettings#DEFAULT_LIST_SEMANTICS} instead - */ - @Deprecated( since = "6.0" ) - boolean isJpaListComplianceEnabled(); - /** * JPA defines specific exceptions on specific methods when called on * {@link jakarta.persistence.EntityManager} and diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java index 57d9e5f47c..da556260c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java @@ -16,8 +16,6 @@ public interface MutableJpaCompliance extends JpaCompliance { @Deprecated void setCascadeCompliance(boolean cascadeCompliance); - void setListCompliance(boolean listCompliance); - void setOrderByMappingCompliance(boolean orderByCompliance); void setProxyCompliance(boolean proxyCompliance); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java index 8c5706a0ff..88a46931f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java @@ -29,11 +29,6 @@ public class JpaComplianceStub implements JpaCompliance { return false; } - @Override - public boolean isJpaListComplianceEnabled() { - return false; - } - @Override public boolean isJpaClosedComplianceEnabled() { return false; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java index f6a4fbc2ce..9f61d186ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java @@ -48,7 +48,6 @@ public class JpaComplianceTests { assertThat( compliance.isJpaQueryComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaTransactionComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaClosedComplianceEnabled() ).isEqualTo( expected ); - assertThat( compliance.isJpaListComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaOrderByMappingComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaProxyComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaCacheComplianceEnabled() ).isEqualTo( expected ); @@ -78,7 +77,6 @@ public class JpaComplianceTests { assertThat( compliance.isJpaQueryComplianceEnabled() ).isEqualTo( !expected ); assertThat( compliance.isJpaTransactionComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaClosedComplianceEnabled() ).isEqualTo( expected ); - assertThat( compliance.isJpaListComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaOrderByMappingComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaProxyComplianceEnabled() ).isEqualTo( expected ); assertThat( compliance.isJpaCacheComplianceEnabled() ).isEqualTo( expected ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java index 0a4ad57e73..4001738750 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java @@ -99,7 +99,6 @@ public class EntityManagerFactoryExtension pui.getProperties().put( AvailableSettings.JPA_COMPLIANCE, emfAnn.jpaComplianceEnabled() ); pui.getProperties().put( AvailableSettings.JPA_QUERY_COMPLIANCE, emfAnn.queryComplianceEnabled() ); pui.getProperties().put( AvailableSettings.JPA_TRANSACTION_COMPLIANCE, emfAnn.transactionComplianceEnabled() ); - pui.getProperties().put( AvailableSettings.JPA_LIST_COMPLIANCE, emfAnn.listMappingComplianceEnabled() ); pui.getProperties().put( AvailableSettings.JPA_CLOSED_COMPLIANCE, emfAnn.closedComplianceEnabled() ); pui.getProperties().put( AvailableSettings.JPA_PROXY_COMPLIANCE, emfAnn.proxyComplianceEnabled() ); pui.getProperties().put( AvailableSettings.JPA_CACHING_COMPLIANCE, emfAnn.cacheComplianceEnabled() ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java index 750f5487ce..3433012b75 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java @@ -83,12 +83,6 @@ public @interface Jpa { */ boolean closedComplianceEnabled() default false; - /** - * @see JpaCompliance#isJpaListComplianceEnabled() - * @see org.hibernate.cfg.AvailableSettings#DEFAULT_LIST_SEMANTICS - */ - boolean listMappingComplianceEnabled() default false; - /** * @see JpaCompliance#isJpaOrderByMappingComplianceEnabled() */