Polishing

(cherry picked from commit dc36bb34c7)

spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java

@@ -127,7 +127,7 @@ public abstract class SharedEntityManagerCreator {
 
 	/**
 	 * Create a transactional EntityManager proxy for the given EntityManagerFactory.
-	 * @param emf EntityManagerFactory to obtain EntityManagers from as needed
+	 * @param emf the EntityManagerFactory to obtain EntityManagers from as needed
 	 * @param properties the properties to be passed into the
 	 * {@code createEntityManager} call (may be {@code null})
 	 * @param entityManagerInterfaces the interfaces to be implemented by the
@@ -142,7 +142,7 @@ public abstract class SharedEntityManagerCreator {
 
 	/**
 	 * Create a transactional EntityManager proxy for the given EntityManagerFactory.
-	 * @param emf EntityManagerFactory to obtain EntityManagers from as needed
+	 * @param emf the EntityManagerFactory to obtain EntityManagers from as needed
 	 * @param properties the properties to be passed into the
 	 * {@code createEntityManager} call (may be {@code null})
 	 * @param synchronizedWithTransaction whether to automatically join ongoing
@@ -345,11 +345,11 @@ public abstract class SharedEntityManagerCreator {
 		private final Query target;
 
 		@Nullable
-		private EntityManager em;
+		private EntityManager entityManager;
 
-		public DeferredQueryInvocationHandler(Query target, EntityManager em) {
+		public DeferredQueryInvocationHandler(Query target, EntityManager entityManager) {
 			this.target = target;
-			this.em = em;
+			this.entityManager = entityManager;
 		}
 
 		@Override
@@ -387,8 +387,8 @@ public abstract class SharedEntityManagerCreator {
 				if (queryTerminatingMethods.contains(method.getName())) {
 					// Actual execution of the query: close the EntityManager right
 					// afterwards, since that was the only reason we kept it open.
-					EntityManagerFactoryUtils.closeEntityManager(this.em);
-					this.em = null;
+					EntityManagerFactoryUtils.closeEntityManager(this.entityManager);
+					this.entityManager = null;
 				}
 			}
 		}

spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,23 @@ package org.springframework.orm.jpa;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
 
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.withSettings;
 
 /**
  * Unit tests for {@link SharedEntityManagerCreator}.
  *
  * @author Oliver Gierke
+ * @author Juergen Hoeller
  */
 public class SharedEntityManagerCreatorTests {
 
@@ -83,4 +88,68 @@ public class SharedEntityManagerCreatorTests {
 		em.refresh(new Object());
 	}
 
+	@Test
+	public void deferredQueryWithUpdate() {
+		EntityManagerFactory emf = mock(EntityManagerFactory.class);
+		EntityManager targetEm = mock(EntityManager.class);
+		Query query = mock(Query.class);
+		given(emf.createEntityManager()).willReturn(targetEm);
+		given(targetEm.createQuery("x")).willReturn(query);
+		given(targetEm.isOpen()).willReturn(true);
+
+		EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf);
+		em.createQuery("x").executeUpdate();
+
+		verify(query).executeUpdate();
+		verify(targetEm).close();
+	}
+
+	@Test
+	public void deferredQueryWithSingleResult() {
+		EntityManagerFactory emf = mock(EntityManagerFactory.class);
+		EntityManager targetEm = mock(EntityManager.class);
+		Query query = mock(Query.class);
+		given(emf.createEntityManager()).willReturn(targetEm);
+		given(targetEm.createQuery("x")).willReturn(query);
+		given(targetEm.isOpen()).willReturn(true);
+
+		EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf);
+		em.createQuery("x").getSingleResult();
+
+		verify(query).getSingleResult();
+		verify(targetEm).close();
+	}
+
+	@Test
+	public void deferredQueryWithResultList() {
+		EntityManagerFactory emf = mock(EntityManagerFactory.class);
+		EntityManager targetEm = mock(EntityManager.class);
+		Query query = mock(Query.class);
+		given(emf.createEntityManager()).willReturn(targetEm);
+		given(targetEm.createQuery("x")).willReturn(query);
+		given(targetEm.isOpen()).willReturn(true);
+
+		EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf);
+		em.createQuery("x").getResultList();
+
+		verify(query).getResultList();
+		verify(targetEm).close();
+	}
+
+	@Test
+	public void deferredQueryWithResultStream() {
+		EntityManagerFactory emf = mock(EntityManagerFactory.class);
+		EntityManager targetEm = mock(EntityManager.class);
+		Query query = mock(Query.class);
+		given(emf.createEntityManager()).willReturn(targetEm);
+		given(targetEm.createQuery("x")).willReturn(query);
+		given(targetEm.isOpen()).willReturn(true);
+
+		EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf);
+		em.createQuery("x").getResultStream();
+
+		verify(query).getResultStream();
+		verify(targetEm).close();
+	}
+
 }