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

This commit is contained in:
Robin Bygrave committed 2016-03-08 21:02:39 +13:00
1 parent 3ba4660bbb
commit 583fc11945
24 files changed
+447 -272

No files matched your search

@@ -309,7 +309,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
*/
private boolean isDocStoreNotify() {
// Either queue or directly update the document store
return docStoreMode != DocStoreMode.IGNORE;
return docStoreMode != DocStoreMode.IGNORE || beanDescriptor.docStoreAdapter().hasEmbeddedInvalidation();
}
public boolean isNotifyPersistListener() {
@@ -71,6 +71,8 @@ import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter;
import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext;
import com.avaje.ebeanservice.docstore.api.DocStoreUpdates;
import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder;
import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping;
import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType;
import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping;
import com.fasterxml.jackson.core.JsonParser;
import org.slf4j.Logger;
@@ -80,6 +82,7 @@ import javax.persistence.PersistenceException;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -358,12 +361,12 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
private final String docStoreQueueId;
private DocumentMapping docMapping;
private final BeanDescriptorDraftHelp<T> draftHelp;
private final BeanDescriptorCacheHelp<T> cacheHelp;
private final BeanDescriptorJsonHelp<T> jsonHelp;
private final DocStoreBeanAdapter<T> docStoreAdapter;
private DocStoreBeanAdapter<T> docStoreAdapter;
private DocumentMapping docMapping;
private final String defaultSelectClause;
@@ -680,7 +683,6 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
namedUpdate.initialise(parser);
}
}
docStoreAdapter.registerPaths();
}
/**
@@ -690,7 +692,11 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
for (int i = 0; i < propertiesMany.length; i++) {
propertiesMany[i].initialisePostTarget();
}
if (inheritInfo != null && !inheritInfo.isRoot()) {
docStoreAdapter = (DocStoreBeanAdapter<T>)inheritInfo.getRoot().getBeanDescriptor().docStoreAdapter();
}
docMapping = docStoreAdapter.createDocMapping();
docStoreAdapter.registerPaths();
}
public void initInheritInfo() {
@@ -932,16 +938,44 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
/**
* Build the Document mapping recursively with the given prefix relative to the root of the document.
*/
public void docStoreMapping(DocMappingBuilder mapping, String prefix) {
public void docStoreMapping(final DocMappingBuilder mapping, final String prefix) {
if (prefix != null && idProperty != null) {
// id property not included in the
idProperty.docStoreMapping(mapping, prefix);
}
if (inheritInfo != null) {
String discCol = inheritInfo.getDiscriminatorColumn();
if (Types.VARCHAR == inheritInfo.getDiscriminatorType()) {
mapping.add(new DocPropertyMapping(discCol, DocPropertyType.ENUM));
} else {
mapping.add(new DocPropertyMapping(discCol, DocPropertyType.INTEGER));
}
}
for (BeanProperty prop: propertiesNonTransient) {
prop.docStoreMapping(mapping, prefix);
}
if (inheritInfo != null) {
inheritInfo.visitChildren(new InheritInfoVisitor() {
@Override
public void visit(InheritInfo inheritInfo) {
for (BeanProperty localProperty : inheritInfo.localProperties()) {
localProperty.docStoreMapping(mapping, prefix);
}
}
});
}
}
/**
* Return the root bean type if part of inheritance hierarchy.
*/
public BeanType<?> root() {
if (inheritInfo != null && !inheritInfo.isRoot()) {
return inheritInfo.getRoot().getBeanDescriptor();
}
return this;
}
/**
@@ -1539,7 +1573,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
}
String[] splitBegin = SplitName.splitBegin(path);
BeanProperty beanProperty = propMap.get(splitBegin[0]);
BeanProperty beanProperty = findBeanProperty(splitBegin[0]);
if (beanProperty instanceof BeanPropertyAssoc<?>) {
BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) beanProperty;
return assocProp.getTargetDescriptor().getBeanDescriptor(splitBegin[1]);
@@ -1709,7 +1743,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
@Override
public Property getProperty(String propName) {
return getBeanProperty(propName);
return findBeanProperty(propName);
}
/**
@@ -1976,6 +2010,30 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
return inheritInfo;
}
@Override
public boolean hasInheritance() {
return inheritInfo != null;
}
@Override
public String getDiscColumn() {
return inheritInfo.getDiscriminatorColumn();
}
@Override
@SuppressWarnings("unchecked")
public T createBeanUsingDisc(Object discValue) {
InheritInfo type = inheritInfo.getType(discValue.toString());
return (T)type.getBeanDescriptor().createBean();
}
@Override
public void addInheritanceWhere(SpiQuery<?> query) {
if (inheritInfo != null && !inheritInfo.isRoot()) {
query.where().eq(inheritInfo.getDiscriminatorColumn(), inheritInfo.getDiscriminatorValue());
}
}
/**
* Return true if this is an embedded bean.
*/
@@ -162,23 +162,22 @@ public final class BeanFkeyProperty implements ElPropertyValue {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
public Object elConvertType(Object value) {
@Override
public Object convert(Object value) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
@Override
public void set(Object bean, Object value) {
public void pathSet(Object bean, Object value) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
public void elSetValue(EntityBean bean, Object value, boolean populate) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
public Object elGetValue(EntityBean bean) {
@Override
public Object pathGet(Object bean) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
@Override
public Object elGetReference(EntityBean bean) {
throw new RuntimeException("ElPropertyDeploy only - not implemented");
}
@@ -767,7 +767,7 @@ public class BeanProperty implements ElPropertyValue, Property {
}
}
public Object elConvertType(Object value) {
public Object convert(Object value) {
if (value == null) {
return null;
}
@@ -775,25 +775,20 @@ public class BeanProperty implements ElPropertyValue, Property {
}
@Override
public void set(Object bean, Object value) {
public void pathSet(Object bean, Object value) {
// convert for Enums etc
Object logicalVal = convertToLogicalType(value);
elSetValue((EntityBean) bean, logicalVal, true);
}
public void elSetValue(EntityBean bean, Object value, boolean populate) {
if (bean != null) {
// Not using setValueIntercept at this stage
setValue(bean, value);
Object logicalVal = convertToLogicalType(value);
setValue((EntityBean)bean, logicalVal);
}
}
public Object elGetValue(EntityBean bean) {
@Override
public Object pathGet(Object bean) {
if (bean == null) {
return null;
}
return getValueIntercept(bean);
return getValueIntercept((EntityBean)bean);
}
public Object elGetReference(EntityBean bean) {
@@ -1330,7 +1325,7 @@ public class BeanProperty implements ElPropertyValue, Property {
* Return true if this is a String Id property and should be treated as a code by the document store.
*/
private boolean isStringId(DocPropertyType type) {
return DocPropertyType.STRING == type && id;
return DocPropertyType.STRING == type && (id || discriminator);
}
}
@@ -77,8 +77,8 @@ public class BeanPropertyCompoundScalar extends BeanProperty {
}
@Override
public Object elGetValue(EntityBean bean) {
return getValue(bean);
public Object pathGet(Object bean) {
return ctProperty.getValue(bean);
}
}
@@ -145,6 +145,13 @@ public class InheritInfo {
return descriptor;
}
/**
* Return the local properties for this node in the hierarchy.
*/
public BeanProperty[] localProperties() {
return descriptor.propertiesLocal();
}
/**
* Get the bean property additionally looking in the sub types.
*/
@@ -2,8 +2,6 @@ package com.avaje.ebeaninternal.server.el;
import java.util.Comparator;
import com.avaje.ebean.bean.EntityBean;
/**
* Comparator based on a ElGetValue.
*/
@@ -23,16 +21,14 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
public int compare(T o1, T o2) {
Object val1 = elGetValue.elGetValue((EntityBean) o1);
Object val2 = elGetValue.elGetValue((EntityBean) o2);
Object val1 = elGetValue.pathGet(o1);
Object val2 = elGetValue.pathGet(o2);
return compareValues(val1, val2);
}
public int compareValue(Object value, T o2) {
Object val2 = elGetValue.elGetValue((EntityBean) o2);
Object val2 = elGetValue.pathGet(o2);
return compareValues(value, val2);
}
@@ -28,7 +28,7 @@ public final class ElFilter<T> implements Filter<T> {
private Object convertValue(String propertyName, Object value) {
// convert type of value to match expected type
ElPropertyValue elGetValue = beanDescriptor.getElGetValue(propertyName);
return elGetValue.elConvertType(value);
return elGetValue.convert(value);
}
private ElComparator<T> getElComparator(String propertyName) {
@@ -87,8 +87,8 @@ public final class ElFilter<T> implements Filter<T> {
public Filter<T> between(String propertyName, Object min, Object max) {
ElPropertyValue elGetValue = getElGetValue(propertyName);
min = elGetValue.elConvertType(min);
max = elGetValue.elConvertType(max);
min = elGetValue.convert(min);
max = elGetValue.convert(max);
ElComparator<T> elComparator = getElComparator(propertyName);
@@ -28,7 +28,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return pattern.matcher(v).matches();
}
}
@@ -55,7 +55,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return value.equalsIgnoreCase(v);
}
}
@@ -75,7 +75,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return charMatch.startsWith(v);
}
}
@@ -95,7 +95,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return charMatch.endsWith(v);
}
}
@@ -106,7 +106,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return value.startsWith(v);
}
}
@@ -117,7 +117,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String) elGetValue.elGetValue((EntityBean) bean);
String v = (String) elGetValue.pathGet(bean);
return value.endsWith(v);
}
}
@@ -131,7 +131,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
return (null == elGetValue.elGetValue((EntityBean) bean));
return (null == elGetValue.pathGet(bean));
}
}
@@ -144,7 +144,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
return (null != elGetValue.elGetValue((EntityBean) bean));
return (null != elGetValue.pathGet(bean));
}
}
@@ -175,7 +175,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
Object value = elGetValue.elGetValue((EntityBean) bean);
Object value = elGetValue.pathGet(bean);
return value != null && set.contains(value);
}
}
@@ -220,20 +220,19 @@ public class ElPropertyChain implements ElPropertyValue {
return scalarType;
}
public Object elConvertType(Object value) {
public Object convert(Object value) {
// just convert using the last one in the chain
return lastElPropertyValue.elConvertType(value);
return lastElPropertyValue.convert(value);
}
public Object elGetValue(EntityBean bean) {
@Override
public Object pathGet(Object bean) {
for (int i = 0; i < chain.length; i++) {
bean = (EntityBean) chain[i].elGetValue(bean);
bean = chain[i].pathGet(bean);
if (bean == null) {
return null;
}
}
return bean;
}
@@ -245,39 +244,25 @@ public class ElPropertyChain implements ElPropertyValue {
prevBean = (EntityBean) chain[i].elGetReference(prevBean);
}
// try the last step in the chain
return chain[last].elGetValue(prevBean);
return chain[last].pathGet(prevBean);
}
@Override
public void set(Object bean, Object value) {
elSetValue((EntityBean)bean, value, true);
}
public void pathSet(Object bean, Object value) {
public void elSetValue(EntityBean bean, Object value, boolean populate) {
EntityBean prevBean = bean;
if (populate) {
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = (EntityBean) chain[i].elGetReference(prevBean);
}
} else {
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = (EntityBean) chain[i].elGetValue(prevBean);
if (prevBean == null) {
break;
}
}
EntityBean prevBean = (EntityBean)bean;
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = (EntityBean) chain[i].elGetReference(prevBean);
}
if (prevBean != null) {
if (lastBeanProperty != null) {
// last chain element maps to a real scalar property
lastBeanProperty.setValueIntercept(prevBean, value);
lastBeanProperty.pathSet(prevBean, value);
} else {
// a non-scalar property of a Compound value object
lastElPropertyValue.elSetValue(prevBean, value, populate);
lastElPropertyValue.pathSet(prevBean, value);
}
}
}
@@ -60,53 +60,10 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath {
*/
int getDeployOrder();
/**
* Return the default StringParser for the scalar property.
*/
StringParser getStringParser();
/**
* Return true if the last type is "DateTime capable" - can support
* {@link #parseDateTime(long)}.
*/
boolean isDateTimeCapable();
/**
* Return the underlying JDBC type or 0 if this is not a scalar type.
*/
int getJdbcType();
/**
* For DateTime capable scalar types convert the long systemTimeMillis into
* an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc).
*/
Object parseDateTime(long systemTimeMillis);
/**
* Return the value from a given entity bean.
*/
Object elGetValue(EntityBean bean);
/**
* Return the value ensuring objects prior to the top scalar property are
* automatically populated.
*/
Object elGetReference(EntityBean bean);
/**
* Set a value given a root level bean.
* <p>
* If populate then
* </p>
*/
void elSetValue(EntityBean bean, Object value, boolean populate);
/**
* Convert the value to the expected type.
* <p>
* Typically useful for converting strings to the appropriate number type
* etc.
* </p>
*/
Object elConvertType(Object value);
}
@@ -230,7 +230,6 @@ public final class CQueryPlanStats {
return queryPlan.isAutoTuned();
}
@Override
public String getQueryPlanHash() {
return queryPlan.getPlanKey().toString();
@@ -13,6 +13,7 @@ import java.util.Locale;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.plugin.ExpressionPath;
import com.avaje.ebean.text.StringParser;
import com.avaje.ebean.text.TextException;
import com.avaje.ebean.text.TimeStringParser;
@@ -24,8 +25,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
/**
*
* @author rbygrave
* Implementation of the CsvReader
*/
public class TCsvReader<T> implements CsvReader<T> {
@@ -55,9 +55,6 @@ public class TCsvReader<T> implements CsvReader<T> {
private boolean addPropertiesFromHeader;
// private String addHeaderDateTimeFormat;
// private Locale addHeaderLocale;
public TCsvReader(EbeanServer server, BeanDescriptor<T> descriptor) {
this.server = server;
this.descriptor = descriptor;
@@ -114,11 +111,10 @@ public class TCsvReader<T> implements CsvReader<T> {
public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) {
ElPropertyValue elProp = descriptor.getElGetValue(propertyName);
ExpressionPath elProp = descriptor.getExpressionPath(propertyName);
if (!elProp.isDateTimeCapable()) {
throw new TextException("Property " + propertyName + " is not DateTime capable");
}
if (dateTimeFormat == null) {
dateTimeFormat = getDefaultDateTimeFormat(elProp.getJdbcType());
}
@@ -150,7 +146,7 @@ public class TCsvReader<T> implements CsvReader<T> {
public void addProperty(String propertyName, StringParser parser) {
ElPropertyValue elProp = descriptor.getElGetValue(propertyName);
ExpressionPath elProp = descriptor.getExpressionPath(propertyName);
if (parser == null) {
parser = elProp.getStringParser();
}
@@ -214,7 +210,7 @@ public class TCsvReader<T> implements CsvReader<T> {
callback.end(row);
} catch (Exception e) {
// notify that an error occured so that any
// notify that an error occurred so that any
// transaction can be rolled back if required
callback.endWithError(row, e);
throw e;
@@ -285,26 +281,23 @@ public class TCsvReader<T> implements CsvReader<T> {
*/
public static class CsvColumn {
private final ElPropertyValue elProp;
private final ExpressionPath path;
private final StringParser parser;
private final boolean ignore;
/**
* Constructor for the IGNORE column.
*/
private CsvColumn() {
this.elProp = null;
this.path = null;
this.parser = null;
this.ignore = true;
}
/**
* Construct with a property and parser.
*/
public CsvColumn(ElPropertyValue elProp, StringParser parser) {
this.elProp = elProp;
public CsvColumn(ExpressionPath path, StringParser parser) {
this.path = path;
this.parser = parser;
this.ignore = false;
}
/**
@@ -312,9 +305,9 @@ public class TCsvReader<T> implements CsvReader<T> {
*/
public void convertAndSet(String strValue, EntityBean bean) {
if (!ignore) {
if (parser != null && path != null) {
Object value = parser.parse(strValue);
elProp.elSetValue(bean, value, true);
path.pathSet(bean, value);
}
}
}
@@ -327,19 +320,19 @@ public class TCsvReader<T> implements CsvReader<T> {
private static class DateTimeParser implements StringParser {
private final DateFormat dateFormat;
private final ElPropertyValue elProp;
private final ExpressionPath path;
private final String format;
DateTimeParser(DateFormat dateFormat, String format, ElPropertyValue elProp) {
DateTimeParser(DateFormat dateFormat, String format, ExpressionPath path) {
this.dateFormat = dateFormat;
this.elProp = elProp;
this.path = path;
this.format = format;
}
public Object parse(String value) {
try {
Date dt = dateFormat.parse(value);
return elProp.parseDateTime(dt.getTime());
return path.parseDateTime(dt.getTime());
} catch (ParseException e) {
throw new TextException("Error parsing [" + value + "] using format[" + format + "]", e);
@@ -28,7 +28,8 @@ public class CtCompoundPropertyElAdapter implements ElPropertyValue {
this.deployOrder = deployOrder;
}
public Object elConvertType(Object value) {
@Override
public Object convert(Object value) {
return value;
}
@@ -36,16 +37,13 @@ public class CtCompoundPropertyElAdapter implements ElPropertyValue {
return bean;
}
public Object elGetValue(EntityBean bean) {
@Override
public Object pathGet(Object bean) {
return prop.getValue(bean);
}
@Override
public void set(Object bean, Object value) {
elSetValue((EntityBean) bean, value, true);
}
public void elSetValue(EntityBean bean, Object value, boolean populate) {
public void pathSet(Object bean, Object value) {
prop.setValue(bean, value);
}