From 20e0eb102193d4b7f69f4fd45295e345055ca013 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 29 Jul 2021 23:17:11 +1200 Subject: [PATCH] Re-enable TestDbJson_Jackson3 via adding mutationDetection = HASH to beanList property @DbJsonB(mutationDetection = HASH) List beanList; --- .../src/test/java/org/tests/json/TestDbJson_Jackson3.java | 7 ++----- .../src/test/java/org/tests/model/json/EBasicJsonList.java | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index e8d8abdfd..2f74be109 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -161,10 +161,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId()); found.getBeanList().get(0).setName("p1-mod"); -// BeanState state = DB.getBeanState(found); -// assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); - // this test fails, because we have a OmList instead of a GenericObject - // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection" - + BeanState state = DB.getBeanState(found); + assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); } } diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java index d5ce2c309..f76d282f7 100644 --- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java +++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java @@ -9,6 +9,7 @@ import javax.persistence.Id; import javax.persistence.Version; import java.util.*; +import static io.ebean.annotation.MutationDetection.HASH; import static io.ebean.annotation.MutationDetection.SOURCE; @Entity @@ -22,7 +23,7 @@ public class EBasicJsonList { @DbJson(length = 700, name = "beans") Set beanSet; - @DbJsonB + @DbJsonB(mutationDetection = HASH) List beanList; @DbJson(length = 700)