Skip to content

Commit 06eda27

Browse files
authored
Merge pull request #5 from jGauravGupta/JEE8-JPA-STREAM
JPA stream test-case polish
2 parents 478756c + 6449c00 commit 06eda27

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

jpa/stream/src/main/java/org/javaee8/jpa/stream/repository/PersonRepository.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*/
1414
public class PersonRepository {
1515

16-
@PersistenceContext(unitName = "DEFAULT_PU")
17-
private EntityManager em;
16+
@PersistenceContext
17+
private EntityManager entityManager;
1818

1919
public Stream<Person> findAll() {
20-
CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
21-
cq.select(cq.from(Person.class));
22-
return em.createQuery(cq).getResultStream();
20+
CriteriaQuery criteriaQuery = entityManager.getCriteriaBuilder().createQuery();
21+
criteriaQuery.select(criteriaQuery.from(Person.class));
22+
return entityManager.createQuery(criteriaQuery).getResultStream();
2323
}
2424

2525
}

jpa/stream/src/test/resources/test-persistence.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
3-
<persistence-unit name="DEFAULT_PU" transaction-type="JTA">
4-
<jta-data-source>java:comp/DefaultDataSource</jta-data-source>
5-
<exclude-unlisted-classes>false</exclude-unlisted-classes>
3+
4+
<!--
5+
This defines the persistence unit from which the entity manager is used in org.javaee8.jpa.stream.repository.PersonRepository
6+
7+
Note that this relies on the defaults; in Java EE the transaction type defaults to JTA and the data source defaults to the platform default data source
8+
9+
-->
10+
11+
<persistence-unit name="TEST_PU">
612
<properties>
713
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
814
<property name="javax.persistence.sql-load-script-source" value="META-INF/sql/insert.sql"/>

0 commit comments

Comments
 (0)