[OPENJPA-2985] Implement the mandatory JPA 3.2 methods that threw UnsupportedOperationException

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitygraph/EGDepartment.java

@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.entitygraph;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
 @Entity
@@ -31,6 +36,9 @@ public class EGDepartment {
 
     private String name;
 
+    @OneToMany(mappedBy = "department", fetch = FetchType.LAZY)
+    private List<EGEmployee> employees = new ArrayList<>();
+
     public EGDepartment() {}
 
     public EGDepartment(int id, String name) {
@@ -42,4 +50,6 @@ public EGDepartment(int id, String name) {
     public void setId(int id) { this.id = id; }
     public String getName() { return name; }
     public void setName(String name) { this.name = name; }
+    public List<EGEmployee> getEmployees() { return employees; }
+    public void setEmployees(List<EGEmployee> employees) { this.employees = employees; }
 }

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitygraph/TestEntityGraphFind.java

@@ -0,0 +1,253 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.entitygraph;
+
+import java.lang.reflect.Proxy;
+
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+
+import org.apache.openjpa.enhance.PersistenceCapable;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+import org.apache.openjpa.util.ImplHelper;
+
+/**
+ * Tests {@code EntityManager.find(EntityGraph, Object, FindOption...)} (JPA 3.2).
+ * The graph is interpreted as a <em>load graph</em>: attributes named by the graph are fetched eagerly,
+ * attributes outside the graph keep their declared fetch behaviour.
+ */
+public class TestEntityGraphFind extends SingleEMFTestCase {
+
+    private static final int DEPT_ID = 1;
+    private static final int EMP_ID = 10;
+
+    @Override
+    public void setUp() {
+        setUp(EGEmployee.class, EGEmployee2.class, EGEmployee3.class,
+              EGDepartment.class, CLEAR_TABLES);
+        createData();
+    }
+
+    private void createData() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            em.getTransaction().begin();
+            EGDepartment dept = new EGDepartment(DEPT_ID, "Engineering");
+            em.persist(dept);
+            for (int i = 0; i < 2; i++) {
+                EGEmployee emp = new EGEmployee();
+                emp.setId(EMP_ID + i);
+                emp.setFirstName("First" + i);
+                emp.setLastName("Last" + i);
+                emp.setSalary(1000 + i);
+                emp.setDepartment(dept);
+                dept.getEmployees().add(emp);
+                em.persist(emp);
+            }
+            em.getTransaction().commit();
+        } finally {
+            if (em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+            em.close();
+        }
+    }
+
+    /**
+     * Direct, non-brittle load state check: looks at the state manager's loaded bit for the given attribute
+     * rather than counting SQL statements.
+     */
+    private boolean isLoaded(Object entity, String attribute) {
+        PersistenceCapable pc = ImplHelper.toPersistenceCapable(entity, emf.getConfiguration());
+        assertNotNull("not a persistence capable instance", pc);
+        OpenJPAStateManager sm = (OpenJPAStateManager) pc.pcGetStateManager();
+        assertNotNull("entity is not managed", sm);
+        FieldMetaData fmd = sm.getMetaData().getField(attribute);
+        assertNotNull("no such persistent attribute: " + attribute, fmd);
+        return sm.getLoaded().get(fmd.getIndex());
+    }
+
+    /**
+     * Baseline: without a graph the lazy collection is not loaded. Without this control the positive
+     * assertion below would be vacuous.
+     */
+    public void testFindWithoutGraphLeavesLazyAttributeUnloaded() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EGDepartment dept = em.find(EGDepartment.class, DEPT_ID);
+            assertNotNull(dept);
+            assertFalse("employees must be lazy without a graph", isLoaded(dept, "employees"));
+        } finally {
+            em.close();
+        }
+    }
+
+    /**
+     * The load bearing test: the very same lookup with a graph naming the lazy collection loads it eagerly.
+     */
+    public void testFindWithEntityGraphLoadsGraphAttribute() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> graph = em.createEntityGraph(EGDepartment.class);
+            graph.addAttributeNodes("employees");
+            EGDepartment dept = em.find(graph, DEPT_ID);
+            assertNotNull(dept);
+            assertEquals(DEPT_ID, dept.getId());
+            assertTrue("employees must be loaded by the load graph", isLoaded(dept, "employees"));
+            assertEquals(2, dept.getEmployees().size());
+        } finally {
+            em.close();
+        }
+    }
+
+    /**
+     * Load graph, not fetch graph: attributes outside the graph keep their declared (eager) behaviour.
+     */
+    public void testFindWithEntityGraphKeepsNonGraphAttributesDefault() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGEmployee> graph = em.createEntityGraph(EGEmployee.class);
+            graph.addAttributeNodes("firstName");
+            EGEmployee emp = em.find(graph, EMP_ID);
+            assertNotNull(emp);
+            assertEquals("First0", emp.getFirstName());
+            assertTrue("lastName is outside the graph but eager by default", isLoaded(emp, "lastName"));
+            assertNotNull(emp.getDepartment());
+        } finally {
+            em.close();
+        }
+    }
+
+    /**
+     * Subgraphs are applied recursively: the department reached from the employee has its lazy collection
+     * loaded. The control below proves the plain find() does not.
+     */
+    public void testFindWithSubgraph() {
+        EntityManager control = emf.createEntityManager();
+        try {
+            EGEmployee emp = control.find(EGEmployee.class, EMP_ID);
+            assertNotNull(emp);
+            assertFalse(isLoaded(emp.getDepartment(), "employees"));
+        } finally {
+            control.close();
+        }
+
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGEmployee> graph = em.createEntityGraph(EGEmployee.class);
+            graph.addSubgraph("department").addAttributeNodes("employees");
+            EGEmployee emp = em.find(graph, EMP_ID);
+            assertNotNull(emp);
+            assertNotNull(emp.getDepartment());
+            assertTrue("the subgraph must load department.employees", isLoaded(emp.getDepartment(), "employees"));
+            assertEquals(2, emp.getDepartment().getEmployees().size());
+        } finally {
+            em.close();
+        }
+    }
+
+    /**
+     * A graph that references itself must not send the graph traversal into an endless recursion.
+     */
+    public void testFindWithCyclicGraph() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> graph = em.createEntityGraph(EGDepartment.class);
+            jakarta.persistence.Subgraph<EGEmployee> emps = graph.addSubgraph("employees", EGEmployee.class);
+            emps.addSubgraph("department", EGDepartment.class).addAttributeNodes("employees");
+            EGDepartment dept = em.find(graph, DEPT_ID);
+            assertNotNull(dept);
+            assertTrue(isLoaded(dept, "employees"));
+        } finally {
+            em.close();
+        }
+    }
+
+    /**
+     * FindOptions are honoured on the graph based overload as well, sharing the option parsing with
+     * {@code find(Class, Object, FindOption...)}.
+     */
+    public void testFindWithGraphAndFindOptions() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> graph = em.createEntityGraph(EGDepartment.class);
+            graph.addAttributeNodes("employees");
+            EGDepartment dept = em.find(graph, DEPT_ID, CacheStoreMode.BYPASS, CacheRetrieveMode.BYPASS);
+            assertNotNull(dept);
+            assertTrue(isLoaded(dept, "employees"));
+        } finally {
+            em.close();
+        }
+    }
+
+    public void testFindWithGraphReturnsNullWhenMissing() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> graph = em.createEntityGraph(EGDepartment.class);
+            graph.addAttributeNodes("employees");
+            assertNull(em.find(graph, 9999));
+        } finally {
+            em.close();
+        }
+    }
+
+    public void testFindWithNullGraphThrowsIAE() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            em.find((EntityGraph<EGDepartment>) null, DEPT_ID);
+            fail("expected IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            // expected
+        } finally {
+            em.close();
+        }
+    }
+
+    public void testFindWithNullPrimaryKeyThrowsIAE() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> graph = em.createEntityGraph(EGDepartment.class);
+            em.find(graph, null);
+            fail("expected IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            // expected
+        } finally {
+            em.close();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testFindWithForeignEntityGraphThrowsIAE() {
+        EntityManager em = emf.createEntityManager();
+        try {
+            EntityGraph<EGDepartment> foreign = (EntityGraph<EGDepartment>) Proxy.newProxyInstance(
+                getClass().getClassLoader(), new Class<?>[] { EntityGraph.class }, (p, m, a) -> null);
+            em.find(foreign, DEPT_ID);
+            fail("expected IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            assertTrue(String.valueOf(expected.getMessage()).contains("Unknown EntityGraph implementation"));
+        } finally {
+            em.close();
+        }
+    }
+}

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/NamedQueryRefEntity.java

@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.query;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.QueryHint;
+import jakarta.persistence.Table;
+
+/**
+ * Entity declaring named queries with and without a JPA 3.2 {@code resultClass}.
+ */
+@Entity
+@Table(name = "NQ_REF_ENTITY")
+@NamedQueries({
+    @NamedQuery(name = "NQRef.all",
+        query = "select o from NamedQueryRefEntity o",
+        resultClass = NamedQueryRefEntity.class,
+        hints = @QueryHint(name = "openjpa.FetchPlan.MaxFetchDepth", value = "2")),
+    @NamedQuery(name = "NQRef.names",
+        query = "select o.name from NamedQueryRefEntity o",
+        resultClass = String.class),
+    @NamedQuery(name = "NQRef.untyped",
+        query = "select o from NamedQueryRefEntity o where o.name = 'x'")
+})
+@NamedNativeQuery(name = "NQRef.native",
+    query = "select id, name from NQ_REF_ENTITY",
+    resultClass = NamedQueryRefEntity.class)
+public class NamedQueryRefEntity {
+
+    @Id
+    private int id;
+
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}