From 3c77e33547e88471b5bed65b5f5a5635a8f59cc3 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 9 Jun 2026 14:54:43 +0200
Subject: [PATCH] Add configuration methods for entity agent factory

Co-authored-by: Matej Novotny <manovotn@ibm.com>
---
 .../weld/junit/AbstractWeldInitiator.java     |  29 +-
 .../weld/junit/MockJpaInjectionServices.java  |  25 +-
 .../weld/junit/jupiter/WeldInitiator.java     |   7 +-
 .../weld/junit/jupiter/resources/FooJpa.java  |   5 +
 .../resources/InjectResourcesTest.java        | 500 +++++++++++++++++-
 .../org/jboss/weld/junit4/WeldInitiator.java  |   7 +-
 .../jboss/weld/junit4/resources/FooJpa.java   |   5 +
 .../junit4/resources/InjectResourcesTest.java | 499 ++++++++++++++++-
 pom.xml                                       |   2 +-
 .../org/jboss/weld/spock/WeldInitiator.java   |   7 +-
 10 files changed, 1024 insertions(+), 62 deletions(-)

diff --git a/junit-common/src/main/java/org/jboss/weld/junit/AbstractWeldInitiator.java b/junit-common/src/main/java/org/jboss/weld/junit/AbstractWeldInitiator.java
index 7a813223..3407c1c0 100644
--- a/junit-common/src/main/java/org/jboss/weld/junit/AbstractWeldInitiator.java
+++ b/junit-common/src/main/java/org/jboss/weld/junit/AbstractWeldInitiator.java
@@ -91,13 +91,16 @@ public static Weld createDefaultWeld() {
 
     private final Function<InjectionPoint, Object> persistenceContextFactory;
 
+    private final Function<InjectionPoint, Object> persistenceAgentFactory;
+
     protected volatile WeldContainer container;
 
     protected AbstractWeldInitiator(Weld weld, List<Object> instancesToInject,
             Set<Class<? extends Annotation>> scopesToActivate, Set<Bean<?>> beans,
             Map<String, Object> resources, Function<InjectionPoint, Object> ejbFactory,
             Function<InjectionPoint, Object> persistenceUnitFactory,
-            Function<InjectionPoint, Object> persistenceContextFactory) {
+            Function<InjectionPoint, Object> persistenceContextFactory,
+            Function<InjectionPoint, Object> persistenceAgentFactory) {
         this.instancesToInject = new ArrayList<>();
         for (Object instance : instancesToInject) {
             this.instancesToInject.add(createToInject(instance));
@@ -137,6 +140,7 @@ protected AbstractWeldInitiator(Weld weld, List<Object> instancesToInject,
         this.ejbFactory = ejbFactory;
         this.persistenceContextFactory = persistenceContextFactory;
         this.persistenceUnitFactory = persistenceUnitFactory;
+        this.persistenceAgentFactory = persistenceAgentFactory;
     }
 
     protected ToInject createToInject(Object instanceToInject) {
@@ -359,6 +363,8 @@ protected static abstract class AbstractBuilder<I extends AbstractWeldInitiator,
 
         private Function<InjectionPoint, Object> persistenceContextFactory;
 
+        private Function<InjectionPoint, Object> persistenceAgentFactory;
+
         public AbstractBuilder(Weld weld) {
             this.weld = weld;
             this.instancesToInject = new ArrayList<>();
@@ -404,6 +410,10 @@ protected Function<InjectionPoint, Object> getPersistenceUnitFactory() {
             return persistenceUnitFactory;
         }
 
+        protected Function<InjectionPoint, Object> getPersistenceAgentFactory() {
+            return persistenceAgentFactory;
+        }
+
         /**
          * Instructs the initiator to inject the given non-contextual instance once the container is started, i.e. during test
          * execution.
@@ -519,6 +529,18 @@ public T setPersistenceContextFactory(Function<InjectionPoint, Object> persisten
             return self();
         }
 
+        /**
+         * Makes it possible to mock {@code PersistenceAgent} injection points.
+         *
+         * @param persistenceAgentFactory
+         * @return self
+         * @since 6.0
+         */
+        public T setPersistenceAgentFactory(Function<InjectionPoint, Object> persistenceAgentFactory) {
+            this.persistenceAgentFactory = persistenceAgentFactory;
+            return self();
+        }
+
         protected abstract T self();
 
         protected abstract I build(Weld weld, List<Object> instancesToInject, Set<Class<? extends Annotation>> scopesToActivate,
@@ -545,8 +567,9 @@ protected WeldContainer initWeldContainer(Weld weld) {
         if (ejbFactory != null) {
             weld.addServices(new MockEjbInjectionServices(ejbFactory));
         }
-        if (persistenceContextFactory != null || persistenceUnitFactory != null) {
-            weld.addServices(new MockJpaInjectionServices(persistenceUnitFactory, persistenceContextFactory));
+        if (persistenceContextFactory != null || persistenceUnitFactory != null || persistenceAgentFactory != null) {
+            weld.addServices(
+                    new MockJpaInjectionServices(persistenceUnitFactory, persistenceContextFactory, persistenceAgentFactory));
         }
         // Init the container
         container = weld.initialize();
diff --git a/junit-common/src/main/java/org/jboss/weld/junit/MockJpaInjectionServices.java b/junit-common/src/main/java/org/jboss/weld/junit/MockJpaInjectionServices.java
index f660f5d9..2cbdf6e2 100644
--- a/junit-common/src/main/java/org/jboss/weld/junit/MockJpaInjectionServices.java
+++ b/junit-common/src/main/java/org/jboss/weld/junit/MockJpaInjectionServices.java
@@ -19,6 +19,7 @@
 import java.util.function.Function;
 
 import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.persistence.EntityAgent;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 
@@ -39,10 +40,14 @@ public class MockJpaInjectionServices implements JpaInjectionServices {
 
     private final Function<InjectionPoint, Object> persistenceContextFactory;
 
+    private final Function<InjectionPoint, Object> persistenceAgentFactory;
+
     public MockJpaInjectionServices(Function<InjectionPoint, Object> persistenceUnitFactory,
-            Function<InjectionPoint, Object> persistenceContextFactory) {
+            Function<InjectionPoint, Object> persistenceContextFactory,
+            Function<InjectionPoint, Object> persistenceAgentFactory) {
         this.persistenceUnitFactory = persistenceUnitFactory;
         this.persistenceContextFactory = persistenceContextFactory;
+        this.persistenceAgentFactory = persistenceAgentFactory;
     }
 
     @Override
@@ -81,6 +86,24 @@ public ResourceReference<EntityManagerFactory> createResource() {
         };
     }
 
+    @Override
+    public ResourceReferenceFactory<EntityAgent> registerPersistenceAgentInjectionPoint(InjectionPoint injectionPoint) {
+        return new ResourceReferenceFactory<EntityAgent>() {
+            @Override
+            public ResourceReference<EntityAgent> createResource() {
+                if (persistenceAgentFactory == null) {
+                    throw new IllegalStateException(
+                            "Persistence agent factory not set, cannot resolve injection point: " + injectionPoint);
+                }
+                Object agent = persistenceAgentFactory.apply(injectionPoint);
+                if (agent == null || agent instanceof EntityAgent) {
+                    return new SimpleResourceReference<EntityAgent>((EntityAgent) agent);
+                }
+                throw new IllegalStateException("Not an EntityAgent instance: " + agent);
+            }
+        };
+    }
+
     @Override
     public void cleanup() {
     }
diff --git a/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java
index d64d6c15..9eff1a07 100644
--- a/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java
+++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java
@@ -182,7 +182,7 @@ protected Builder self() {
         protected WeldInitiator build(Weld weld, List<Object> instancesToInject,
                 Set<Class<? extends Annotation>> scopesToActivate, Set<Bean<?>> beans) {
             return new WeldInitiator(weld, instancesToInject, scopesToActivate, beans, resources, getEjbFactory(),
-                    getPersistenceUnitFactory(), getPersistenceContextFactory());
+                    getPersistenceUnitFactory(), getPersistenceContextFactory(), getPersistenceAgentFactory());
         }
 
     }
@@ -191,9 +191,10 @@ private WeldInitiator(Weld weld, List<Object> instancesToInject, Set<Class<? ext
             Set<Bean<?>> beans,
             Map<String, Object> resources, Function<InjectionPoint, Object> ejbFactory,
             Function<InjectionPoint, Object> persistenceUnitFactory,
-            Function<InjectionPoint, Object> persistenceContextFactory) {
+            Function<InjectionPoint, Object> persistenceContextFactory,
+            Function<InjectionPoint, Object> persistenceAgentFactory) {
         super(weld, instancesToInject, scopesToActivate, beans, resources, ejbFactory, persistenceUnitFactory,
-                persistenceContextFactory);
+                persistenceContextFactory, persistenceAgentFactory);
     }
 
     void shutdownWeld() {
diff --git a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java
index 0cde78d8..a97d68c2 100644
--- a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java
+++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java
@@ -17,8 +17,10 @@
 package org.jboss.weld.junit.jupiter.resources;
 
 import jakarta.enterprise.context.Dependent;
+import jakarta.persistence.EntityAgent;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceAgent;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.PersistenceUnit;
 
@@ -31,4 +33,7 @@ public class FooJpa {
     @PersistenceUnit
     EntityManagerFactory entityManagerFactory;
 
+    @PersistenceAgent
+    EntityAgent entityAgent;
+
 }
diff --git a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
index 27311342..6ceb4cc2 100644
--- a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
+++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
@@ -20,8 +20,10 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -31,7 +33,10 @@
 import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.ConnectionConsumer;
 import jakarta.persistence.ConnectionFunction;
+import jakarta.persistence.EntityAgent;
 import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityHandler;
+import jakarta.persistence.EntityListenerRegistration;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
@@ -44,22 +49,26 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.RefreshOption;
 import jakarta.persistence.SchemaManager;
+import jakarta.persistence.Statement;
+import jakarta.persistence.StatementOrTypedQuery;
+import jakarta.persistence.StatementReference;
 import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.SynchronizationType;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaDelete;
-import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaSelect;
-import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.CriteriaStatement;
 import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.sql.ResultSetMapping;
 
 import org.jboss.weld.junit.jupiter.EnableWeld;
 import org.jboss.weld.junit.jupiter.WeldInitiator;
 import org.jboss.weld.junit.jupiter.WeldSetup;
 import org.junit.jupiter.api.Test;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 /**
  *
  * @author Martin Kouba
@@ -74,7 +83,9 @@ public class InjectResourcesTest {
             .bindResource("java:comp/env/baz", "hello2")
             .setEjbFactory(ip -> new DummySessionBean("ping"))
             .setPersistenceUnitFactory(getPUFactory())
-            .setPersistenceContextFactory(getPCFactory()).build();
+            .setPersistenceContextFactory(getPCFactory())
+            .setPersistenceAgentFactory(getPAFactory())
+            .build();
 
     @Test
     public void testResourceInjection() {
@@ -96,6 +107,8 @@ public void testJpaInjection() {
         assertFalse(foo.entityManagerFactory.isOpen());
         assertNotNull(foo.entityManager);
         assertFalse(foo.entityManager.isOpen());
+        assertNotNull(foo.entityAgent);
+        assertEquals("MockEntityAgent", foo.entityAgent.toString());
     }
 
     // Mock objects
@@ -124,10 +137,6 @@ public void remove(Object entity) {
             public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
             }
 
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-            }
-
             @Override
             public void refresh(Object entity, Map<String, Object> properties) {
             }
@@ -167,6 +176,12 @@ public boolean isJoinedToTransaction() {
                 return false;
             }
 
+            @Deprecated(since = "4.0", forRemoval = true)
+            @Override
+            public Statement createQuery(CriteriaStatement<?> statement) {
+                return null;
+            }
+
             @Override
             public EntityTransaction getTransaction() {
                 return null;
@@ -182,6 +197,11 @@ public Map<String, Object> getProperties() {
                 return null;
             }
 
+            @Override
+            public Statement createStatement(String qlString) {
+                return null;
+            }
+
             @Override
             public Metamodel getMetamodel() {
                 return null;
@@ -212,11 +232,26 @@ public EntityGraph<?> getEntityGraph(String graphName) {
                 return null;
             }
 
+            @Override
+            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
+                return null;
+            }
+
             @Override
             public Object getDelegate() {
                 return null;
             }
 
+            @Override
+            public void addOption(Option option) {
+
+            }
+
+            @Override
+            public Set<Option> getOptions() {
+                return Set.of();
+            }
+
             @Override
             public CriteriaBuilder getCriteriaBuilder() {
                 return null;
@@ -232,15 +267,35 @@ public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode
             }
 
             @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
                 return null;
             }
 
             @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+            public <T> T get(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id, @Nullable FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(EntityGraph<T> graph, Object id, @Nullable FindOption... options) {
                 return null;
             }
 
+            @Override
+            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
             @Override
             public <T> T find(Class<T> entityClass, Object primaryKey) {
                 return null;
@@ -271,37 +326,37 @@ public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
             }
 
             @Override
-            public Query createQuery(CriteriaDelete deleteQuery) {
+            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
                 return null;
             }
 
             @Override
-            public Query createQuery(CriteriaUpdate updateQuery) {
+            public Statement createNamedStatement(String name) {
                 return null;
             }
 
             @Override
-            public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+            public StatementOrTypedQuery createQuery(String qlString) {
                 return null;
             }
 
             @Override
-            public Query createQuery(String qlString) {
+            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString, String resultSetMapping) {
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, ResultSetMapping<T> resultSetMapping) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString, Class resultClass) {
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString) {
+            public StatementOrTypedQuery createNativeQuery(String sqlString) {
                 return null;
             }
 
@@ -316,10 +371,16 @@ public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
             }
 
             @Override
-            public Query createNamedQuery(String name) {
+            public Statement createStatement(StatementReference reference) {
                 return null;
             }
 
+            @Override
+            public StatementOrTypedQuery createNamedQuery(String name) {
+                return null;
+            }
+
+            @Deprecated(since = "4.0", forRemoval = true)
             @Override
             public EntityGraph<?> createEntityGraph(String graphName) {
                 return null;
@@ -353,6 +414,16 @@ public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... o
                 return null;
             }
 
+            @Override
+            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
             @Override
             public <T> T getReference(T entity) {
                 return null;
@@ -389,11 +460,21 @@ public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
                 return null;
             }
 
+            @Override
+            public Statement createStatement(CriteriaStatement<?> statement) {
+                return null;
+            }
+
             @Override
             public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
                 return null;
             }
 
+            @Override
+            public Statement createNativeStatement(String sqlString) {
+                return null;
+            }
+
             @Override
             public <C> void runWithConnection(ConnectionConsumer<C> action) {
             }
@@ -434,32 +515,37 @@ public Metamodel getMetamodel() {
             }
 
             @Override
-            public CriteriaBuilder getCriteriaBuilder() {
+            public EntityManager createEntityManager(@Nullable EntityManager.CreationOption... options) {
                 return null;
             }
 
             @Override
-            public Cache getCache() {
+            public EntityAgent createEntityAgent(@Nullable EntityAgent.CreationOption... options) {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
+            public EntityAgent createEntityAgent(@Nullable Map<?, ?> properties) {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType) {
+            public CriteriaBuilder getCriteriaBuilder() {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(Map map) {
+            public Cache getCache() {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager() {
+            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map<?, ?> map) {
+                return null;
+            }
+
+            @Override
+            public EntityManager createEntityManager(Map<?, ?> map) {
                 return null;
             }
 
@@ -471,6 +557,16 @@ public void close() {
             public void addNamedQuery(String name, Query query) {
             }
 
+            @Override
+            public <R> TypedQueryReference<R> addNamedQuery(String name, TypedQuery<R> query) {
+                return null;
+            }
+
+            @Override
+            public StatementReference addNamedStatement(String name, Statement statement) {
+                return null;
+            }
+
             @Override
             public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
             }
@@ -495,11 +591,27 @@ public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultTy
                 return null;
             }
 
+            @Override
+            public Map<String, StatementReference> getNamedStatements() {
+                return Map.of();
+            }
+
             @Override
             public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
                 return null;
             }
 
+            @Override
+            public <R> Map<String, ResultSetMapping<R>> getResultSetMappings(Class<R> resultType) {
+                return Map.of();
+            }
+
+            @Override
+            public <E> EntityListenerRegistration addListener(Class<E> entityType, Class<? extends Annotation> callbackType,
+                    Consumer<? super E> listener) {
+                return null;
+            }
+
             @Override
             public void runInTransaction(Consumer<EntityManager> work) {
             }
@@ -508,7 +620,347 @@ public void runInTransaction(Consumer<EntityManager> work) {
             public <R> R callInTransaction(Function<EntityManager, R> work) {
                 return null;
             }
+
+            @Override
+            public <H extends EntityHandler> void runInTransaction(Class<H> handlerClass, Consumer<H> work) {
+
+            }
+
+            @Override
+            public <R, H extends EntityHandler> R callInTransaction(Class<H> handlerClass, Function<H, R> work) {
+                return null;
+            }
         };
     }
 
+    static Function<InjectionPoint, Object> getPAFactory() {
+        return ip -> new EntityAgent() {
+            @Override
+            public void insert(Object entity) {
+
+            }
+
+            @Override
+            public void insertMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void update(Object entity) {
+
+            }
+
+            @Override
+            public void updateMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void delete(Object entity) {
+
+            }
+
+            @Override
+            public void deleteMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void upsert(Object entity) {
+
+            }
+
+            @Override
+            public void upsertMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void refresh(Object entity) {
+
+            }
+
+            @Override
+            public void refreshMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void refresh(Object entity, LockModeType lockMode) {
+
+            }
+
+            @Override
+            public <T> T fetch(T association) {
+                return null;
+            }
+
+            @Override
+            public void addOption(Option option) {
+
+            }
+
+            @Override
+            public Set<Option> getOptions() {
+                return Set.of();
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(EntityGraph<T> graph, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> T find(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T find(Class<T> entityClass, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T find(EntityGraph<T> graph, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+
+            }
+
+            @Override
+            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+
+            }
+
+            @Override
+            public CacheRetrieveMode getCacheRetrieveMode() {
+                return null;
+            }
+
+            @Override
+            public CacheStoreMode getCacheStoreMode() {
+                return null;
+            }
+
+            @Override
+            public void setProperty(String propertyName, Object value) {
+
+            }
+
+            @Override
+            public Map<String, Object> getProperties() {
+                return Map.of();
+            }
+
+            @Override
+            public Statement createStatement(String qlString) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createQuery(String qlString) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
+                return null;
+            }
+
+            @Override
+            public Statement createStatement(CriteriaStatement<?> statement) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
+                return null;
+            }
+
+            @Override
+            public Statement createNamedStatement(String name) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNamedQuery(String name) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public Statement createStatement(StatementReference reference) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
+                return null;
+            }
+
+            @Override
+            public Statement createNativeStatement(String sqlString) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNativeQuery(String sqlString) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNativeQuery(String sqlString,
+                    ResultSetMapping<T> resultSetMapping) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
+                    Class<?>... resultClasses) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
+                    String... resultSetMappings) {
+                return null;
+            }
+
+            @Override
+            public <T> T unwrap(Class<T> type) {
+                return null;
+            }
+
+            @Override
+            public void close() {
+
+            }
+
+            @Override
+            public boolean isOpen() {
+                return false;
+            }
+
+            @Override
+            public EntityTransaction getTransaction() {
+                return null;
+            }
+
+            @Override
+            public EntityManagerFactory getEntityManagerFactory() {
+                return null;
+            }
+
+            @Override
+            public CriteriaBuilder getCriteriaBuilder() {
+                return null;
+            }
+
+            @Override
+            public Metamodel getMetamodel() {
+                return null;
+            }
+
+            @Override
+            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
+                return null;
+            }
+
+            @Override
+            public EntityGraph<?> getEntityGraph(String graphName) {
+                return null;
+            }
+
+            @Override
+            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
+                return null;
+            }
+
+            @Override
+            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+                return List.of();
+            }
+
+            @Override
+            public <C> void runWithConnection(ConnectionConsumer<C> action) {
+
+            }
+
+            @Override
+            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+                return null;
+            }
+
+            @Override
+            public String toString() {
+                return "MockEntityAgent";
+            }
+        };
+    }
 }
diff --git a/junit4/src/main/java/org/jboss/weld/junit4/WeldInitiator.java b/junit4/src/main/java/org/jboss/weld/junit4/WeldInitiator.java
index 832204f1..ae6b5343 100644
--- a/junit4/src/main/java/org/jboss/weld/junit4/WeldInitiator.java
+++ b/junit4/src/main/java/org/jboss/weld/junit4/WeldInitiator.java
@@ -207,7 +207,7 @@ protected Builder self() {
         protected WeldInitiator build(Weld weld, List<Object> instancesToInject,
                 Set<Class<? extends Annotation>> scopesToActivate, Set<Bean<?>> beans) {
             return new WeldInitiator(weld, instancesToInject, scopesToActivate, beans, resources, getEjbFactory(),
-                    getPersistenceUnitFactory(), getPersistenceContextFactory());
+                    getPersistenceUnitFactory(), getPersistenceContextFactory(), getPersistenceAgentFactory());
         }
 
     }
@@ -216,9 +216,10 @@ private WeldInitiator(Weld weld, List<Object> instancesToInject, Set<Class<? ext
             Set<Bean<?>> beans,
             Map<String, Object> resources, Function<InjectionPoint, Object> ejbFactory,
             Function<InjectionPoint, Object> persistenceUnitFactory,
-            Function<InjectionPoint, Object> persistenceContextFactory) {
+            Function<InjectionPoint, Object> persistenceContextFactory,
+            Function<InjectionPoint, Object> persistenceAgentFactory) {
         super(weld, instancesToInject, scopesToActivate, beans, resources, ejbFactory, persistenceUnitFactory,
-                persistenceContextFactory);
+                persistenceContextFactory, persistenceAgentFactory);
     }
 
     /**
diff --git a/junit4/src/test/java/org/jboss/weld/junit4/resources/FooJpa.java b/junit4/src/test/java/org/jboss/weld/junit4/resources/FooJpa.java
index c04f9034..6d24e3c2 100644
--- a/junit4/src/test/java/org/jboss/weld/junit4/resources/FooJpa.java
+++ b/junit4/src/test/java/org/jboss/weld/junit4/resources/FooJpa.java
@@ -17,8 +17,10 @@
 package org.jboss.weld.junit4.resources;
 
 import jakarta.enterprise.context.Dependent;
+import jakarta.persistence.EntityAgent;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceAgent;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.PersistenceUnit;
 
@@ -31,4 +33,7 @@ public class FooJpa {
     @PersistenceUnit
     EntityManagerFactory entityManagerFactory;
 
+    @PersistenceAgent
+    EntityAgent entityAgent;
+
 }
diff --git a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
index 32be6b66..40f0c8b7 100644
--- a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
+++ b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
@@ -20,8 +20,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
+import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -31,7 +33,10 @@
 import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.ConnectionConsumer;
 import jakarta.persistence.ConnectionFunction;
+import jakarta.persistence.EntityAgent;
 import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityHandler;
+import jakarta.persistence.EntityListenerRegistration;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
@@ -44,21 +49,25 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.RefreshOption;
 import jakarta.persistence.SchemaManager;
+import jakarta.persistence.Statement;
+import jakarta.persistence.StatementOrTypedQuery;
+import jakarta.persistence.StatementReference;
 import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.SynchronizationType;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaDelete;
-import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaSelect;
-import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.CriteriaStatement;
 import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.sql.ResultSetMapping;
 
 import org.jboss.weld.junit4.WeldInitiator;
 import org.junit.Rule;
 import org.junit.Test;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 /**
  *
  * @author Martin Kouba
@@ -72,7 +81,8 @@ public class InjectResourcesTest {
             .bindResource("java:comp/env/baz", "hello2")
             .setEjbFactory(ip -> new DummySessionBean("ping"))
             .setPersistenceUnitFactory(getPUFactory())
-            .setPersistenceContextFactory(getPCFactory()).build();
+            .setPersistenceContextFactory(getPCFactory())
+            .setPersistenceAgentFactory(getPAFactory()).build();
 
     @Test
     public void testResourceInjection() {
@@ -94,6 +104,8 @@ public void testJpaInjection() {
         assertFalse(foo.entityManagerFactory.isOpen());
         assertNotNull(foo.entityManager);
         assertFalse(foo.entityManager.isOpen());
+        assertNotNull(foo.entityAgent);
+        assertEquals("MockEntityAgent", foo.entityAgent.toString());
     }
 
     // Mock objects
@@ -122,10 +134,6 @@ public void remove(Object entity) {
             public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
             }
 
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-            }
-
             @Override
             public void refresh(Object entity, Map<String, Object> properties) {
             }
@@ -165,6 +173,12 @@ public boolean isJoinedToTransaction() {
                 return false;
             }
 
+            @Deprecated(since = "4.0", forRemoval = true)
+            @Override
+            public Statement createQuery(CriteriaStatement<?> statement) {
+                return null;
+            }
+
             @Override
             public EntityTransaction getTransaction() {
                 return null;
@@ -180,6 +194,11 @@ public Map<String, Object> getProperties() {
                 return null;
             }
 
+            @Override
+            public Statement createStatement(String qlString) {
+                return null;
+            }
+
             @Override
             public Metamodel getMetamodel() {
                 return null;
@@ -210,11 +229,26 @@ public EntityGraph<?> getEntityGraph(String graphName) {
                 return null;
             }
 
+            @Override
+            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
+                return null;
+            }
+
             @Override
             public Object getDelegate() {
                 return null;
             }
 
+            @Override
+            public void addOption(Option option) {
+
+            }
+
+            @Override
+            public Set<Option> getOptions() {
+                return Set.of();
+            }
+
             @Override
             public CriteriaBuilder getCriteriaBuilder() {
                 return null;
@@ -230,15 +264,35 @@ public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode
             }
 
             @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
                 return null;
             }
 
             @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+            public <T> T get(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id, @Nullable FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(EntityGraph<T> graph, Object id, @Nullable FindOption... options) {
                 return null;
             }
 
+            @Override
+            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
             @Override
             public <T> T find(Class<T> entityClass, Object primaryKey) {
                 return null;
@@ -269,37 +323,37 @@ public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
             }
 
             @Override
-            public Query createQuery(CriteriaDelete deleteQuery) {
+            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
                 return null;
             }
 
             @Override
-            public Query createQuery(CriteriaUpdate updateQuery) {
+            public Statement createNamedStatement(String name) {
                 return null;
             }
 
             @Override
-            public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+            public StatementOrTypedQuery createQuery(String qlString) {
                 return null;
             }
 
             @Override
-            public Query createQuery(String qlString) {
+            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString, String resultSetMapping) {
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, ResultSetMapping<T> resultSetMapping) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString, Class resultClass) {
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
                 return null;
             }
 
             @Override
-            public Query createNativeQuery(String sqlString) {
+            public StatementOrTypedQuery createNativeQuery(String sqlString) {
                 return null;
             }
 
@@ -314,10 +368,16 @@ public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
             }
 
             @Override
-            public Query createNamedQuery(String name) {
+            public Statement createStatement(StatementReference reference) {
                 return null;
             }
 
+            @Override
+            public StatementOrTypedQuery createNamedQuery(String name) {
+                return null;
+            }
+
+            @Deprecated(since = "4.0", forRemoval = true)
             @Override
             public EntityGraph<?> createEntityGraph(String graphName) {
                 return null;
@@ -351,6 +411,16 @@ public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... o
                 return null;
             }
 
+            @Override
+            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
+                return List.of();
+            }
+
             @Override
             public <T> T getReference(T entity) {
                 return null;
@@ -387,11 +457,21 @@ public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
                 return null;
             }
 
+            @Override
+            public Statement createStatement(CriteriaStatement<?> statement) {
+                return null;
+            }
+
             @Override
             public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
                 return null;
             }
 
+            @Override
+            public Statement createNativeStatement(String sqlString) {
+                return null;
+            }
+
             @Override
             public <C> void runWithConnection(ConnectionConsumer<C> action) {
             }
@@ -432,32 +512,37 @@ public Metamodel getMetamodel() {
             }
 
             @Override
-            public CriteriaBuilder getCriteriaBuilder() {
+            public EntityManager createEntityManager(@Nullable EntityManager.CreationOption... options) {
                 return null;
             }
 
             @Override
-            public Cache getCache() {
+            public EntityAgent createEntityAgent(@Nullable EntityAgent.CreationOption... options) {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
+            public EntityAgent createEntityAgent(@Nullable Map<?, ?> properties) {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType) {
+            public CriteriaBuilder getCriteriaBuilder() {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager(Map map) {
+            public Cache getCache() {
                 return null;
             }
 
             @Override
-            public EntityManager createEntityManager() {
+            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map<?, ?> map) {
+                return null;
+            }
+
+            @Override
+            public EntityManager createEntityManager(Map<?, ?> map) {
                 return null;
             }
 
@@ -469,6 +554,16 @@ public void close() {
             public void addNamedQuery(String name, Query query) {
             }
 
+            @Override
+            public <R> TypedQueryReference<R> addNamedQuery(String name, TypedQuery<R> query) {
+                return null;
+            }
+
+            @Override
+            public StatementReference addNamedStatement(String name, Statement statement) {
+                return null;
+            }
+
             @Override
             public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
             }
@@ -493,11 +588,27 @@ public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultTy
                 return null;
             }
 
+            @Override
+            public Map<String, StatementReference> getNamedStatements() {
+                return Map.of();
+            }
+
             @Override
             public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
                 return null;
             }
 
+            @Override
+            public <R> Map<String, ResultSetMapping<R>> getResultSetMappings(Class<R> resultType) {
+                return Map.of();
+            }
+
+            @Override
+            public <E> EntityListenerRegistration addListener(Class<E> entityType, Class<? extends Annotation> callbackType,
+                    Consumer<? super E> listener) {
+                return null;
+            }
+
             @Override
             public void runInTransaction(Consumer<EntityManager> work) {
             }
@@ -506,7 +617,347 @@ public void runInTransaction(Consumer<EntityManager> work) {
             public <R> R callInTransaction(Function<EntityManager, R> work) {
                 return null;
             }
+
+            @Override
+            public <H extends EntityHandler> void runInTransaction(Class<H> handlerClass, Consumer<H> work) {
+
+            }
+
+            @Override
+            public <R, H extends EntityHandler> R callInTransaction(Class<H> handlerClass, Function<H, R> work) {
+                return null;
+            }
         };
     }
 
+    static Function<InjectionPoint, Object> getPAFactory() {
+        return ip -> new EntityAgent() {
+            @Override
+            public void insert(Object entity) {
+
+            }
+
+            @Override
+            public void insertMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void update(Object entity) {
+
+            }
+
+            @Override
+            public void updateMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void delete(Object entity) {
+
+            }
+
+            @Override
+            public void deleteMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void upsert(Object entity) {
+
+            }
+
+            @Override
+            public void upsertMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void refresh(Object entity) {
+
+            }
+
+            @Override
+            public void refreshMultiple(List<?> entities) {
+
+            }
+
+            @Override
+            public void refresh(Object entity, LockModeType lockMode) {
+
+            }
+
+            @Override
+            public <T> T fetch(T association) {
+                return null;
+            }
+
+            @Override
+            public void addOption(Option option) {
+
+            }
+
+            @Override
+            public Set<Option> getOptions() {
+                return Set.of();
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(Class<T> entityClass, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T get(EntityGraph<T> graph, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> T find(Class<T> entityClass, Object id) {
+                return null;
+            }
+
+            @Override
+            public <T> T find(Class<T> entityClass, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> T find(EntityGraph<T> graph, Object id, FindOption... options) {
+                return null;
+            }
+
+            @Override
+            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids,
+                    FindOption... options) {
+                return List.of();
+            }
+
+            @Override
+            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+
+            }
+
+            @Override
+            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+
+            }
+
+            @Override
+            public CacheRetrieveMode getCacheRetrieveMode() {
+                return null;
+            }
+
+            @Override
+            public CacheStoreMode getCacheStoreMode() {
+                return null;
+            }
+
+            @Override
+            public void setProperty(String propertyName, Object value) {
+
+            }
+
+            @Override
+            public Map<String, Object> getProperties() {
+                return Map.of();
+            }
+
+            @Override
+            public Statement createStatement(String qlString) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createQuery(String qlString) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
+                return null;
+            }
+
+            @Override
+            public Statement createStatement(CriteriaStatement<?> statement) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
+                return null;
+            }
+
+            @Override
+            public Statement createNamedStatement(String name) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNamedQuery(String name) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public Statement createStatement(StatementReference reference) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
+                return null;
+            }
+
+            @Override
+            public Statement createNativeStatement(String sqlString) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNativeQuery(String sqlString) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
+                return null;
+            }
+
+            @Override
+            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
+                return null;
+            }
+
+            @Override
+            public <T> TypedQuery<T> createNativeQuery(String sqlString,
+                    ResultSetMapping<T> resultSetMapping) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
+                    Class<?>... resultClasses) {
+                return null;
+            }
+
+            @Override
+            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
+                    String... resultSetMappings) {
+                return null;
+            }
+
+            @Override
+            public <T> T unwrap(Class<T> type) {
+                return null;
+            }
+
+            @Override
+            public void close() {
+
+            }
+
+            @Override
+            public boolean isOpen() {
+                return false;
+            }
+
+            @Override
+            public EntityTransaction getTransaction() {
+                return null;
+            }
+
+            @Override
+            public EntityManagerFactory getEntityManagerFactory() {
+                return null;
+            }
+
+            @Override
+            public CriteriaBuilder getCriteriaBuilder() {
+                return null;
+            }
+
+            @Override
+            public Metamodel getMetamodel() {
+                return null;
+            }
+
+            @Override
+            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
+                return null;
+            }
+
+            @Override
+            public EntityGraph<?> getEntityGraph(String graphName) {
+                return null;
+            }
+
+            @Override
+            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
+                return null;
+            }
+
+            @Override
+            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+                return List.of();
+            }
+
+            @Override
+            public <C> void runWithConnection(ConnectionConsumer<C> action) {
+
+            }
+
+            @Override
+            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+                return null;
+            }
+
+            @Override
+            public String toString() {
+                return "MockEntityAgent";
+            }
+        };
+    }
 }
diff --git a/pom.xml b/pom.xml
index 21baa9e6..bcb9a48e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
       <version.weld>7.0.0.Beta2</version.weld>
       <version.mockito>5.23.0</version.mockito>
       <version.jakarta.ejb.api>4.0.1</version.jakarta.ejb.api>
-      <version.jpa-api>3.2.0</version.jpa-api>
+      <version.jpa-api>4.0.0-M4</version.jpa-api>
       <version.log4j>2.26.0</version.log4j>
       <!-- SpotBugs properties -->
       <version.spotbugs>4.10.2</version.spotbugs>
diff --git a/spock/src/main/java/org/jboss/weld/spock/WeldInitiator.java b/spock/src/main/java/org/jboss/weld/spock/WeldInitiator.java
index 97d66d6c..be648171 100644
--- a/spock/src/main/java/org/jboss/weld/spock/WeldInitiator.java
+++ b/spock/src/main/java/org/jboss/weld/spock/WeldInitiator.java
@@ -172,7 +172,7 @@ protected Builder self() {
         protected WeldInitiator build(Weld weld, List<Object> instancesToInject,
                 Set<Class<? extends Annotation>> scopesToActivate, Set<Bean<?>> beans) {
             return new WeldInitiator(weld, instancesToInject, scopesToActivate, beans, resources, getEjbFactory(),
-                    getPersistenceUnitFactory(), getPersistenceContextFactory());
+                    getPersistenceUnitFactory(), getPersistenceContextFactory(), getPersistenceAgentFactory());
         }
     }
 
@@ -180,9 +180,10 @@ private WeldInitiator(Weld weld, List<Object> instancesToInject, Set<Class<? ext
             Set<Bean<?>> beans,
             Map<String, Object> resources, Function<InjectionPoint, Object> ejbFactory,
             Function<InjectionPoint, Object> persistenceUnitFactory,
-            Function<InjectionPoint, Object> persistenceContextFactory) {
+            Function<InjectionPoint, Object> persistenceContextFactory,
+            Function<InjectionPoint, Object> persistenceAgentFactory) {
         super(weld, instancesToInject, scopesToActivate, beans, resources, ejbFactory, persistenceUnitFactory,
-                persistenceContextFactory);
+                persistenceContextFactory, persistenceAgentFactory);
     }
 
     public void addObjectToInjectInto(Object instanceToInjectInto) {