mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
WIP Java8 types - ScalarTypeDuration etc
This commit is contained in:
1 parent
4a882b537c
commit
7f30dc7b1e
59 files changed
+1857
-558
No files matched your search
@@ -41,29 +41,6 @@ import com.fasterxml.jackson.core.JsonToken;
|
||||
*/
|
||||
public class BeanProperty implements ElPropertyValue {
|
||||
|
||||
/**
|
||||
* Advanced bean deployment. To exclude this property from update where
|
||||
* clause.
|
||||
*/
|
||||
public static final String EXCLUDE_FROM_UPDATE_WHERE = "EXCLUDE_FROM_UPDATE_WHERE";
|
||||
|
||||
/**
|
||||
* Advanced bean deployment. To exclude this property from delete where
|
||||
* clause.
|
||||
*/
|
||||
public static final String EXCLUDE_FROM_DELETE_WHERE = "EXCLUDE_FROM_DELETE_WHERE";
|
||||
|
||||
/**
|
||||
* Advanced bean deployment. To exclude this property from insert.
|
||||
*/
|
||||
public static final String EXCLUDE_FROM_INSERT = "EXCLUDE_FROM_INSERT";
|
||||
|
||||
/**
|
||||
* Advanced bean deployment. To exclude this property from update set
|
||||
* clause.
|
||||
*/
|
||||
public static final String EXCLUDE_FROM_UPDATE = "EXCLUDE_FROM_UPDATE";
|
||||
|
||||
/**
|
||||
* Flag to mark this at part of the unique id.
|
||||
*/
|
||||
@@ -488,15 +465,7 @@ public class BeanProperty implements ElPropertyValue {
|
||||
* Return true if the underlying type is mutable.
|
||||
*/
|
||||
public boolean isMutableScalarType() {
|
||||
if (scalarType == null) {
|
||||
return false;
|
||||
}
|
||||
return scalarType.isMutable();
|
||||
}
|
||||
|
||||
public void copyProperty(EntityBean sourceBean, EntityBean destBean) {
|
||||
Object value = getValue(sourceBean);
|
||||
setValue(destBean, value);
|
||||
return scalarType != null && scalarType.isMutable();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -506,10 +475,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return descriptor.getEncryptKey(this);
|
||||
}
|
||||
|
||||
public String getDecryptProperty() {
|
||||
return dbEncryptFunction.getDecryptSql(this.getName());
|
||||
}
|
||||
|
||||
public String getDecryptProperty(String propertyName) {
|
||||
return dbEncryptFunction.getDecryptSql(propertyName);
|
||||
}
|
||||
@@ -575,24 +540,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return owningType.isAssignableFrom(type);
|
||||
}
|
||||
|
||||
public Object readSetOwning(DbReadContext ctx, EntityBean bean, Class<?> type) throws SQLException {
|
||||
|
||||
try {
|
||||
Object value = scalarType.read(ctx.getDataReader());
|
||||
if (value == null || bean == null) {
|
||||
// not setting the value...
|
||||
} else {
|
||||
if (owningType.equals(type)) {
|
||||
setValue(bean, value);
|
||||
}
|
||||
}
|
||||
return value;
|
||||
} catch (Exception e) {
|
||||
String msg = "Error readSet on " + descriptor + "." + name;
|
||||
throw new PersistenceException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
public void loadIgnore(DbReadContext ctx) {
|
||||
scalarType.loadIgnore(ctx.getDataReader());
|
||||
}
|
||||
@@ -616,16 +563,13 @@ public class BeanProperty implements ElPropertyValue {
|
||||
public Object readSet(DbReadContext ctx, EntityBean bean, Class<?> type) throws SQLException {
|
||||
|
||||
try {
|
||||
Object value = scalarType.read(ctx.getDataReader());
|
||||
if (bean == null || (type != null && !owningType.isAssignableFrom(type))) {
|
||||
// not setting the value...
|
||||
} else {
|
||||
setValue(bean, value);
|
||||
}
|
||||
return value;
|
||||
Object value = scalarType.read(ctx.getDataReader());
|
||||
if (bean != null && ((type == null || owningType.isAssignableFrom(type)))) {
|
||||
setValue(bean, value);
|
||||
}
|
||||
return value;
|
||||
} catch (Exception e) {
|
||||
String msg = "Error readSet on " + descriptor + "." + name;
|
||||
throw new PersistenceException(msg, e);
|
||||
throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -653,21 +597,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return scalarType.readData(dataInput);
|
||||
}
|
||||
|
||||
public boolean isCascadeValidate() {
|
||||
return cascadeValidate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks to see if a bean is a reference (will be lazy loaded) or a
|
||||
* BeanCollection that has not yet been populated.
|
||||
* <p>
|
||||
* For base types this returns true.
|
||||
* </p>
|
||||
*/
|
||||
public boolean isValueLoaded(Object value) {
|
||||
return true;
|
||||
}
|
||||
|
||||
public BeanProperty getBeanProperty() {
|
||||
return this;
|
||||
}
|
||||
@@ -737,11 +666,9 @@ public class BeanProperty implements ElPropertyValue {
|
||||
}
|
||||
}
|
||||
|
||||
private static Object[] NO_ARGS = new Object[0];
|
||||
|
||||
public Object getCacheDataValue(EntityBean bean) {
|
||||
return getValue(bean);
|
||||
}
|
||||
}
|
||||
|
||||
public void setCacheDataValue(EntityBean bean, Object cacheData) {
|
||||
setValue(bean, cacheData);
|
||||
@@ -759,19 +686,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
throw new RuntimeException(msg, ex);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Explicitly use reflection to get value.
|
||||
*/
|
||||
public Object getValueViaReflection(Object bean) {
|
||||
try {
|
||||
return readMethod.invoke(bean, NO_ARGS);
|
||||
} catch (Exception ex) {
|
||||
String beanType = bean == null ? "null" : bean.getClass().getName();
|
||||
String msg = "get " + name + " on [" + descriptor + "] type[" + beanType + "] threw error.";
|
||||
throw new RuntimeException(msg, ex);
|
||||
}
|
||||
}
|
||||
|
||||
public Object getValueIntercept(EntityBean bean) {
|
||||
try {
|
||||
@@ -826,13 +740,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is a full ElGetValue.
|
||||
*/
|
||||
public boolean isDeployOnly() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsFormulaWithJoin() {
|
||||
return formula && sqlFormulaJoin != null;
|
||||
@@ -902,7 +809,7 @@ public class BeanProperty implements ElPropertyValue {
|
||||
/**
|
||||
* Return the scalarType.
|
||||
*/
|
||||
public ScalarType<?> getScalarType() {
|
||||
public ScalarType<Object> getScalarType() {
|
||||
return scalarType;
|
||||
}
|
||||
|
||||
@@ -923,7 +830,7 @@ public class BeanProperty implements ElPropertyValue {
|
||||
}
|
||||
|
||||
public Object parseDateTime(long systemTimeMillis) {
|
||||
return scalarType.parseDateTime(systemTimeMillis);
|
||||
return scalarType.convertFromMillis(systemTimeMillis);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1031,10 +938,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return version;
|
||||
}
|
||||
|
||||
public String getDeployProperty() {
|
||||
return dbColumn;
|
||||
}
|
||||
|
||||
/**
|
||||
* The database column name this is mapped to.
|
||||
*/
|
||||
@@ -1168,13 +1071,6 @@ public class BeanProperty implements ElPropertyValue {
|
||||
return embedded;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an extra attribute set on this property.
|
||||
*/
|
||||
public String getExtraAttribute(String key) {
|
||||
return extraAttributeMap.get(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the default value.
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user