#421 - ENH: Add support for unsetting the loaded state of a bean property (via BeanState)

This commit is contained in:
Robin Bygrave
2015-09-22 13:21:19 +12:00
parent 489eb483c0
commit dba245c517
5 changed files with 124 additions and 32 deletions
@@ -1,7 +1,6 @@
package com.avaje.ebean;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.bean.EntityBeanIntercept;
import com.avaje.tests.model.converstation.User;
import org.avaje.ebeantest.LoggedSqlCollector;
import org.junit.Test;
@@ -9,7 +8,6 @@ import org.junit.Test;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertTrue;
public class TestUnsetLoadedProperties extends BaseTestCase {
@@ -30,22 +28,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
user.setEmail("change@junk.com");
// confirm it's loaded state
EntityBean eb = (EntityBean)user;
EntityBeanIntercept ebi = eb._ebean_getIntercept();
int namePosition = ebi.findProperty("name");
assertTrue(ebi.isLoadedProperty(namePosition));
int emailPosition = ebi.findProperty("email");
assertTrue(ebi.isLoadedProperty(emailPosition));
BeanState beanState = Ebean.getBeanState(user);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
// unset the loaded state for email
//ebi.setPropertyUnloaded(emailPosition);
unloadProperty(user, "email");
user.markPropertyUnset("email");
assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
@@ -58,16 +44,55 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
}
private void unloadProperty(Object entityBean, String propertyName) {
@Test
public void testUnloadVia_EntityBeanIntercept_setPropertyLoaded() {
EntityBean eb = (EntityBean)entityBean;
EntityBeanIntercept ebi = eb._ebean_getIntercept();
int position = ebi.findProperty(propertyName);
if (position == -1) {
throw new RuntimeException("Property "+propertyName+" not found on bean "+entityBean.getClass());
}
ebi.setPropertyUnloaded(position);
// our bean to perform stateless update
User user = new User();
user.setId(42L);
user.setName("name mod");
user.setEmail("change@junk.com");
BeanState beanState = Ebean.getBeanState(user);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
// unset the loaded state for email
((EntityBean)user)._ebean_getIntercept().setPropertyLoaded("email", false);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
}
@Test
public void testUnloadVia_Model_markPropertyUnset() {
// our bean to perform stateless update
User user = new User();
user.setId(42L);
user.setName("name mod");
user.setEmail("change@junk.com");
BeanState beanState = Ebean.getBeanState(user);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
user.markPropertyUnset("email");
assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
}
@Test
public void testUnloadVia_BeanState_setPropertyLoaded() {
// our bean to perform stateless update
User user = new User();
user.setId(42L);
user.setName("name mod");
user.setEmail("change@junk.com");
BeanState beanState = Ebean.getBeanState(user);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
Ebean.getBeanState(user).setPropertyLoaded("email", false);
assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
}
}