From 01e07dd2be6b7c3e448d57eb3dac785aaa2c4264 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 10:30:18 +1200 Subject: [PATCH] #2358 - Rename BeanState methods with deprecation --- .../src/main/java/io/ebean/BeanState.java | 56 ++++++++++++++++--- .../server/core/DefaultBeanState.java | 10 ++-- .../java/io/ebean/TestDirtyProperties.java | 12 ++-- .../io/ebean/TestUnsetLoadedProperties.java | 16 +++--- .../java/io/ebean/event/BeanPostLoadTest.java | 2 +- ...estReferenceWithConstructorProperties.java | 2 +- .../tests/basic/TestBeanReferenceRefresh.java | 4 +- .../org/tests/basic/TestLazyLoadInCache.java | 9 ++- .../org/tests/batchload/TestBeanState.java | 20 +++---- .../org/tests/batchload/TestQueryJoin.java | 18 +++--- .../org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../org/tests/json/TestDbJson_Jackson3.java | 24 ++++---- .../java/org/tests/json/TestDbJson_List.java | 10 +--- .../org/tests/json/TestJsonNodeBasic.java | 6 +- .../java/org/tests/json/TestJsonNodeBlob.java | 6 +- .../org/tests/json/TestJsonNodeJsonb.java | 6 +- .../org/tests/json/TestJsonNodeVarchar.java | 7 +-- .../java/org/tests/json/TestOldValue.java | 7 +-- .../org/tests/query/TestDefaultFetchLazy.java | 2 +- .../tests/query/TestRefToLazyLoadMany.java | 2 +- ...stFindPartialWithConstructorSetFields.java | 11 ++-- .../rawsql/nativesql/TestNativeSqlBasic.java | 8 +-- .../json/TestJsonBeanDescriptorParse.java | 2 +- .../org/tests/types/TestFileTypeFetching.java | 2 +- .../org/tests/update/TestStatelessUpdate.java | 3 +- .../src/test/resources/ebean.properties | 2 +- 26 files changed, 133 insertions(+), 116 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/BeanState.java b/ebean-api/src/main/java/io/ebean/BeanState.java index daf163cc7..20aa0f8e4 100644 --- a/ebean-api/src/main/java/io/ebean/BeanState.java +++ b/ebean-api/src/main/java/io/ebean/BeanState.java @@ -57,7 +57,7 @@ public interface BeanState { * * // set loaded state on the email property to false so that * // the email property is not included in a stateless update - * DB.getBeanState(user).setPropertyLoaded("email", false); + * DB.beanState(user).setPropertyLoaded("email", false); * * user.update(); * @@ -72,25 +72,47 @@ public interface BeanState { * bean. *

* Accessing another property will cause lazy loading to occur. - *

*/ - Set getLoadedProps(); + Set loadedProps(); + + /** + * Deprecated migrate to loadedProps(). + */ + @Deprecated + default Set getLoadedProps() { + return loadedProps(); + } /** * Return the set of changed properties. */ - Set getChangedProps(); + Set changedProps(); + + /** + * Deprecated migrate to changedProps(). + */ + @Deprecated + default Set getChangedProps() { + return changedProps(); + } /** * Return a map of the updated properties and their new and old values. */ - Map getDirtyValues(); + Map dirtyValues(); + + /** + * Deprecated migrate to dirtyValues(). + */ + @Deprecated + default Map getDirtyValues() { + return dirtyValues(); + } /** * Return true if the bean is readOnly. *

* If a setter is called on a readOnly bean it will throw an exception. - *

*/ boolean isReadOnly(); @@ -114,13 +136,29 @@ public interface BeanState { void resetForInsert(); /** - * Returns a map with load erros. + * Returns a map with load errors. */ @Nullable - Map getLoadErrors(); + Map loadErrors(); + + /** + * Deprecated migrate to loadErrors(). + */ + @Deprecated + default Map getLoadErrors() { + return loadErrors(); + } /** * Return the sort order value for an order column. */ - int getSortOrder(); + int sortOrder(); + + /** + * Deprecated migrate to sortOrder(). + */ + @Deprecated + default int getSortOrder() { + return sortOrder(); + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java index 5bedf1355..725fe75e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java @@ -45,17 +45,17 @@ public final class DefaultBeanState implements BeanState { } @Override - public Set getLoadedProps() { + public Set loadedProps() { return intercept.getLoadedPropertyNames(); } @Override - public Set getChangedProps() { + public Set changedProps() { return intercept.getDirtyPropertyNames(); } @Override - public Map getDirtyValues() { + public Map dirtyValues() { return intercept.getDirtyValues(); } @@ -90,12 +90,12 @@ public final class DefaultBeanState implements BeanState { } @Override - public Map getLoadErrors() { + public Map loadErrors() { return intercept.getLoadErrors(); } @Override - public int getSortOrder() { + public int sortOrder() { return intercept.getSortOrder(); } } diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java index 2e01111cc..019469533 100644 --- a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java @@ -35,11 +35,11 @@ public class TestDirtyProperties extends BaseTestCase { DefaultBeanState beanState = new DefaultBeanState(eb); - Set changedProps = beanState.getChangedProps(); + Set changedProps = beanState.changedProps(); assertEquals(1, changedProps.size()); assertThat(changedProps).contains("name"); - Map dirtyValues = beanState.getDirtyValues(); + Map dirtyValues = beanState.dirtyValues(); assertEquals(1, dirtyValues.size()); assertThat(dirtyValues.keySet()).contains("name"); @@ -51,11 +51,11 @@ public class TestDirtyProperties extends BaseTestCase { Eembeddable embeddableRead = emain.getEmbeddable(); embeddableRead.setDescription("embChanged"); - Set changedProps2 = beanState.getChangedProps(); + Set changedProps2 = beanState.changedProps(); assertEquals(2, changedProps2.size()); assertThat(changedProps2).contains("name", "embeddable.description"); - Map dirtyValues2 = beanState.getDirtyValues(); + Map dirtyValues2 = beanState.dirtyValues(); assertEquals(2, dirtyValues2.size()); assertThat(dirtyValues2.keySet()).contains("name", "embeddable.description"); @@ -92,13 +92,13 @@ public class TestDirtyProperties extends BaseTestCase { DefaultBeanState beanState = new DefaultBeanState(eb); - Set changedProps2 = beanState.getChangedProps(); + Set changedProps2 = beanState.changedProps(); assertEquals(2, changedProps2.size()); assertThat(changedProps2).contains("name"); assertThat(changedProps2).contains("embeddable"); - Map dirtyValues2 = beanState.getDirtyValues(); + Map dirtyValues2 = beanState.dirtyValues(); assertEquals(2, dirtyValues2.size()); assertThat(dirtyValues2.keySet()).contains("name", "embeddable"); diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index 5065d89b9..dd21c5f99 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -31,11 +31,11 @@ public class TestUnsetLoadedProperties extends BaseTestCase { BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); LoggedSqlCollector.start(); user.update(); @@ -55,12 +55,12 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); // unset the loaded state for email ((EntityBean) user)._ebean_getIntercept().setPropertyLoaded("email", false); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } @Test @@ -73,11 +73,11 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); user.markPropertyUnset("email"); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } @Test @@ -90,10 +90,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { user.setEmail("change@junk.com"); BeanState beanState = DB.beanState(user); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); + assertThat(beanState.loadedProps()).containsExactly("id", "name", "email"); DB.beanState(user).setPropertyLoaded("email", false); - assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); + assertThat(beanState.loadedProps()).containsExactly("id", "name"); } /** diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java index 3fdfdb51f..bba31ad7b 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -37,7 +37,7 @@ public class BeanPostLoadTest extends BaseTestCase { assertThat(postLoad.methodsCalled).hasSize(1); assertThat(postLoad.methodsCalled).containsExactly("postLoad"); - assertThat(postLoad.beanState.getLoadedProps()).containsExactly("id", "name", "other"); + assertThat(postLoad.beanState.loadedProps()).containsExactly("id", "name", "other"); assertThat(postLoad.bean).isSameAs(found); db.delete(bean); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 43243f2c4..92efbc603 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -26,7 +26,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { Order order = DB.reference(Order.class, 1); BeanState beanState = DB.beanState(order); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertEquals(1, loadedProps.size()); assertTrue(beanState.isReference()); diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 1ed9ffc14..76d170d6f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -37,10 +37,10 @@ public class TestBeanReferenceRefresh extends BaseTestCase { assertFalse(DB.beanState(order).isReference()); assertNotNull(order.getStatus()); assertNotNull(order.getDetails()); - assertNull(DB.beanState(order).getLoadedProps()); + assertNull(DB.beanState(order).loadedProps()); Status status = order.getStatus(); - assertTrue(status != Order.Status.SHIPPED); + assertNotSame(status, Status.SHIPPED); order.setStatus(Order.Status.SHIPPED); DB.refresh(order); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 78bf40e61..6db645e15 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -12,8 +12,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestLazyLoadInCache extends BaseTestCase { @@ -29,7 +28,7 @@ public class TestLazyLoadInCache extends BaseTestCase { .order().asc("id") .findMap(); - assertTrue(!map.isEmpty()); + assertFalse(map.isEmpty()); Object id = map.keySet().iterator().next(); @@ -40,9 +39,9 @@ public class TestLazyLoadInCache extends BaseTestCase { .setId(id) .findOne(); - assertTrue(cust1 != cust1B); + assertNotSame(cust1, cust1B); - Set loadedProps = DB.beanState(cust1).getLoadedProps(); + Set loadedProps = DB.beanState(cust1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("status")); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java index 5dc8c59ee..2f244435e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java @@ -33,11 +33,11 @@ public class TestBeanState extends BaseTestCase { assertFalse(beanState.isNew()); assertFalse(beanState.isDirty()); assertFalse(beanState.isNewOrDirty()); - assertNotNull(beanState.getLoadedProps()); + assertNotNull(beanState.loadedProps()); customer.setName("dirtyNameProp"); assertTrue(beanState.isDirty()); - assertThat(beanState.getChangedProps()).containsOnly("name"); + assertThat(beanState.changedProps()).containsOnly("name"); EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept(); boolean[] dirtyProperties = ebi.getDirtyProperties(); @@ -51,7 +51,7 @@ public class TestBeanState extends BaseTestCase { customer.setStatus(Customer.Status.INACTIVE); assertTrue(beanState.isDirty()); - assertThat(beanState.getChangedProps()).containsOnly("name", "status"); + assertThat(beanState.changedProps()).containsOnly("name", "status"); } @Test @@ -80,10 +80,10 @@ public class TestBeanState extends BaseTestCase { Customer customer = DB.find(Customer.class).order("id").setMaxRows(1).findOne(); BeanState beanState = DB.beanState(customer); - assertThat(beanState.getChangedProps()).isEmpty(); + assertThat(beanState.changedProps()).isEmpty(); customer.setContacts(new ArrayList<>()); - assertThat(beanState.getChangedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).containsOnly("contacts"); } @Test @@ -92,18 +92,18 @@ public class TestBeanState extends BaseTestCase { Customer customer = new Customer(); BeanState beanState = DB.beanState(customer); - assertThat(beanState.getChangedProps()).isEmpty(); + assertThat(beanState.changedProps()).isEmpty(); // when new state, then loaded customer.setContacts(new ArrayList<>()); - assertThat(beanState.getChangedProps()).isEmpty(); - assertThat(beanState.getLoadedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).isEmpty(); + assertThat(beanState.loadedProps()).containsOnly("contacts"); // set loaded state, then marked as changed beanState.setLoaded(); customer.setContacts(new ArrayList<>()); - assertThat(beanState.getLoadedProps()).containsOnly("contacts"); - assertThat(beanState.getChangedProps()).containsOnly("contacts"); + assertThat(beanState.loadedProps()).containsOnly("contacts"); + assertThat(beanState.changedProps()).containsOnly("contacts"); } @Test diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 971c4e7cc..4f5e38abf 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestQueryJoin extends BaseTestCase { @@ -37,29 +38,24 @@ public class TestQueryJoin extends BaseTestCase { Order order = list.get(0); BeanState beanStateOrder = DB.beanState(order); - assertNotNull(beanStateOrder.getLoadedProps()); + assertNotNull(beanStateOrder.loadedProps()); // assertTrue(beanStateOrder.getLoadedProps().contains("id")); - assertTrue(beanStateOrder.getLoadedProps().contains("status")); - assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); - assertTrue(beanStateOrder.getLoadedProps().contains("customer")); + assertThat(beanStateOrder.loadedProps()).contains("status", "shipments", "customer"); Customer customer = order.getCustomer(); BeanState beanStateCustomer = DB.beanState(customer); assertTrue(beanStateCustomer.isReference()); customer.getName(); - assertNotNull(beanStateCustomer.getLoadedProps()); - assertTrue(beanStateCustomer.getLoadedProps().contains("name")); - assertTrue(beanStateCustomer.getLoadedProps().contains("status")); - assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); + assertNotNull(beanStateCustomer.loadedProps()); + assertThat(beanStateCustomer.loadedProps()).contains("name", "status"); + assertThat(beanStateCustomer.loadedProps()).doesNotContain("billingAddress"); customer.getName(); Address billingAddress = customer.getBillingAddress(); - System.out.println(billingAddress); billingAddress.getLine1(); - assertTrue(!list.isEmpty()); - + assertFalse(list.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 8bc90c208..306f1cdbc 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -25,7 +25,7 @@ public class TestInsertQueryUpdate extends BaseTestCase { .findOne(); BeanState beanState = DB.beanState(e1); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertFalse(loadedProps.contains("description")); //lastUpdate 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 bfe594afa..0a4bd2022 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 @@ -96,13 +96,13 @@ public class TestDbJson_Jackson3 extends BaseTestCase { found.setBeanList(null); BeanState state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("name", "beanList"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("name", "beanList"); - ValuePair pair = state.getDirtyValues().get("name"); + ValuePair pair = state.dirtyValues().get("name"); assertThat(pair.getNewValue()).isEqualTo("p1-mod"); assertThat(pair.getOldValue()).isEqualTo("p1"); - pair = state.getDirtyValues().get("beanList"); + pair = state.dirtyValues().get("beanList"); assertThat(pair.getNewValue()).isEqualTo(null); assertThat((List) pair.getOldValue()).hasSize(1) .extracting(PlainBean::getName).containsExactly("a"); @@ -123,8 +123,8 @@ public class TestDbJson_Jackson3 extends BaseTestCase { assertThat(DB.beanState(found).isDirty()).isTrue(); state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean"); - pair = state.getDirtyValues().get("plainBean"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("plainBean"); + pair = state.dirtyValues().get("plainBean"); assertThat(pair.getNewValue()).hasToString("name:b"); assertThat(pair.getOldValue()).hasToString("name:a"); @@ -156,7 +156,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { found.getBeanList().get(0).setName("p1-mod"); BeanState state = DB.beanState(found); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("beanList"); } @IgnorePlatform(Platform.MYSQL) @@ -176,7 +176,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { // a new bean is not considered as dirty (thus have no changed props) assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isTrue(); - assertThat(state.getChangedProps()).isEmpty(); + assertThat(state.changedProps()).isEmpty(); bean.save(); @@ -185,19 +185,19 @@ public class TestDbJson_Jackson3 extends BaseTestCase { // a fresh loaded bean is also not considered as dirty assertThat(state.isDirty()).isFalse(); assertThat(state.isNewOrDirty()).isFalse(); - assertThat(state.getChangedProps()).isEmpty(); + assertThat(state.changedProps()).isEmpty(); bean.getPlainValue().setName("a"); // has SOURCE assertThat(state.isDirty()).isTrue(); - assertThat(state.getChangedProps()).containsExactly("plainValue"); + assertThat(state.changedProps()).containsExactly("plainValue"); bean.getPlainValue2().setName("b"); - assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2"); + assertThat(state.changedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2"); bean.getPlainValue3().setName("c"); // has mutationDetection = NONE - Map dirtyValues = state.getDirtyValues(); + Map dirtyValues = state.dirtyValues(); assertThat(dirtyValues).hasSize(2).containsKeys("plainValue", "plainValue2"); assertThat(dirtyValues.get("plainValue")).hasToString("name:a,name:x"); // SOURCE -> origValue present @@ -237,7 +237,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase { bean.setPlainValue2(null); bean.setPlainValue3(null); // already null BeanState state = DB.beanState(bean); - assertThat(state.getDirtyValues()).hasSize(1).containsKey("plainValue2"); + assertThat(state.dirtyValues()).hasSize(1).containsKey("plainValue2"); } private void expectedSql(int i, String s) { diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index 30499053e..7f2a6a0db 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -18,10 +18,7 @@ import java.util.Map; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestDbJson_List extends BaseTestCase { @@ -202,8 +199,7 @@ public class TestDbJson_List extends BaseTestCase { .setId(bean.getId()) .findOne(); - // never get here - assertTrue(false); + fail("never get here"); } catch (PersistenceException e) { // query fails due to error loading invalid JSON content @@ -215,7 +211,7 @@ public class TestDbJson_List extends BaseTestCase { .setAllowLoadErrors() // allow invalid JSON content .findOne(); - Map errors = server().beanState(bean).getLoadErrors(); + Map errors = server().beanState(bean).loadErrors(); assertThat(errors).containsKey("beanMap").hasSize(1); assertThat(errors.values().iterator().next()) diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index da2ad82b6..48a78a3ce 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -101,13 +101,11 @@ public class TestJsonNodeBasic extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } @Test diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index 1d497dbc7..c910a5115 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -58,12 +58,10 @@ public class TestJsonNodeBlob extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 8a809453f..292dc2807 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -58,12 +58,10 @@ public class TestJsonNodeJsonb extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 7881a7d1d..105e0eacd 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -36,7 +36,6 @@ public class TestJsonNodeVarchar extends BaseTestCase { assertEquals(bean.getContent().path("contentType").asText(), bean1.getContent().path("contentType").asText()); assertEquals(18L, bean1.getContent().get("docId").asLong()); - } @Test @@ -58,12 +57,10 @@ public class TestJsonNodeVarchar extends BaseTestCase { .setId(bean.getId()) .findOne(); - Set loadedProps = DB.beanState(bean1).getLoadedProps(); + Set loadedProps = DB.beanState(bean1).loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); - JsonNode lazyLoadedContent = bean1.getContent(); - assertNotNull(lazyLoadedContent); - + assertNotNull(bean1.getContent()); } } diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java index 549063869..63a7cda22 100644 --- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java @@ -48,7 +48,7 @@ public class TestOldValue extends BaseTestCase { bean.getIntMap().put("ik2",2006); ((ArrayNode)bean.getJsonNode()).add("Bar"); - Map dirty = DB.beanState(bean).getDirtyValues(); + Map dirty = DB.beanState(bean).dirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(10); @@ -83,7 +83,7 @@ public class TestOldValue extends BaseTestCase { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test @Disabled("Old value detection does not work for @DbArray") - public void testDbArrayOldValue() throws Exception { + public void testDbArrayOldValue() { EBasicOldValue bean = new EBasicOldValue(); bean.getStringArr().add("sa1"); @@ -94,7 +94,7 @@ public class TestOldValue extends BaseTestCase { bean.getStringArr().add("sa2"); - Map dirty = DB.beanState(bean).getDirtyValues(); + Map dirty = DB.beanState(bean).dirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(1); @@ -102,6 +102,5 @@ public class TestOldValue extends BaseTestCase { softly.assertThat((List)dirty.get("stringArr").getNewValue()).containsExactly("sa1", "sa2"); softly.assertAll(); - } } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index aef260910..92d3de1d3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -28,7 +28,7 @@ public class TestDefaultFetchLazy extends BaseTestCase { MyLobSize myLobSize = DB.find(MyLobSize.class, m.getId()); BeanState beanState = DB.beanState(myLobSize); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertNotNull(loadedProps); assertTrue(loadedProps.contains("id")); diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index fba33585a..bb1a9f94a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -23,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { Customer c = custList.get(0); List contacts2 = c.getContacts(); - assertEquals(3, DB.beanState(c).getLoadedProps().size()); + assertEquals(3, DB.beanState(c).loadedProps().size()); // now lazy load the contacts contacts2.size(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 118ca213a..13784f672 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -10,8 +10,7 @@ import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestFindPartialWithConstructorSetFields extends BaseTestCase { @@ -31,10 +30,10 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { // assert first bean is partially loaded Order order0 = list.get(0); BeanState beanState = DB.beanState(order0); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertTrue(loadedProps.contains("shipDate")); - assertTrue(!loadedProps.contains("status")); - assertTrue(!loadedProps.contains("orderDate")); + assertFalse(loadedProps.contains("status")); + assertFalse(loadedProps.contains("orderDate")); // invoke lazy loading order0.getStatus(); @@ -44,7 +43,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { for (int i = 1; i < list.size(); i++) { Order order1 = list.get(1); beanState = DB.beanState(order1); - loadedProps = beanState.getLoadedProps(); + loadedProps = beanState.loadedProps(); assertNull(loadedProps); } diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 2874a4bf3..dac2ee7ae 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -28,7 +28,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps()).contains("id", "name"); + assertThat(beanState.loadedProps()).contains("id", "name"); } @Test @@ -43,7 +43,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); + assertThat(beanState.loadedProps().size()).isGreaterThan(10); } @Test @@ -194,7 +194,7 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); + assertThat(beanState.loadedProps().size()).isGreaterThan(10); } @Test @@ -210,6 +210,6 @@ public class TestNativeSqlBasic extends BaseTestCase { assertThat(customers).isNotEmpty(); BeanState beanState = DB.beanState(customers.get(0)); - assertThat(beanState.getLoadedProps()).contains("id", "name"); + assertThat(beanState.loadedProps()).contains("id", "name"); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index ef82e31f8..e96af4aec 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -37,7 +37,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { assertEquals("Hello rob", customer.getName()); BeanState beanState = DB.beanState(customer); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertEquals(2, loadedProps.size()); assertTrue(loadedProps.contains("id")); diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 78d641a1a..a027ab056 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -32,7 +32,7 @@ public class TestFileTypeFetching extends BaseTestCase { .findOne(); BeanState beanState = DB.beanState(bean1); - Set loadedProps = beanState.getLoadedProps(); + Set loadedProps = beanState.loadedProps(); assertTrue(loadedProps.contains("name")); assertFalse(loadedProps.contains("content")); diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java index 2104b8c03..5cc110bae 100644 --- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,7 +1,6 @@ package org.tests.update; import io.ebean.DB; -import io.ebean.DuplicateKeyException; import io.ebean.TransactionalTestCase; import io.ebeantest.LoggedSql; import org.junit.jupiter.api.Test; @@ -266,7 +265,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { } private boolean containsContacts(Customer cust) { - return DB.beanState(cust).getLoadedProps().contains("contacts"); + return DB.beanState(cust).loadedProps().contains("contacts"); } /** diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties index 776912381..49aae2a31 100644 --- a/ebean-core/src/test/resources/ebean.properties +++ b/ebean-core/src/test/resources/ebean.properties @@ -22,7 +22,7 @@ ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} ebean.packages=org.tests -datasource.default=sqlserver +datasource.default=h2 #datasource.h2.capturestacktrace=true ebean.dumpMetricsOnShutdown=true