Skip to content

Jpa cleanup #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xael-fry merged 2 commits into from
Nov 15, 2025
Merged

Jpa cleanup #1539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f6f04
remove usage of deprecated method
aleksandy Nov 13, 2025
15c4786
replace threadlocal by local variable
aleksandy Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
replace threadlocal by local variable
  • Loading branch information
@aleksandy
aleksandy committed Nov 13, 2025
commit 15c47864d878fff7963873742a8d1be30f551037
85 changes: 38 additions & 47 deletions framework/src/play/db/jpa/JPABase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import jakarta.persistence.CascadeType;
Expand All @@ -29,8 +28,6 @@
import org.hibernate.internal.SessionImpl;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.type.EntityType;
import org.hibernate.type.Type;

import play.PlayPlugin;
import play.exceptions.UnexpectedException;
Expand All @@ -49,11 +46,11 @@ public void _save() {
em(dbName).persist(this);
PlayPlugin.postEvent("JPASupport.objectPersisted", this);
}
avoidCascadeSaveLoops.set(new HashSet<>());
var avoidCascadeSaveLoops = new HashSet<JPABase>();
try {
saveAndCascade(true);
saveAndCascade(avoidCascadeSaveLoops, true);
} finally {
avoidCascadeSaveLoops.get().clear();
avoidCascadeSaveLoops.clear();
}
try {
em(dbName).flush();
Expand All @@ -64,11 +61,10 @@ public void _save() {
throw e;
}
}
avoidCascadeSaveLoops.set(new HashSet<>());
try {
saveAndCascade(false);
saveAndCascade(avoidCascadeSaveLoops, false);
} finally {
avoidCascadeSaveLoops.get().clear();
avoidCascadeSaveLoops.clear();
}
}

Expand All @@ -77,11 +73,11 @@ public void _delete() {
String dbName = JPA.getDBName(this.getClass());

try {
avoidCascadeSaveLoops.set(new HashSet<>());
var avoidCascadeSaveLoops = new HashSet<JPABase>();
try {
saveAndCascade(true);
saveAndCascade(avoidCascadeSaveLoops, true);
} finally {
avoidCascadeSaveLoops.get().clear();
avoidCascadeSaveLoops.clear();
}
em(dbName).remove(this);
try {
Expand All @@ -93,11 +89,10 @@ public void _delete() {
throw e;
}
}
avoidCascadeSaveLoops.set(new HashSet<>());
try {
saveAndCascade(false);
saveAndCascade(avoidCascadeSaveLoops, false);
} finally {
avoidCascadeSaveLoops.get().clear();
avoidCascadeSaveLoops.clear();
}
PlayPlugin.postEvent("JPASupport.objectDeleted", this);
} catch (PersistenceException e) {
Expand All @@ -114,11 +109,10 @@ public Object _key() {

// ~~~ SAVING
public transient boolean willBeSaved = false;
private static final ThreadLocal<Set<JPABase>> avoidCascadeSaveLoops = new ThreadLocal<>();

private void saveAndCascade(boolean willBeSaved) {
private void saveAndCascade(Set<JPABase> avoidCascadeSaveLoops, boolean willBeSaved) {
this.willBeSaved = willBeSaved;
if (!avoidCascadeSaveLoops.get().add(this)) {
if (!avoidCascadeSaveLoops.add(this)) {
return;
}
if (willBeSaved) {
Expand Down Expand Up @@ -152,34 +146,31 @@ private void saveAndCascade(boolean willBeSaved) {
}
if (doCascade) {
Object value = field.get(this);
if (value != null) {
if (value instanceof PersistentMap) {
if (((PersistentMap) value).wasInitialized()) {
if (value instanceof PersistentMap map) {
if (map.wasInitialized()) {
cascadeOrphans(map, avoidCascadeSaveLoops, willBeSaved);

cascadeOrphans((PersistentCollection) value, willBeSaved);

for (Object o : ((Map) value).values()) {
saveAndCascadeIfJPABase(o, willBeSaved);
}
for (Object o : map.values()) {
saveAndCascadeIfJPABase(o, avoidCascadeSaveLoops, willBeSaved);
}
} else if (value instanceof PersistentCollection) {
cascadeOrphans((PersistentCollection) value, willBeSaved);
}
} else if (value instanceof PersistentCollection collection) {
cascadeOrphans(collection, avoidCascadeSaveLoops, willBeSaved);

for (Object o : (Collection) value) {
saveAndCascadeIfJPABase(o, willBeSaved);
}
} else if (value instanceof Collection) {
for (Object o : (Collection) value) {
saveAndCascadeIfJPABase(o, willBeSaved);
}
} else if (value instanceof HibernateProxy && value instanceof JPABase) {
if (!((HibernateProxy) value).getHibernateLazyInitializer().isUninitialized()) {
((JPABase) ((HibernateProxy) value).getHibernateLazyInitializer().getImplementation())
.saveAndCascade(willBeSaved);
}
} else if (value instanceof JPABase) {
((JPABase) value).saveAndCascade(willBeSaved);
for (Object o : (Collection) value) {
saveAndCascadeIfJPABase(o, avoidCascadeSaveLoops, willBeSaved);
}
} else if (value instanceof Collection collection) {
for (Object o : collection) {
saveAndCascadeIfJPABase(o, avoidCascadeSaveLoops, willBeSaved);
}
} else if (value instanceof HibernateProxy proxy && value instanceof JPABase) {
if (!proxy.getHibernateLazyInitializer().isUninitialized()) {
((JPABase) proxy.getHibernateLazyInitializer().getImplementation())
.saveAndCascade(avoidCascadeSaveLoops, willBeSaved);
}
} else {
saveAndCascadeIfJPABase(value, avoidCascadeSaveLoops, willBeSaved);
}
}
}
Expand All @@ -188,7 +179,7 @@ private void saveAndCascade(boolean willBeSaved) {
}
}

private void cascadeOrphans(PersistentCollection persistentCollection, boolean willBeSaved) {
private void cascadeOrphans(PersistentCollection persistentCollection, Set<JPABase> avoidCascadeSaveLoops, boolean willBeSaved) {
String dbName = JPA.getDBName(this.getClass());

SessionImpl session = JPA.em(dbName).unwrap(SessionImpl.class);
Expand All @@ -201,15 +192,15 @@ private void cascadeOrphans(PersistentCollection persistentCollection, boolean w
String entityName = cp.getAttributeMapping().getElementDescriptor().getJavaType().getTypeName();
Collection orphans = ce.getOrphans(entityName, persistentCollection);
for (Object o : orphans) {
saveAndCascadeIfJPABase(o, willBeSaved);
saveAndCascadeIfJPABase(o, avoidCascadeSaveLoops, willBeSaved);
}
}
}
}

private static void saveAndCascadeIfJPABase(Object o, boolean willBeSaved) {
if (o instanceof JPABase) {
((JPABase) o).saveAndCascade(willBeSaved);
private static void saveAndCascadeIfJPABase(Object o, Set<JPABase> avoidCascadeSaveLoops, boolean willBeSaved) {
if (o instanceof JPABase jpaBase) {
jpaBase.saveAndCascade(avoidCascadeSaveLoops, willBeSaved);
}
}

Expand Down