github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor rename getters to accessors for BeanCollection, EntityBeanIntercept etc

Browse Source
This commit is contained in:
Rob Bygrave
2023-03-31 10:42:21 +13:00
parent c2777b0e27
commit e51d6984fe
45 changed files with 345 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java
+2 -2
View File
@@ -1,9 +1,9 @@
package io.ebean.xtest.bean;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.EntityBean;
import io.ebean.bean.EntityBeanIntercept;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.compositekeys.db.AuditInfo;
import org.tests.model.basic.Customer;
@@ -120,7 +120,7 @@ public class EntityBeanInterceptTest extends BaseTestCase {
}
private int findProperty(String name, EntityBeanIntercept eb) {
final String[] names = eb.getOwner()._ebean_getPropertyNames();
final String[] names = eb.owner()._ebean_getPropertyNames();
for (int i = 0; i < names.length; i++) {
if (names[i].equals(name)) {
return i;
ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java
+41 -41
View File
@@ -41,7 +41,7 @@ public class BeanListTest {
// act
list.addAll(all());
assertThat(list.getModifyAdditions()).isNull();
assertThat(list.modifyAdditions()).isNull();
}
@Test
@@ -53,7 +53,7 @@ public class BeanListTest {
// act
list.addAll(all());
assertThat(list.getModifyAdditions()).isNull();
assertThat(list.modifyAdditions()).isNull();
}
@Test
@@ -63,18 +63,18 @@ public class BeanListTest {
list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
list.add(object1);
assertThat(list.getModifyAdditions()).containsOnly(object1);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1);
assertThat(list.modifyRemovals()).isEmpty();
list.add(object1);
assertThat(list.getModifyAdditions()).containsOnly(object1);
assertThat(list.modifyAdditions()).containsOnly(object1);
list.add(object2);
assertThat(list.getModifyAdditions()).containsOnly(object1, object2);
assertThat(list.modifyAdditions()).containsOnly(object1, object2);
list.remove(object1);
assertThat(list.getModifyAdditions()).containsOnly(object2);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object2);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -86,8 +86,8 @@ public class BeanListTest {
// act
list.addAll(all());
assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -98,11 +98,11 @@ public class BeanListTest {
// act
list.remove(object2);
assertThat(list.getModifyRemovals()).isNotEmpty();
assertThat(list.modifyRemovals()).isNotEmpty();
list.add(object2);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).isEmpty();
}
@Test
@@ -114,8 +114,8 @@ public class BeanListTest {
// act
list.sort(Comparator.comparingInt(Object::hashCode));
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).isEmpty();
}
@Test
@@ -127,8 +127,8 @@ public class BeanListTest {
// act
list.sort(Comparator.comparingInt(Object::hashCode));
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).isEmpty();
}
@Test
@@ -143,8 +143,8 @@ public class BeanListTest {
assertThat(list.contains(object2)).isTrue();
list.add(object2); // object2 added as List allows duplicates
assertThat(list.getModifyAdditions()).containsOnly(object1, object2);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1, object2);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -156,8 +156,8 @@ public class BeanListTest {
// act
list.addAll(all());
assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -166,14 +166,14 @@ public class BeanListTest {
BeanList<Object> list = new BeanList<>();
list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
list.addAll(all());
assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.modifyAdditions()).containsOnly(object1, object2, object3);
// act
list.remove(object2);
list.remove(object3);
assertThat(list.getModifyAdditions()).containsOnly(object1);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -182,13 +182,13 @@ public class BeanListTest {
BeanList<Object> list = new BeanList<>();
list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
list.addAll(all());
assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.modifyAdditions()).containsOnly(object1, object2, object3);
// act
list.removeAll(some());
assertThat(list.getModifyAdditions()).containsOnly(object1);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object1);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -202,8 +202,8 @@ public class BeanListTest {
list.remove(object3);
// assert
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.getModifyRemovals()).containsOnly(object2, object3);
assertThat(list.modifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -216,8 +216,8 @@ public class BeanListTest {
list.removeAll(some());
// assert
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.getModifyRemovals()).containsOnly(object2, object3);
assertThat(list.modifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -230,8 +230,8 @@ public class BeanListTest {
list.clear();
//assert
assertThat(list.getModifyRemovals()).containsOnly(object1, object2, object3);
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).containsOnly(object1, object2, object3);
assertThat(list.modifyAdditions()).isEmpty();
}
@Test
@@ -247,8 +247,8 @@ public class BeanListTest {
list.clear();
//assert
assertThat(list.getModifyRemovals()).containsOnly(object1);
assertThat(list.getModifyAdditions()).isEmpty();
assertThat(list.modifyRemovals()).containsOnly(object1);
assertThat(list.modifyAdditions()).isEmpty();
}
@Test
@@ -257,13 +257,13 @@ public class BeanListTest {
BeanList<Object> list = new BeanList<>();
list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
list.addAll(all());
assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(list.modifyAdditions()).containsOnly(object1, object2, object3);
// act
list.retainAll(some());
assertThat(list.getModifyAdditions()).containsOnly(object2, object3);
assertThat(list.getModifyRemovals()).isEmpty();
assertThat(list.modifyAdditions()).containsOnly(object2, object3);
assertThat(list.modifyRemovals()).isEmpty();
}
@Test
@@ -278,8 +278,8 @@ public class BeanListTest {
// act
list.retainAll(some());
assertThat(list.getModifyAdditions()).containsOnly(object3);
assertThat(list.getModifyRemovals()).containsOnly(object1);
assertThat(list.modifyAdditions()).containsOnly(object3);
assertThat(list.modifyRemovals()).containsOnly(object1);
}
@Test
@@ -291,7 +291,7 @@ public class BeanListTest {
// act
list.retainAll(some());
assertThat(list.getModifyRemovals()).containsOnly(object1);
assertThat(list.modifyRemovals()).containsOnly(object1);
}
@Test
ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java
+37 -37
View File
@@ -43,19 +43,19 @@ public class BeanMapTest {
map.put("1", object1);
map.put("4", null);
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object1);
assertThat(map.modifyRemovals()).isEmpty();
map.put("1", object1);
map.put("4", null);
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.modifyAdditions()).containsOnly(object1);
map.put("2", object2);
assertThat(map.getModifyAdditions()).containsOnly(object1, object2);
assertThat(map.modifyAdditions()).containsOnly(object1, object2);
map.remove("1");
assertThat(map.getModifyAdditions()).containsOnly(object2);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object2);
assertThat(map.modifyRemovals()).isEmpty();
}
@Test
@@ -67,8 +67,8 @@ public class BeanMapTest {
// act
set.putAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -83,8 +83,8 @@ public class BeanMapTest {
assertThat(map.containsValue(object2)).isTrue();
map.put("2", object2);
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object1);
assertThat(map.modifyRemovals()).isEmpty();
}
@Test
@@ -96,8 +96,8 @@ public class BeanMapTest {
// act
map.putAll(all());
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object1);
assertThat(map.modifyRemovals()).isEmpty();
}
@Test
@@ -106,14 +106,14 @@ public class BeanMapTest {
BeanMap<String, Object> map = new BeanMap<>();
map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
map.putAll(all());
assertThat(map.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(map.modifyAdditions()).containsOnly(object1, object2, object3);
// act
map.remove("2");
map.remove("3");
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object1);
assertThat(map.modifyRemovals()).isEmpty();
}
@Test
@@ -122,14 +122,14 @@ public class BeanMapTest {
BeanMap<String, Object> map = new BeanMap<>();
map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
map.putAll(all());
assertThat(map.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(map.modifyAdditions()).containsOnly(object1, object2, object3);
// act
map.remove("2");
map.remove("3");
assertThat(map.getModifyAdditions()).containsOnly(object1);
assertThat(map.getModifyRemovals()).isEmpty();
assertThat(map.modifyAdditions()).containsOnly(object1);
assertThat(map.modifyRemovals()).isEmpty();
}
@Test
@@ -143,8 +143,8 @@ public class BeanMapTest {
map.remove("3");
// assert
assertThat(map.getModifyAdditions()).isEmpty();
assertThat(map.getModifyRemovals()).containsOnly(object2, object3);
assertThat(map.modifyAdditions()).isEmpty();
assertThat(map.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -158,8 +158,8 @@ public class BeanMapTest {
map.remove("3");
// assert
assertThat(map.getModifyAdditions()).isEmpty();
assertThat(map.getModifyRemovals()).containsOnly(object2, object3);
assertThat(map.modifyAdditions()).isEmpty();
assertThat(map.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -172,8 +172,8 @@ public class BeanMapTest {
map.clear();
//assert
assertThat(map.getModifyRemovals()).containsOnly(object1, object2, object3);
assertThat(map.getModifyAdditions()).isEmpty();
assertThat(map.modifyRemovals()).containsOnly(object1, object2, object3);
assertThat(map.modifyAdditions()).isEmpty();
}
@Test
@@ -187,8 +187,8 @@ public class BeanMapTest {
map.clear();
//assert
assertThat(map.getModifyRemovals()).containsOnly(object1);
assertThat(map.getModifyAdditions()).isEmpty();
assertThat(map.modifyRemovals()).containsOnly(object1);
assertThat(map.modifyAdditions()).isEmpty();
}
@Test
@@ -229,7 +229,7 @@ public class BeanMapTest {
assertThat(map).doesNotContainKeys("1");
assertThat(map.get("1")).isNull();
assertThat(map.getModifyRemovals()).containsOnly(object1);
assertThat(map.modifyRemovals()).containsOnly(object1);
}
@Test
@@ -245,7 +245,7 @@ public class BeanMapTest {
assertThat(map).isEmpty();
assertThat(keySet).isEmpty();
assertThat(map.getModifyRemovals()).containsOnly(object1, object2);
assertThat(map.modifyRemovals()).containsOnly(object1, object2);
}
@Test
@@ -265,7 +265,7 @@ public class BeanMapTest {
assertThat(keySet).containsExactly("1", "3");
assertThat(map).containsKeys("1", "3");
assertThat(map.getModifyRemovals()).containsOnly(object2);
assertThat(map.modifyRemovals()).containsOnly(object2);
}
@Test
@@ -288,7 +288,7 @@ public class BeanMapTest {
assertThat(keySet).containsExactly("1", "4");
assertThat(map).containsKeys("1", "4");
assertThat(map.getModifyRemovals()).containsOnly(object2, object3, object5);
assertThat(map.modifyRemovals()).containsOnly(object2, object3, object5);
}
@@ -312,7 +312,7 @@ public class BeanMapTest {
assertThat(keySet).containsExactly("2", "3", "5");
assertThat(map).containsKeys("2", "3", "5");
assertThat(map.getModifyRemovals()).containsOnly(object1, object4);
assertThat(map.modifyRemovals()).containsOnly(object1, object4);
}
@Test
@@ -343,7 +343,7 @@ public class BeanMapTest {
assertThat(entries).isEmpty();
assertThat(map).isEmpty();
assertThat(map.getModifyRemovals()).containsOnly(object1);
assertThat(map.modifyRemovals()).containsOnly(object1);
}
@Test
@@ -360,7 +360,7 @@ public class BeanMapTest {
assertThat(existed22).isFalse();
assertThat(map).hasSize(4);
assertThat(map.getModifyRemovals()).containsOnly(object1);
assertThat(map.modifyRemovals()).containsOnly(object1);
}
@Test
@@ -374,7 +374,7 @@ public class BeanMapTest {
assertThat(modified).isFalse();
assertThat(map).hasSize(5);
assertThat(map.getModifyRemovals()).isNull();
assertThat(map.modifyRemovals()).isNull();
}
@Test
@@ -390,7 +390,7 @@ public class BeanMapTest {
}
assertThat(map).hasSize(3);
assertThat(entries).hasSize(3);
assertThat(map.getModifyRemovals()).containsOnly(object2, object5);
assertThat(map.modifyRemovals()).containsOnly(object2, object5);
}
@Test
@@ -401,7 +401,7 @@ public class BeanMapTest {
entries.removeAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
assertThat(map).hasSize(3);
assertThat(entries).hasSize(3);
assertThat(map.getModifyRemovals()).containsOnly(object1, object4);
assertThat(map.modifyRemovals()).containsOnly(object1, object4);
}
@Test
@@ -412,7 +412,7 @@ public class BeanMapTest {
entries.retainAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
assertThat(map).hasSize(2);
assertThat(entries).hasSize(2);
assertThat(map.getModifyRemovals()).containsOnly(object2, object3, object5);
assertThat(map.modifyRemovals()).containsOnly(object2, object3, object5);
}
private BeanMap<String, EBasic> newModifyListeningMap() {
ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java
+32 -32
View File
@@ -38,18 +38,18 @@ public class BeanSetTest {
set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
set.add(object1);
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1);
assertThat(set.modifyRemovals()).isEmpty();
set.add(object1);
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.modifyAdditions()).containsOnly(object1);
set.add(object2);
assertThat(set.getModifyAdditions()).containsOnly(object1, object2);
assertThat(set.modifyAdditions()).containsOnly(object1, object2);
set.remove(object1);
assertThat(set.getModifyAdditions()).containsOnly(object2);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object2);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -61,8 +61,8 @@ public class BeanSetTest {
// act
set.addAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -77,8 +77,8 @@ public class BeanSetTest {
assertThat(set.contains(object2)).isTrue();
set.add(object2);
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -90,8 +90,8 @@ public class BeanSetTest {
// act
set.addAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -100,14 +100,14 @@ public class BeanSetTest {
BeanSet<Object> set = new BeanSet<>();
set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
set.addAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.modifyAdditions()).containsOnly(object1, object2, object3);
// act
set.remove(object2);
set.remove(object3);
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -116,13 +116,13 @@ public class BeanSetTest {
BeanSet<Object> set = new BeanSet<>();
set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
set.addAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.modifyAdditions()).containsOnly(object1, object2, object3);
// act
set.removeAll(some());
assertThat(set.getModifyAdditions()).containsOnly(object1);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object1);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -136,8 +136,8 @@ public class BeanSetTest {
set.remove(object3);
// assert
assertThat(set.getModifyAdditions()).isEmpty();
assertThat(set.getModifyRemovals()).containsOnly(object2, object3);
assertThat(set.modifyAdditions()).isEmpty();
assertThat(set.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -150,8 +150,8 @@ public class BeanSetTest {
set.removeAll(some());
// assert
assertThat(set.getModifyAdditions()).isEmpty();
assertThat(set.getModifyRemovals()).containsOnly(object2, object3);
assertThat(set.modifyAdditions()).isEmpty();
assertThat(set.modifyRemovals()).containsOnly(object2, object3);
}
@Test
@@ -164,8 +164,8 @@ public class BeanSetTest {
set.clear();
//assert
assertThat(set.getModifyRemovals()).containsOnly(object1, object2, object3);
assertThat(set.getModifyAdditions()).isEmpty();
assertThat(set.modifyRemovals()).containsOnly(object1, object2, object3);
assertThat(set.modifyAdditions()).isEmpty();
}
@Test
@@ -181,8 +181,8 @@ public class BeanSetTest {
set.clear();
//assert
assertThat(set.getModifyRemovals()).containsOnly(object1);
assertThat(set.getModifyAdditions()).isEmpty();
assertThat(set.modifyRemovals()).containsOnly(object1);
assertThat(set.modifyAdditions()).isEmpty();
}
@Test
@@ -191,13 +191,13 @@ public class BeanSetTest {
BeanSet<Object> set = new BeanSet<>();
set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
set.addAll(all());
assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
assertThat(set.modifyAdditions()).containsOnly(object1, object2, object3);
// act
set.retainAll(some());
assertThat(set.getModifyAdditions()).containsOnly(object2, object3);
assertThat(set.getModifyRemovals()).isEmpty();
assertThat(set.modifyAdditions()).containsOnly(object2, object3);
assertThat(set.modifyRemovals()).isEmpty();
}
@Test
@@ -212,8 +212,8 @@ public class BeanSetTest {
// act
set.retainAll(some());
assertThat(set.getModifyAdditions()).containsOnly(object3);
assertThat(set.getModifyRemovals()).containsOnly(object1);
assertThat(set.modifyAdditions()).containsOnly(object3);
assertThat(set.modifyRemovals()).containsOnly(object1);
}
@Test
@@ -225,7 +225,7 @@ public class BeanSetTest {
// act
set.retainAll(some());
assertThat(set.getModifyRemovals()).containsOnly(object1);
assertThat(set.modifyRemovals()).containsOnly(object1);
}
}
ebean-test/src/test/java/io/ebean/xtest/event/TestBeanFindController.java
+1 -1
View File
@@ -43,7 +43,7 @@ class TestBeanFindController implements BeanFindController {
Map<Class<?>, List<Integer>> elementsMap = new HashMap<>();
Map<Class<?>, Map<Integer, FindControllerMain>> controllerLookup = new HashMap<>();
for (Object entry : result.getActualEntries()) {
for (Object entry : result.actualEntries()) {
FindControllerMain findControllerMain = (FindControllerMain) entry;
Class<?> beanType = beanTypeFor(findControllerMain.getTargetTableName(), request);
ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class WriteJsonDirtyTest {
customer.setAnniversary(new Date(System.currentTimeMillis()));
EntityBean entityBean = (EntityBean) customer;
boolean[] dirtyProperties = entityBean._ebean_getIntercept().getDirtyProperties();
boolean[] dirtyProperties = entityBean._ebean_getIntercept().dirtyProperties();
StringWriter writer = new StringWriter();
JsonFactory jsonFactory = new JsonFactory();
ebean-test/src/test/java/org/tests/batchload/TestBeanState.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.tests.batchload;
import io.ebean.xtest.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.DB;
import io.ebean.bean.EntityBean;
import io.ebean.bean.EntityBeanIntercept;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
@@ -53,10 +53,10 @@ class TestBeanState extends BaseTestCase {
assertThat(beanState.changedProps()).containsOnly("name");
EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept();
boolean[] dirtyProperties = ebi.getDirtyProperties();
boolean[] dirtyProperties = ebi.dirtyProperties();
for (int i = 0; i < dirtyProperties.length; i++) {
if (dirtyProperties[i]) {
String dirtyPropertyName = ebi.getProperty(i);
String dirtyPropertyName = ebi.property(i);
assertEquals("name", dirtyPropertyName);
}
}
ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.tests.cascade;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import io.ebean.test.LoggedSql;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TSDetail;
import org.tests.model.basic.TSMaster;
@@ -34,7 +34,7 @@ public class TestPrivateOwned extends BaseTestCase {
TSDetail removedDetail = details.remove(1);
BeanCollection<?> bc = (BeanCollection<?>) details;
Set<?> modifyRemovals = bc.getModifyRemovals();
Set<?> modifyRemovals = bc.modifyRemovals();
assertNotNull(modifyRemovals);
assertTrue(modifyRemovals.size() == 1);
ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.tests.query.other;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import io.ebean.bean.EntityBean;
import io.ebean.bean.EntityBeanIntercept;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
@@ -34,7 +34,7 @@ public class TestQueryDistinct extends BaseTestCase {
EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept();
assertTrue(ebi.isDisableLazyLoad());
assertNull(ebi.getPersistenceContext());
assertNull(ebi.persistenceContext());
// lazy loading disabled
assertNull(customer.getId());
ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.tests.unitinternal;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.ENullCollection;
import org.tests.model.basic.ENullCollectionDetail;
@@ -30,8 +30,8 @@ public class TestNullCollectionSet extends BaseTestCase {
BeanCollection<?> bc = (BeanCollection<?>) details;
assertFalse(bc.isPopulated());
assertNotNull(bc.getOwnerBean());
assertNotNull(bc.getPropertyName());
assertNotNull(bc.owner());
assertNotNull(bc.propertyName());
}
}
ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.tests.unitinternal;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EVanillaCollection;
import org.tests.model.basic.EVanillaCollectionDetail;
@@ -31,8 +31,8 @@ public class TestVanillaCollectionSet extends BaseTestCase {
BeanCollection<?> bc = (BeanCollection<?>) details;
assertFalse(bc.isPopulated());
assertNotNull(bc.getOwnerBean());
assertNotNull(bc.getPropertyName());
assertNotNull(bc.owner());
assertNotNull(bc.propertyName());
}
}