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

JpaCompliance improvement

This commit is contained in:
Steve Ebersole 2021-11-11 09:09:54 -06:00
parent 6c816932ed
commit 7ce1c673ff
5 changed files with 177 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
View File

@ -93,7 +93,7 @@ public class BootstrapContextImpl implements BootstrapContext {
final StrategySelector strategySelector = serviceRegistry.getService( StrategySelector.class );
final ConfigurationService configService = serviceRegistry.getService( ConfigurationService.class );
this.jpaCompliance = new MutableJpaComplianceImpl( configService.getSettings(), false );
this.jpaCompliance = new MutableJpaComplianceImpl( configService.getSettings() );
this.scanOptions = new StandardScanOptions(
(String) configService.getSettings().get( AvailableSettings.SCANNER_DISCOVERY ),
false

18
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -2186,6 +2186,24 @@ public interface AvailableSettings {
*/
String CRITERIA_VALUE_HANDLING_MODE = "hibernate.criteria.value_handling_mode";
/**
* Allows setting default value for all {@link JpaCompliance} flags. Individual
* flags can still be overridden individually using its specific setting
*
* @see #JPA_TRANSACTION_COMPLIANCE
* @see #JPA_QUERY_COMPLIANCE
* @see #JPA_LIST_COMPLIANCE
* @see #JPA_ORDER_BY_MAPPING_COMPLIANCE
* @see #JPA_CLOSED_COMPLIANCE
* @see #JPA_PROXY_COMPLIANCE
* @see #JPA_CACHING_COMPLIANCE
* @see #JPA_ID_GENERATOR_GLOBAL_SCOPE_COMPLIANCE
* @see #JPA_LOAD_BY_ID_COMPLIANCE
*
* @since 6.0
*/
String JPA_COMPLIANCE = "hibernate.jpa.compliance";
/**
* Should Hibernate's {@link Transaction} behave as
* defined by the spec for JPA's {@link jakarta.persistence.EntityTransaction}

16
hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java
View File

@ -27,6 +27,22 @@ public class MutableJpaComplianceImpl implements MutableJpaCompliance {
private boolean cachingCompliance;
private boolean loadByIdCompliance;
public MutableJpaComplianceImpl(Map configurationSettings) {
this(
configurationSettings,
ConfigurationHelper.getBoolean(
AvailableSettings.JPA_COMPLIANCE,
configurationSettings,
false
)
);
}
/**
* Generallythe
* @param configurationSettings
* @param jpaByDefault
*/
@SuppressWarnings("ConstantConditions")
public MutableJpaComplianceImpl(Map configurationSettings, boolean jpaByDefault) {
final Object legacyQueryCompliance = configurationSettings.get( AvailableSettings.JPAQL_STRICT_COMPLIANCE );

131
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java Normal file
View File

@ -0,0 +1,131 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.orm.test.jpa.compliance;
import java.util.Collections;
import org.hibernate.SessionFactory;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.jpa.internal.MutableJpaComplianceImpl;
import org.hibernate.jpa.spi.JpaCompliance;
import org.hibernate.testing.orm.junit.ServiceRegistryScope;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Steve Ebersole
*/
public class JpaComplianceTests {
@Test
public void testDefaultTrue() {
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), true );
assertAll( compliance, true );
}
@Test
public void testDefaultFalse() {
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), false );
assertAll( compliance, false );
}
private void assertAll(JpaCompliance compliance, boolean expected) {
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 );
assertThat( compliance.isGlobalGeneratorScopeEnabled() ).isEqualTo( expected );
}
@Test
public void testDefaultTrueWithOverride() {
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), true );
compliance.setQueryCompliance( false );
assertOverridden( compliance, true );
}
@Test
public void testDefaultFalseWithOverride() {
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), false );
compliance.setQueryCompliance( true );
assertOverridden( compliance, false );
}
private void assertOverridden(MutableJpaComplianceImpl compliance, boolean expected) {
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 );
assertThat( compliance.isGlobalGeneratorScopeEnabled() ).isEqualTo( expected );
}
@Test
public void testSettingTrue() {
ServiceRegistryScope.using(
() -> new StandardServiceRegistryBuilder()
.applySetting( AvailableSettings.JPA_COMPLIANCE, true )
.build(),
(serviceRegistryScope) -> {
final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) new MetadataSources( serviceRegistryScope.getRegistry() )
.buildMetadata()
.buildSessionFactory();
final JpaCompliance jpaCompliance = sessionFactory.getSessionFactoryOptions().getJpaCompliance();
assertAll( jpaCompliance, true );
}
);
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), true );
assertAll( compliance, true );
}
@Test
public void testSettingFalse() {
ServiceRegistryScope.using(
() -> new StandardServiceRegistryBuilder()
.applySetting( AvailableSettings.JPA_COMPLIANCE, false )
.build(),
(serviceRegistryScope) -> {
final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) new MetadataSources( serviceRegistryScope.getRegistry() )
.buildMetadata()
.buildSessionFactory();
final JpaCompliance jpaCompliance = sessionFactory.getSessionFactoryOptions().getJpaCompliance();
assertAll( jpaCompliance, false );
}
);
// MutableJpaComplianceImpl defaults its values based on the passed
// `jpaByDefault` (`true` here). ultimately we want to source this
// from `AvailableSettings#JPA_COMPLIANCE`
final MutableJpaComplianceImpl compliance = new MutableJpaComplianceImpl( Collections.emptyMap(), true );
assertAll( compliance, true );
}
}

11
hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScope.java
View File

@ -8,6 +8,7 @@ package org.hibernate.testing.orm.junit;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.service.Service;
@ -16,6 +17,16 @@ import org.hibernate.service.Service;
* @author Steve Ebersole
*/
public interface ServiceRegistryScope {
/**
* Generalized support for running exception-safe code using a ServiceRegistry to
* ensure proper shutdown
*/
static void using(Supplier<StandardServiceRegistry> ssrProducer, Consumer<ServiceRegistryScope> action) {
try (final StandardServiceRegistry ssr = ssrProducer.get()) {
action.accept( () -> ssr );
}
}
StandardServiceRegistry getRegistry();
default <S extends Service> void withService(Class<S> role, Consumer<S> action) {