#593 - Refactor SPI - Move methods from ElPropertyValue to ExpressionPath

This commit is contained in:
Robin Bygrave committed 2016-03-08 21:21:46 +13:00
1 parent ba871d6684
commit 57836af5b5
8 files changed
+18 -20

No files matched your search

@@ -178,7 +178,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
}
@Override
public Object elGetReference(EntityBean bean) {
public Object pathGetNested(Object bean) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
@@ -791,7 +791,8 @@ public class BeanProperty implements ElPropertyValue, Property {
return getValueIntercept((EntityBean)bean);
}
public Object elGetReference(EntityBean bean) {
@Override
public Object pathGetNested(Object bean) {
throw new RuntimeException("Not expected to call this");
}
@@ -463,11 +463,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
}
@Override
public Object elGetReference(EntityBean bean) {
Object value = getValueIntercept(bean);
public Object pathGetNested(Object bean) {
Object value = getValueIntercept((EntityBean)bean);
if (value == null) {
value = targetDescriptor.createEntityBean();
setValueIntercept(bean, value);
setValueIntercept((EntityBean)bean, value);
}
return value;
}
@@ -143,7 +143,7 @@ public class BeanPropertyCompound extends BeanProperty {
}
@Override
public Object elGetReference(EntityBean bean) {
public Object pathGetNested(Object bean) {
return bean;
}
@@ -72,8 +72,8 @@ public class BeanPropertyCompoundScalar extends BeanProperty {
}
@Override
public Object elGetReference(EntityBean bean) {
return getValue(bean);
public Object pathGetNested(Object bean) {
return pathGet(bean);
}
@Override