From 0f01965a7b3a2bbcc4b143e4af5689da110dfd2c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 2 Feb 2022 11:11:19 +0100 Subject: [PATCH] Removed onPersistTrigger --- .../main/java/io/ebean/bean/EntityBean.java | 5 -- .../server/core/PersistRequestBean.java | 6 +- .../java/org/tests/o2o/OtoLevelALazy.java | 44 ----------- .../java/org/tests/o2o/OtoLevelBLazy.java | 76 ------------------- .../o2o/TestOneToOneSaveWithoutChanges.java | 24 +----- 5 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 ebean-test/src/test/java/org/tests/o2o/OtoLevelALazy.java delete mode 100644 ebean-test/src/test/java/org/tests/o2o/OtoLevelBLazy.java diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java index 70b0273f4..ee54991ad 100644 --- a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java +++ b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java @@ -109,9 +109,4 @@ public interface EntityBean extends Serializable { throw new NotEnhancedException(); } - /** - * Recalcs the bean. This is invoked by PersistRequestBean. - */ - default void _ebean_onPersistTrigger(String profileEventId) {}; - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 396170c63..2fbf362ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -148,12 +148,8 @@ public final class PersistRequestBean extends PersistRequest implements BeanP super(server, t, persistExecute); this.entityBean = (EntityBean) bean; this.intercept = entityBean._ebean_getIntercept(); - this.beanDescriptor = mgr.getBeanDescriptor(); - boolean isReference = beanDescriptor.isReference(intercept); - if(!isReference) { - this.entityBean._ebean_onPersistTrigger(type.profileEventId); - } this.beanManager = mgr; + this.beanDescriptor = mgr.getBeanDescriptor(); this.beanPersistListener = beanDescriptor.persistListener(); this.bean = bean; this.parentBean = parentBean; diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelALazy.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelALazy.java deleted file mode 100644 index 0c5355b5f..000000000 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelALazy.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.tests.o2o; - - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; - -@Entity -public class OtoLevelALazy { - - @Id - private Long id; - - private String name; - - @OneToOne(mappedBy = "a", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) - private OtoLevelBLazy b; - - public OtoLevelALazy(String name) { - this.name = name; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public OtoLevelBLazy getB() { - return b; - } - - public void setB(OtoLevelBLazy b) { - this.b = b; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelBLazy.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelBLazy.java deleted file mode 100644 index ece749031..000000000 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelBLazy.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.tests.o2o; - -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; - -@Entity -public class OtoLevelBLazy { - - @Id - private Long id; - - private String name; - - @ManyToMany() - private List c; - - @OneToOne() - private OtoLevelALazy a; - - @Lob - private String blb; - - public OtoLevelBLazy(String name) { - this.name = name; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public OtoLevelALazy getA() { - return a; - } - - public void setA(OtoLevelALazy a) { - this.a = a; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getC() { - return c; - } - - public final void _ebean_onPersistTrigger(String trt) { - recalc(); - } - - protected void recalc() { - this.getBlb(); - } - - public String getBlb() { - return blb; - } - - public void setBlb(String blb) { - this.blb = blb; - } - -} diff --git a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index c48fe0677..5621d4ce8 100644 --- a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -1,14 +1,13 @@ package org.tests.o2o; -import static org.assertj.core.api.Assertions.assertThat; +import io.ebean.DB; +import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import java.util.List; -import org.junit.jupiter.api.Test; - -import io.ebean.DB; -import io.ebean.test.LoggedSql; +import static org.assertj.core.api.Assertions.assertThat; public class TestOneToOneSaveWithoutChanges { @@ -34,19 +33,4 @@ public class TestOneToOneSaveWithoutChanges { List sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } - - @Test - public void testSave2LevelsLazyPersistTrigger() { - OtoLevelALazy a = new OtoLevelALazy("A"); - OtoLevelBLazy b = new OtoLevelBLazy("B"); - b.setA(a); - DB.save(a); - DB.save(b); - - OtoLevelALazy dbA = DB.find(OtoLevelALazy.class).select("*").where().idEq(1).findList().get(0); - LoggedSql.start(); - DB.save(dbA); - List sql = LoggedSql.stop(); - assertThat(sql).hasSize(0); - } }