From 116033f05ea9e76e3dd157d47649387e5d0e41d6 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Thu, 13 Jun 2024 11:17:46 +0200
Subject: [PATCH 1/2] LoggingLocalization performance improvement (#2174)

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 .../junit/localization/LocalizationTest.java  |  5 ++++-
 .../localization/EclipseLinkLocalization.java | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
index 7d9a4e61a9d..a3041d0dcb6 100644
--- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
+++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.eclipse.persistence.internal.localization.EclipseLinkLocalization;
 import org.eclipse.persistence.internal.localization.LoggingLocalization;
 
 public class LocalizationTest {
@@ -27,5 +28,7 @@ public void test() {
                 "EclipseLink, version: EXAMPLE", LoggingLocalization.buildMessage("topLink_version", new Object[] { "EXAMPLE" }));
         Assert.assertEquals("LoggingLocalization.buildMessage could not find the correct translation.",
                 "message_not_exist (There is no English translation for this message.)", LoggingLocalization.buildMessage("message_not_exist"));
+        Assert.assertEquals("EclipseLinkLocalization.buildMessage could not find the correct translation.",
+                "somekey1 (There is no English translation for this message.)", EclipseLinkLocalization.buildMessage("AAAAUnknownClass", "somekey1", null, true));
     }
 }
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java
index 753587cf8df..b22d829b8c6 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 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
@@ -29,6 +29,9 @@
  */
 public abstract class EclipseLinkLocalization {
 
+    // Get the current language's NoTranslationForThisLocale message.
+    private static final String NO_TRANSLATION_MESSAGE = ResourceBundle.getBundle("org.eclipse.persistence.internal.localization.i18n.EclipseLinkLocalizationResource", Locale.getDefault()).getString("NoTranslationForThisLocale");
+
     /**
      * Return the message for the given exception class and error number.
      */
@@ -65,13 +68,18 @@ public static String buildMessage(String localizationClassName, String key, Obje
         } catch (java.util.MissingResourceException mre) {
             if (translate) {
                 // Found bundle, but couldn't find translation.
-                // Get the current language's NoTranslationForThisLocale message.
-                bundle = ResourceBundle.getBundle("org.eclipse.persistence.internal.localization.i18n.EclipseLinkLocalizationResource", Locale.getDefault());
-                String noTranslationMessage = bundle.getString("NoTranslationForThisLocale");
-                   return MessageFormat.format(message, arguments) + noTranslationMessage;
-            }
+                // Use the current language's NoTranslationForThisLocale message.
+                if (arguments == null) {
+                    return message + NO_TRANSLATION_MESSAGE;
+                } else {
+                    return MessageFormat.format(message, arguments) + NO_TRANSLATION_MESSAGE;
+                }            }
+        }
+        if (arguments == null) {
+            return message;
+        } else {
+            return MessageFormat.format(message, arguments);
         }
-        return MessageFormat.format(message, arguments);
     }
 
 }

From 6de65afa2ab627faace8a742846b0c5e5987798c Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Mon, 26 Aug 2024 11:06:41 +0200
Subject: [PATCH 2/2] OptimisticLockException while using L2 cache fix (#2250)

Under specific conditions is org.eclipse.persistence.exceptions.OptimisticLockException incorrectly thrown.
Environment conditions are:

    JPA L2 cache enabled
    Weaving is applied to used entities
    @Version annotation is used

Test org.eclipse.persistence.testing.tests.advanced2.weave.WeaveVersionTest#testWeavedEntitiesWithVersionL2Cache describe sequence of steps which leads into org.eclipse.persistence.exceptions.OptimisticLockException if fix is not applied.

Purpose of fix in org.eclipse.persistence.internal.sessions.UnitOfWorkImpl#cloneAndRegisterObject(java.lang.Object, org.eclipse.persistence.internal.identitymaps.CacheKey, org.eclipse.persistence.internal.identitymaps.CacheKey, org.eclipse.persistence.descriptors.ClassDescriptor) is update current working object with non-invalidated version from UnitOfWork scope if original is still invalid.

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 .../internal/sessions/UnitOfWorkImpl.java     |   5 +-
 .../osgi/persistence.xml                      |  15 +-
 .../persistence.xml                           |  15 +-
 .../spring/persistence.xml                    |  15 +-
 .../models/jpa/weave/IsolatedEntity.java      |  55 +++++
 .../testing/models/jpa/weave/Location.java    |  74 +++++++
 .../testing/models/jpa/weave/Node.java        |  74 +++++++
 .../testing/models/jpa/weave/Order.java       |  68 ++++++
 .../tests/jpa/FullRegressionTestSuite.java    |   4 +-
 .../jpa/advanced/WeaveVersionTestSuite.java   | 208 ++++++++++++++++++
 10 files changed, 528 insertions(+), 5 deletions(-)
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/IsolatedEntity.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Location.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Node.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Order.java
 create mode 100644 jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/WeaveVersionTestSuite.java

diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/UnitOfWorkImpl.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/UnitOfWorkImpl.java
index 3e03ac850a2..d5f8fb43134 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/UnitOfWorkImpl.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/UnitOfWorkImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -1078,6 +1078,9 @@ public Object cloneAndRegisterObject(Object original, CacheKey parentCacheKey, C
             }
         }
         try {
+            if (isConsideredInvalid(original, parentCacheKey, descriptor) && unitOfWorkCacheKey.getObject() != null) {
+                original = unitOfWorkCacheKey.getObject();
+            }
             // bug:6167576   Must acquire the lock before cloning.
             workingClone = builder.instantiateWorkingCopyClone(original, this);
             // PERF: Cache the primary key if implements PersistenceEntity.
diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/osgi/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/osgi/persistence.xml
index a35ea465a8f..c88cff98351 100644
--- a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/osgi/persistence.xml
+++ b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/osgi/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2019 IBM Corporation. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -177,4 +177,17 @@
         </properties>
     </persistence-unit>
 
+    <persistence-unit name="pu-with-dynamic-weaving" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.IsolatedEntity</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Location</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Node</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Order</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
+        <properties>
+            <property name="eclipselink.weaving" value="true"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/persistence.xml
index 565339e5b7e..492b7157d3d 100644
--- a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/persistence.xml
+++ b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2019 IBM Corporation. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -607,4 +607,17 @@
         </properties>
     </persistence-unit>
 
+    <persistence-unit name="pu-with-dynamic-weaving" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.IsolatedEntity</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Location</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Node</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Order</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
+        <properties>
+            <property name="eclipselink.weaving" value="true"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/spring/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/spring/persistence.xml
index fe6cfce1469..ad7b15c73bd 100644
--- a/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/spring/persistence.xml
+++ b/jpa/eclipselink.jpa.test/resource/eclipselink-annotation-model/spring/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -250,4 +250,17 @@
         </properties>
     </persistence-unit>
 
+    <persistence-unit name="pu-with-dynamic-weaving" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.IsolatedEntity</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Location</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Node</class>
+        <class>org.eclipse.persistence.testing.models.jpa.weave.Order</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
+        <properties>
+            <property name="eclipselink.weaving" value="true"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/IsolatedEntity.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/IsolatedEntity.java
new file mode 100644
index 00000000000..b49c71f0df4
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/IsolatedEntity.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2024 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
+ */
+package org.eclipse.persistence.testing.models.jpa.weave;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name="JPA21_ISOLATED_ENTITY")
+public class IsolatedEntity {
+
+    @Id
+    protected String id;
+
+    @Version
+    protected Integer version;
+
+    public IsolatedEntity() {
+        super();
+    }
+
+    public IsolatedEntity(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        IsolatedEntity that = (IsolatedEntity) o;
+        return Objects.equals(id, that.id) && Objects.equals(version, that.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, version);
+    }
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Location.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Location.java
new file mode 100644
index 00000000000..1596286e261
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Location.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024 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
+ */
+package org.eclipse.persistence.testing.models.jpa.weave;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name="JPA21_LOCATION")
+public class Location {
+
+    @Id
+    protected Long id;
+
+    protected String locationId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    protected Node node;
+
+    @Version
+    protected Integer version;
+
+    public Location(long id, String locationId) {
+        this.id = id;
+        this.locationId = locationId;
+    }
+
+    protected Location() {
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public String getLocationId() {
+        return this.locationId;
+    }
+
+    public Node getNode() {
+        return node;
+    }
+
+    public void setNode(Node node) {
+        this.node = node;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Location location = (Location) o;
+        return Objects.equals(id, location.id) && Objects.equals(locationId, location.locationId) && Objects.equals(node, location.node) && Objects.equals(version, location.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, locationId, node, version);
+    }
+}
\ No newline at end of file
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Node.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Node.java
new file mode 100644
index 00000000000..96ad6279889
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Node.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024 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
+ */
+package org.eclipse.persistence.testing.models.jpa.weave;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name="JPA21_NODE")
+public class Node {
+
+    @Id
+    protected String id;
+
+    protected int availableBufferCapacity = 10;
+
+    @Version
+    protected Integer version;
+
+    public Node(String id) {
+        this.id = id;
+    }
+
+    protected Node() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getAvailableBufferCapacity() {
+        return availableBufferCapacity;
+    }
+
+    public void reserveBufferCapacity() {
+        availableBufferCapacity--;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+/*
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+*/
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Node node = (Node) o;
+        return availableBufferCapacity == node.availableBufferCapacity && Objects.equals(id, node.id) && Objects.equals(version, node.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, availableBufferCapacity, version);
+    }
+}
\ No newline at end of file
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Order.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Order.java
new file mode 100644
index 00000000000..6ce37330bd4
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/weave/Order.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 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
+ */
+package org.eclipse.persistence.testing.models.jpa.weave;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name="JPA21_ORDER_1")
+public class Order {
+
+    @Id
+    protected Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    protected Node node;
+
+    @Version
+    protected Integer version;
+
+    protected Order() {
+    }
+
+    public Order(long id) {
+
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public Node getNode() {
+        return node;
+    }
+
+    public void setNode(Node destinationNode) {
+        this.node = destinationNode;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Order order = (Order) o;
+        return Objects.equals(id, order.id) && Objects.equals(node, order.node) && Objects.equals(version, order.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, node, version);
+    }
+}
\ No newline at end of file
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
index 42e148f896c..11b5ba79de6 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 1998, 2020 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -54,6 +54,7 @@
 import org.eclipse.persistence.testing.tests.jpa.advanced.ReportQueryMultipleReturnTestSuite;
 import org.eclipse.persistence.testing.tests.jpa.advanced.SQLResultSetMappingTestSuite;
 import org.eclipse.persistence.testing.tests.jpa.advanced.UpdateAllQueryAdvancedJunitTest;
+import org.eclipse.persistence.testing.tests.jpa.advanced.WeaveVersionTestSuite;
 import org.eclipse.persistence.testing.tests.jpa.advanced.compositepk.AdvancedCompositePKJunitTest;
 import org.eclipse.persistence.testing.tests.jpa.advanced.concurrency.ConcurrencyTest;
 import org.eclipse.persistence.testing.tests.jpa.advanced.concurrency.LifecycleJUnitTest;
@@ -162,6 +163,7 @@ public static Test suite() {
         suite.addTest(NamedQueryJUnitTest.suite());
         suite.addTest(EntityEmbeddableTest.suite());
         suite.addTest(InvalidNamedQueryTest.suite());
+        suite.addTest(WeaveVersionTestSuite.suite());
         fullSuite.addTest(suite);
 
         // Inheritance model.
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/WeaveVersionTestSuite.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/WeaveVersionTestSuite.java
new file mode 100644
index 00000000000..6fd659dfcea
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/WeaveVersionTestSuite.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2024 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
+ */
+package org.eclipse.persistence.testing.tests.jpa.advanced;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
+import org.eclipse.persistence.testing.models.jpa.weave.IsolatedEntity;
+import org.eclipse.persistence.testing.models.jpa.weave.Location;
+import org.eclipse.persistence.testing.models.jpa.weave.Node;
+import org.eclipse.persistence.testing.models.jpa.weave.Order;
+
+public class WeaveVersionTestSuite extends JUnitTestCase {
+
+    private static final String NODE_01 = "NODE_01";
+    private static final String LOCATION_01 = "LOCATION_01";
+    private static final String PROCESS_01 = "PROCESS_01";
+
+    public WeaveVersionTestSuite() {
+    }
+
+    public WeaveVersionTestSuite(String name) {
+        super(name);
+        setPuName(getPersistenceUnitName());
+    }
+
+    @Override
+    public String getPersistenceUnitName() {
+        return "pu-with-dynamic-weaving";
+    }
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite();
+        suite.setName("WeaveVersionTestSuite");
+        suite.addTest(new WeaveVersionTestSuite("testWeavedEntitiesWithVersionL2Cache"));
+        return suite;
+    }
+
+    @Override
+    public void setUp() {
+        EntityManager em = createEntityManager();
+        beginTransaction(em);
+        try {
+            Node node = new Node(NODE_01);
+            em.persist(node);
+            Location destinationLocation = new Location(1L, LOCATION_01);
+            destinationLocation.setNode(node);
+            em.persist(destinationLocation);
+            commitTransaction(em);
+        } finally {
+            if (this.isTransactionActive(em)) {
+                rollbackTransaction(em);
+            }
+            closeEntityManager(em);
+        }
+    }
+
+    //Sequence of steps which triggered org.eclipse.persistence.exceptions.OptimisticLockException before related fix was applied.
+    //Required conditions are: JPA L2 cache enabled, Weaving enabled and @Version field annotation is used
+    public void testWeavedEntitiesWithVersionL2Cache() {
+        EntityManagerFactory emf = getEntityManagerFactory();
+        cleanup();
+        emf.getCache().evictAll();
+
+        //Step 01
+        {
+            final long toKey = 1L;
+
+            EntityManager em = createEntityManager();
+            beginTransaction(em);
+            try {
+                Order order = new Order(toKey);
+                em.persist(order);
+                em.flush();
+                Location location = em
+                        .createQuery("SELECT l FROM Location l WHERE l.locationId=:locationId", Location.class)
+                        .setParameter("locationId", LOCATION_01)
+                        .getSingleResult();
+                order.setNode(location.getNode());
+                commitTransaction(em);
+            } finally {
+                if (this.isTransactionActive(em)) {
+                    rollbackTransaction(em);
+                }
+                closeEntityManager(em);
+            }
+        }
+
+        //Step 02
+        {
+            final long toKey = 1L;
+
+            EntityManager em = createEntityManager();
+            beginTransaction(em);
+            try {
+                IsolatedEntity serialProcess = new IsolatedEntity(PROCESS_01);
+                em.persist(serialProcess);
+                em.flush();
+                Order order = em.find(Order.class, toKey);
+                order.getNode().reserveBufferCapacity();
+                em.merge(order);
+                em.merge(order.getNode());
+                commitTransaction(em);
+            } finally {
+                if (this.isTransactionActive(em)) {
+                    rollbackTransaction(em);
+                }
+                closeEntityManager(em);
+            }
+
+        }
+        cleanup();
+        emf.getCache().evictAll();
+
+        //Step 03
+        {
+            final long toKey = 2L;
+
+            EntityManager em = createEntityManager();
+            beginTransaction(em);
+            try {
+                Order order = new Order(toKey);
+                em.persist(order);
+                em.flush();
+                Location destinationLocation = em
+                        .createQuery("SELECT l FROM Location l WHERE l.locationId=:locationId", Location.class)
+                        .setParameter("locationId", LOCATION_01)
+                        .getSingleResult();
+                order.setNode(destinationLocation.getNode());
+                commitTransaction(em);
+            } finally {
+                if (this.isTransactionActive(em)) {
+                    rollbackTransaction(em);
+                }
+                closeEntityManager(em);
+            }
+        }
+
+        //Step 04
+        {
+            final long toKey = 2L;
+
+            EntityManager em = createEntityManager();
+            beginTransaction(em);
+            try {
+                IsolatedEntity serialProcess = new IsolatedEntity(PROCESS_01);
+                em.persist(serialProcess);
+                em.flush();
+                Order order = em.find(Order.class, toKey);
+                order.getNode().reserveBufferCapacity();
+                em.merge(order);
+                em.merge(order.getNode());
+            } finally {
+                if (this.isTransactionActive(em)) {
+                    rollbackTransaction(em);
+                }
+                closeEntityManager(em);
+            }
+        }
+    }
+
+    public void cleanup() {
+        EntityManager em = createEntityManager();
+        em.getTransaction().begin();
+        try {
+            em.createQuery("delete from IsolatedEntity s").executeUpdate();
+            em.createQuery("delete from Order t").executeUpdate();
+            em.createQuery("UPDATE Node tn SET tn.availableBufferCapacity =10").executeUpdate();
+            commitTransaction(em);
+        } finally {
+            if (this.isTransactionActive(em)) {
+                rollbackTransaction(em);
+            }
+            closeEntityManager(em);
+        }
+    }
+
+    @Override
+    public void tearDown() {
+        EntityManager em = createEntityManager();
+        em.getTransaction().begin();
+        try {
+            em.createQuery("delete from Location l").executeUpdate();
+            em.createQuery("delete from Order t").executeUpdate();
+            em.createQuery("delete from Node t").executeUpdate();
+            em.createQuery("delete from IsolatedEntity s").executeUpdate();
+            commitTransaction(em);
+        } finally {
+            if (this.isTransactionActive(em)) {
+                rollbackTransaction(em);
+            }
+            closeEntityManager(em);
+        }
+    }
+}