From 115e40b7b0fe64e7110dff4b03857dc45920482a Mon Sep 17 00:00:00 2001
From: "Jonathan S. Fisher" <exabrial@gmail.com>
Date: Mon, 19 May 2025 11:56:04 -0500
Subject: [PATCH 1/3] [2.7] Close #1806 - Have to the ability to dynamically
 set the Validation Group during a transaction. Add tests, update copyright
 headers.

---
 .../config/EntityManagerProperties.java       |  20 +-
 .../persistence.xml                           |   3 +-
 .../server/persistence.xml                    |   3 +-
 .../models/jpa/beanvalidation/Employee.java   |  13 +-
 .../jpa/beanvalidation/GermanPhone.java       |  19 ++
 .../models/jpa/beanvalidation/Phone.java      |  32 +++
 .../models/jpa/beanvalidation/USPhone.java    |  19 ++
 .../BeanValidationJunitTest.java              | 248 +++++++++++++++++-
 .../listeners/BeanValidationListener.java     |  50 +++-
 9 files changed, 392 insertions(+), 15 deletions(-)
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/GermanPhone.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Phone.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/USPhone.java

diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
index 0c673fe8aef..c453df05c48 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -319,6 +319,21 @@ public class EntityManagerProperties {
      * )
      */
     public static final String COMPOSITE_UNIT_PROPERTIES = PersistenceUnitProperties.COMPOSITE_UNIT_PROPERTIES;
+    
+    /**
+     * Overrides the Bean Validation Group(s) that will execute during a prePersist event. This should be a class or class[].
+     */
+    public static final String VALIDATION_GROUP_PRE_PERSIST = "eclipselink.validation.group.prePersist";
+    
+    /**
+     * Overrides the Bean Validation Group(s) that will execute during a preUpdate event. This should be a class or class[].
+     */
+    public static final String VALIDATION_GROUP_PRE_UPDATE = "eclipselink.validation.group.preUpdate";
+    
+    /**
+     * Overrides the Bean Validation Group(s) that will execute during a preRemove event. This should be a class or class[].
+     */
+    public static final String VALIDATION_GROUP_PRE_REMOVE = "eclipselink.validation.group.preRemove";
 
     private static final Set<String> supportedProperties = new HashSet<String>() {
 
@@ -344,6 +359,9 @@ public class EntityManagerProperties {
             add(PERSISTENCE_CONTEXT_COMMIT_ORDER);
             add(FLUSH_CLEAR_CACHE);
             add(COMPOSITE_UNIT_PROPERTIES);
+            add(VALIDATION_GROUP_PRE_PERSIST);
+            add(VALIDATION_GROUP_PRE_UPDATE);
+            add(VALIDATION_GROUP_PRE_REMOVE);
         }
     };
 
diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/persistence.xml
index f0669d13b98..418b6e8bb61 100644
--- a/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/persistence.xml
+++ b/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Employee</class>
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Project</class>
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Address</class>
+        <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Phone</class>
         <validation-mode>CALLBACK</validation-mode>
     </persistence-unit>
 </persistence>
diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/server/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/server/persistence.xml
index 8d971e898bb..52d030e3058 100644
--- a/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/server/persistence.xml
+++ b/jpa/eclipselink.jpa.test/resource/eclipselink-beanvalidation-model/server/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Employee</class>
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Project</class>
         <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Address</class>
+        <class>org.eclipse.persistence.testing.models.jpa.beanvalidation.Phone</class>
         <validation-mode>CALLBACK</validation-mode>
         <properties>
             <property name="eclipselink.target-server" value="@server-platform@"/>
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Employee.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Employee.java
index e0777a91864..eb8215c393b 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Employee.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Employee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,10 @@ public class Employee {
     @Valid
     @Embedded
     private Address adress;
+    
+    @Valid
+    @Embedded
+    private Phone phone;
 
    // ===========================================================
    // getters and setters for the state fields
@@ -105,4 +109,11 @@ void m1() {
         return "Employee {Id:" +  id + " name:" + name + "}";
     }
 
+    public Phone getPhone() {
+        return phone;
+    }
+
+    public void setPhone(Phone phone) {
+        this.phone = phone;
+    }
 }
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/GermanPhone.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/GermanPhone.java
new file mode 100644
index 00000000000..f33c91ad455
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/GermanPhone.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+// Contributors:
+
+package org.eclipse.persistence.testing.models.jpa.beanvalidation;
+
+public interface GermanPhone {
+
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Phone.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Phone.java
new file mode 100644
index 00000000000..a21720930f9
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/Phone.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+// Contributors:
+
+package org.eclipse.persistence.testing.models.jpa.beanvalidation;
+
+import javax.persistence.Embeddable;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+@Embeddable
+public class Phone {
+    @Pattern(regexp = "^\\+1 \\([0-9]{3}\\) [0-9]{3}-[0-9]{4}$", groups = { USPhone.class })
+    @Pattern(regexp = "^\\+49 \\([1-9]\\d{1,4}\\) \\d{3,8}-\\d{4}$", groups = { GermanPhone.class })
+    String phone;
+
+    public Phone() {}
+
+    public Phone(String phone) {
+         this.phone = phone;
+    }
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/USPhone.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/USPhone.java
new file mode 100644
index 00000000000..35c1fc434f7
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/beanvalidation/USPhone.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+// Contributors:
+
+package org.eclipse.persistence.testing.models.jpa.beanvalidation;
+
+public interface USPhone {
+
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
index 86a274bab90..5eeb6508cb1 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,13 +27,17 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 
+import org.eclipse.persistence.config.EntityManagerProperties;
 import org.eclipse.persistence.logging.SessionLog;
 import org.eclipse.persistence.mappings.ForeignReferenceMapping;
 import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
 import org.eclipse.persistence.testing.models.jpa.beanvalidation.Address;
 import org.eclipse.persistence.testing.models.jpa.beanvalidation.BeanValidationTableCreator;
 import org.eclipse.persistence.testing.models.jpa.beanvalidation.Employee;
+import org.eclipse.persistence.testing.models.jpa.beanvalidation.GermanPhone;
+import org.eclipse.persistence.testing.models.jpa.beanvalidation.Phone;
 import org.eclipse.persistence.testing.models.jpa.beanvalidation.Project;
+import org.eclipse.persistence.testing.models.jpa.beanvalidation.USPhone;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -65,6 +69,13 @@ public static Test suite() {
             suite.addTest(new BeanValidationJunitTest("testTraversableResolverPreventsLoadingOfLazyRelationships"));
             suite.addTest(new BeanValidationJunitTest("testTraversableResolverPreventsTraversingRelationshipMultipleTimes"));
             suite.addTest(new BeanValidationJunitTest("testValidateChangedData"));
+            suite.addTest(new BeanValidationJunitTest("testPersistIrishPhoneNoGroups"));
+            suite.addTest(new BeanValidationJunitTest("testPersistUSPhoneWithGermanGroup"));
+            suite.addTest(new BeanValidationJunitTest("testPersistGermanPhoneWithUSGroup"));
+            suite.addTest(new BeanValidationJunitTest("testPersistGermanPhoneWithGermanGroup"));
+            suite.addTest(new BeanValidationJunitTest("testRemoveGermanPhoneWithGermanGroup"));
+            suite.addTest(new BeanValidationJunitTest("testRemoveInvalidGermanPhoneWithGermanGroup"));
+            suite.addTest(new BeanValidationJunitTest("testUpdateInvalidGermanPhoneWithGermanGroup"));
         }
         return suite;
     }
@@ -396,6 +407,241 @@ public void testValidateChangedData() {
         }
     }
 
+    public void testPersistIrishPhoneNoGroups() {
+      EntityManager em = createEntityManager();
+      boolean gotConstraintViolations = false;
+      try {
+          // Persist an object with Irish phone number (valid default-phone)
+          beginTransaction(em);
+          Employee e = new Employee();
+          e.setPhone(new Phone("+353 (1) 555-5678"));
+          em.persist(e);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          closeEntityManager(em);
+      }
+      assertFalse("Did not expect Constraint Violation while persisting IrishPhone without groups", gotConstraintViolations);
+    }
+    
+    public void testPersistUSPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_PERSIST, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean gotConstraintViolations = false;
+      try {
+          // Persist an object with US phone number
+          beginTransaction(em);
+          Employee e = new Employee();
+          e.setPhone(new Phone("+1 (316) 555-5555"));
+          em.persist(e);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          closeEntityManager(em);
+      }
+      assertTrue("Did not get Constraint Violation while persisting USPhone with German group active", gotConstraintViolations);
+    }
+
+    public void testPersistGermanPhoneWithUSGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_PERSIST, new Class[]{ USPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean gotConstraintViolations = false;
+      try {
+          // Persist an object with German phone number (invalid without German group)
+          beginTransaction(em);
+          Employee e = new Employee();
+          e.setPhone(new Phone("+49 (221) 1555-5678")); 
+          em.persist(e);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          closeEntityManager(em);
+      }
+      assertTrue("Did not get Constraint Violation while persisting GermanPhone with US group active", gotConstraintViolations);
+    }
+
+    public void testPersistGermanPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_PERSIST, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean gotConstraintViolations = false;
+      try {
+          // Persist an object with German phone number (valid DE-phone)
+          beginTransaction(em);
+          Employee e = new Employee();
+          e.setPhone(new Phone("+49 (221) 1555-5678"));
+          em.persist(e);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          closeEntityManager(em);
+      }
+      assertFalse("Did not expect Constraint Violation while persisting GermanPhone with German group active", gotConstraintViolations);
+    }
+    
+    public void testRemoveGermanPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_REMOVE, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean removeSuccessful = false;
+      final int PK = 200;
+
+      try {
+          beginTransaction(em);
+          Employee e1 = new Employee(PK, "name", "name", 1337);
+          e1.setPhone(new Phone("+49 (221) 1555-5678"));
+          em.persist(e1);
+          commitTransaction(em);
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          throw ex;
+      }
+
+      try {
+          beginTransaction(em);
+          Employee e = em.find(Employee.class, PK);
+          em.remove(e);
+          commitTransaction(em);
+          removeSuccessful = true;
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          throw ex;
+      }
+
+      closeEntityManager(em);
+      assertTrue("Automatic Validation should not be executed for remove with German group", removeSuccessful);
+    }
+
+    public void testUpdateGermanPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_UPDATE, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean updateSuccessful = false;
+      final int PK = 201;
+
+      try {
+          beginTransaction(em);
+          Employee e1 = new Employee(PK, "name", "name", 1337);
+          em.persist(e1);
+          commitTransaction(em);
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          throw ex;
+      }
+
+      try {
+          beginTransaction(em);
+          Employee e = em.find(Employee.class, PK);
+          e.setPhone(new Phone("+49 (221) 1555-5678"));
+          commitTransaction(em);
+          updateSuccessful = true;
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) {
+              rollbackTransaction(em);
+          }
+          throw ex;
+      }
+
+      closeEntityManager(em);
+      assertTrue("Automatic Validation should not be executed for update with German group", updateSuccessful);
+    }
+    
+    public void testRemoveInvalidGermanPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_REMOVE, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean gotConstraintViolations = false;
+      final int PK = 300;
+
+      // first persist with a valid German phone
+      try {
+          beginTransaction(em);
+          Employee e1 = new Employee(PK, "name", "name", 0);
+          e1.setPhone(new Phone("+49 (221) 1555-5678"));
+          em.persist(e1);
+          commitTransaction(em);
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) rollbackTransaction(em);
+          closeEntityManager(em);
+          throw ex;
+      }
+
+      // now change to a US phone and attempt remove
+      try {
+          beginTransaction(em);
+          Employee e = em.find(Employee.class, PK);
+          e.setPhone(new Phone("123-456-7890"));
+          em.remove(e);
+          commitTransaction(em);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) rollbackTransaction(em);
+          closeEntityManager(em);
+      }
+      assertTrue("Expected Constraint Violation while removing with invalid GermanPhone under German group", gotConstraintViolations);
+    }
+
+    public void testUpdateInvalidGermanPhoneWithGermanGroup() {
+      Map<String, Object> props = new HashMap<>();
+      props.put(EntityManagerProperties.VALIDATION_GROUP_PRE_UPDATE, new Class[]{ GermanPhone.class });
+      EntityManager em = createEntityManager(props);
+      boolean gotConstraintViolations = false;
+      final int PK = 301;
+
+      // first persist without phone
+      try {
+          beginTransaction(em);
+          Employee e1 = new Employee(PK, "name", "name", 0);
+          em.persist(e1);
+          commitTransaction(em);
+      } catch (RuntimeException ex) {
+          if (isTransactionActive(em)) rollbackTransaction(em);
+          closeEntityManager(em);
+          throw ex;
+      }
+
+      // now change to a US phone and attempt update
+      try {
+          beginTransaction(em);
+          Employee e = em.find(Employee.class, PK);
+          e.setPhone(new Phone("123-456-7890"));
+          commitTransaction(em);
+      } catch (ConstraintViolationException e) {
+          assertTrue("Transaction not marked for roll back when ConstraintViolation is thrown", getRollbackOnly(em));
+          gotConstraintViolations = true;
+      } finally {
+          if (isTransactionActive(em)) rollbackTransaction(em);
+          closeEntityManager(em);
+      }
+      assertTrue("Expected Constraint Violation while updating with invalid GermanPhone under German group", gotConstraintViolations);
+    }
+    
     //--------------------Helper Methods ---------------//
     private boolean isInstantiated(Object entityObject, String attributeName, org.eclipse.persistence.sessions.Project project) {
         ForeignReferenceMapping mapping = (ForeignReferenceMapping) project.getDescriptor(Employee.class).getObjectBuilder().getMappingForAttributeName(attributeName);
diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/listeners/BeanValidationListener.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/listeners/BeanValidationListener.java
index f92b68239f3..87511737ca4 100644
--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/listeners/BeanValidationListener.java
+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/listeners/BeanValidationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,20 @@
 import javax.validation.ValidatorFactory;
 import javax.validation.groups.Default;
 
+import org.eclipse.persistence.config.EntityManagerProperties;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.descriptors.DescriptorEvent;
 import org.eclipse.persistence.descriptors.DescriptorEventAdapter;
 import org.eclipse.persistence.descriptors.FetchGroupManager;
+import org.eclipse.persistence.exceptions.BeanValidationException;
 import org.eclipse.persistence.internal.localization.ExceptionLocalization;
 import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
 import org.eclipse.persistence.internal.sessions.UnitOfWorkImpl;
 import org.eclipse.persistence.mappings.DatabaseMapping;
 import org.eclipse.persistence.mappings.ForeignReferenceMapping;
 
+
 /**
  * Responsible for performing automatic bean validation on call back events.
  * @author Mitesh Meswani
@@ -72,7 +75,7 @@ public BeanValidationListener(ValidatorFactory validatorFactory, Class[] groupPr
 
     @Override
     public void prePersist (DescriptorEvent event) {
-        //  since we are using prePersist to perform validation, invlid data may get inserted into database as shown by
+        //  since we are using prePersist to perform validation, invalid data may get inserted into database as shown by
         // following example
         //    tx.begin()
         //    e = new MyEntity(...);
@@ -81,19 +84,38 @@ public void prePersist (DescriptorEvent event) {
         //    tx.commit();
         //  "invalid data" would get inserted into database.
         //
-        //  preInsert can be used to work around above issue. Howerver, the JPA spec does not itent it.
+        //  preInsert can be used to work around above issue. However, the JPA spec does not itent it.
         //  This might be corrected in next iteration of spec
-        validateOnCallbackEvent(event, "prePersist", groupPrePersit);
+        Object overrideGroups = event.getSession().getParent().getProperties().get(EntityManagerProperties.VALIDATION_GROUP_PRE_PERSIST);
+        if (overrideGroups != null) {
+            if (overrideGroups instanceof Class) {
+                overrideGroups = new Class[] { (Class) overrideGroups };
+            } else if (!(overrideGroups instanceof Class[])) {
+                throw new BeanValidationException("prePersist validation group must be a Class or Class Array:" + overrideGroups);
+            }
+            validateOnCallbackEvent(event, "prePersist", (Class[]) overrideGroups);
+        } else {
+            validateOnCallbackEvent(event, "prePersist", groupPrePersit);
+        }
     }
 
-    @Override
     public void aboutToUpdate(DescriptorEvent event) {
         Object source = event.getSource();
         UnitOfWorkImpl unitOfWork = (UnitOfWorkImpl )event.getSession();
         // preUpdate is also generated for deleted objects that were modified in this UOW.
         // Do not perform preUpdate validation for such objects as preRemove would have already been called.
-        if(!unitOfWork.isObjectDeleted(source)) {
-            validateOnCallbackEvent(event, "preUpdate", groupPreUpdate);
+        if (!unitOfWork.isObjectDeleted(source)) {
+          Object overrideGroups = event.getSession().getParent().getProperties().get(EntityManagerProperties.VALIDATION_GROUP_PRE_UPDATE);
+          if (overrideGroups != null) {
+              if (overrideGroups instanceof Class) {
+                  overrideGroups = new Class[] { (Class) overrideGroups };
+              } else if (!(overrideGroups instanceof Class[])) {
+                  throw new BeanValidationException("preUpdate validation group must be a Class or Class Array:" + overrideGroups);
+              }
+              validateOnCallbackEvent(event, "preUpdate", (Class[]) overrideGroups);
+          } else {
+              validateOnCallbackEvent(event, "preUpdate", groupPreUpdate);
+          }
         }
     }
 
@@ -104,9 +126,17 @@ public void preUpdateWithChanges(DescriptorEvent event) {
 
     @Override
     public void preRemove (DescriptorEvent event) {
-        if(groupPreRemove != null) { //No validation performed on preRemove if user has not explicitly specified a validation group
-           validateOnCallbackEvent(event, "preRemove", groupPreRemove);
-        }
+      Object overrideGroups = event.getSession().getParent().getProperties().get(EntityManagerProperties.VALIDATION_GROUP_PRE_REMOVE);
+      if (overrideGroups != null) {
+          if (overrideGroups instanceof Class) {
+              overrideGroups = new Class[] { (Class) overrideGroups };
+          } else if (!(overrideGroups instanceof Class[])) {
+              throw new BeanValidationException("preRemove validation group must be a Class or Class Array:" + overrideGroups);
+          }
+          validateOnCallbackEvent(event, "preRemove", (Class[]) overrideGroups);
+      } else if (groupPreRemove != null) { // No validation performed on preRemove if user has not explicitly specified a validation group
+          validateOnCallbackEvent(event, "preRemove", groupPreRemove);
+      }
     }
 
     private void validateOnCallbackEvent(DescriptorEvent event, String callbackEventName, Class[] validationGroup) {

From 185202836e07004a26ecf8e4ee82f0091adbc29c Mon Sep 17 00:00:00 2001
From: "Jonathan S. Fisher" <exabrial@gmail.com>
Date: Mon, 19 May 2025 15:13:00 -0500
Subject: [PATCH 2/3] Apologies for yET ANOTHER push. Discovered a test no
 marked to be run

---
 .../tests/jpa/beanvalidation/BeanValidationJunitTest.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
index 5eeb6508cb1..fa743922448 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/beanvalidation/BeanValidationJunitTest.java
@@ -74,6 +74,7 @@ public static Test suite() {
             suite.addTest(new BeanValidationJunitTest("testPersistGermanPhoneWithUSGroup"));
             suite.addTest(new BeanValidationJunitTest("testPersistGermanPhoneWithGermanGroup"));
             suite.addTest(new BeanValidationJunitTest("testRemoveGermanPhoneWithGermanGroup"));
+            suite.addTest(new BeanValidationJunitTest("testUpdateGermanPhoneWithGermanGroup"));
             suite.addTest(new BeanValidationJunitTest("testRemoveInvalidGermanPhoneWithGermanGroup"));
             suite.addTest(new BeanValidationJunitTest("testUpdateInvalidGermanPhoneWithGermanGroup"));
         }

From 187f36a5408daee6e9e4811a9b81252d90a4d004 Mon Sep 17 00:00:00 2001
From: "Jonathan S. Fisher" <exabrial@gmail.com>
Date: Tue, 20 May 2025 12:24:45 -0500
Subject: [PATCH 3/3] update prop names from feedback

---
 .../eclipse/persistence/config/EntityManagerProperties.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
index c453df05c48..7cc403d7977 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java
@@ -323,17 +323,17 @@ public class EntityManagerProperties {
     /**
      * Overrides the Bean Validation Group(s) that will execute during a prePersist event. This should be a class or class[].
      */
-    public static final String VALIDATION_GROUP_PRE_PERSIST = "eclipselink.validation.group.prePersist";
+    public static final String VALIDATION_GROUP_PRE_UPDATET = "eclipselink.beanvalidation.group.pre-persist";
     
     /**
      * Overrides the Bean Validation Group(s) that will execute during a preUpdate event. This should be a class or class[].
      */
-    public static final String VALIDATION_GROUP_PRE_UPDATE = "eclipselink.validation.group.preUpdate";
+    public static final String VALIDATION_GROUP_PRE_UPDATE = "eclipselink.beanvalidation.group.pre-update";
     
     /**
      * Overrides the Bean Validation Group(s) that will execute during a preRemove event. This should be a class or class[].
      */
-    public static final String VALIDATION_GROUP_PRE_REMOVE = "eclipselink.validation.group.preRemove";
+    public static final String VALIDATION_GROUP_PRE_REMOVE = "eclipselink.beanvalidation.group.pre-remove";
 
     private static final Set<String> supportedProperties = new HashSet<String>() {