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

HHH-12858 - integration overrides during JPA bootstrap ought to override all logically related settings 

HHH-13432 - Have EntityManagerFactory expose persistence.xml `jta-data-source` element as a `javax.persistence.nonJtaDataSource` property

(cherry picked from commit ab508d2afa)
This commit is contained in:
Steve Ebersole 2019-10-05 23:03:09 -05:00 committed by gbadner
parent cec3107e13
commit 814a5ce6e2
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
View File

@ -10,11 +10,15 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import javax.persistence.Entity;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Id;
import javax.persistence.metamodel.EntityType;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.sql.DataSource;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
@ -22,6 +26,7 @@ import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionPro
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.jpa.HibernatePersistenceProvider;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.env.ConnectionProviderBuilder;
@ -409,6 +414,9 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase {
emf.unwrap( SessionFactoryImplementor.class ).getJdbcServices().getDialect(),
instanceOf( PersistenceUnitDialect.class )
);
final EntityType<MappedEntity> entityMapping = emf.getMetamodel().entity( MappedEntity.class );
assertThat( entityMapping, notNullValue() );
}
finally {
emf.close();
@ -450,6 +458,15 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase {
emf.unwrap( SessionFactoryImplementor.class ).getJdbcServices().getDialect(),
instanceOf( IntegrationDialect.class )
);
final EntityPersister entityMapping = emf.unwrap( SessionFactoryImplementor.class )
.getMetamodel()
.entityPersister( MappedEntity.class );
assertThat( entityMapping, notNullValue() );
assertThat(
entityMapping.getCacheAccessStrategy().getAccessType(),
is( AccessType.READ_ONLY )
);
}
finally {
emf.close();
@ -463,4 +480,26 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase {
public static class IntegrationDialect extends Dialect {
}
@Entity
public static class MappedEntity {
private Integer id;
private String name;
@Id
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
}

2
hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/jpa/hibernate.cfg.xml
View File

@ -8,5 +8,7 @@
<hibernate-configuration>
<session-factory>
<property name="hibernate.dialect">org.hibernate.orm.test.bootstrap.jpa.PersistenceUnitOverridesTests$PersistenceUnitDialect</property>
<mapping class="org.hibernate.orm.test.bootstrap.jpa.PersistenceUnitOverridesTests$MappedEntity"/>
<class-cache class="org.hibernate.orm.test.bootstrap.jpa.PersistenceUnitOverridesTests$MappedEntity" usage="read-only"/>
</session-factory>
</hibernate-configuration>