Merge in v4 code changes

This commit is contained in:
Rob Bygrave committed 2014-04-03 03:47:55 +13:00
commit 96e4b4640f
171 files changed
+2747 -3848

No files matched your search

@@ -2,6 +2,8 @@ package com.avaje.ebeaninternal.server.el;
import java.util.Comparator;
import com.avaje.ebean.bean.EntityBean;
/**
* Comparator based on a ElGetValue.
*/
@@ -21,15 +23,15 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
public int compare(T o1, T o2) {
Object val1 = elGetValue.elGetValue(o1);
Object val2 = elGetValue.elGetValue(o2);
Object val1 = elGetValue.elGetValue((EntityBean)o1);
Object val2 = elGetValue.elGetValue((EntityBean)o2);
return compareValues(val1, val2);
}
public int compareValue(Object value, T o2) {
Object val2 = elGetValue.elGetValue(o2);
Object val2 = elGetValue.elGetValue((EntityBean)o2);
return compareValues(value, val2);
}
@@ -4,6 +4,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import com.avaje.ebean.bean.EntityBean;
/**
* Contains the various ElMatcher implementations.
@@ -26,7 +28,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return pattern.matcher(v).matches();
}
}
@@ -53,7 +55,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return value.equalsIgnoreCase(v);
}
}
@@ -73,7 +75,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return charMatch.startsWith(v);
}
}
@@ -93,7 +95,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return charMatch.endsWith(v);
}
}
@@ -104,7 +106,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return value.startsWith(v);
}
}
@@ -115,7 +117,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
String v = (String)elGetValue.elGetValue(bean);
String v = (String)elGetValue.elGetValue((EntityBean)bean);
return value.endsWith(v);
}
}
@@ -129,7 +131,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
return (null == elGetValue.elGetValue(bean));
return (null == elGetValue.elGetValue((EntityBean)bean));
}
}
@@ -142,7 +144,7 @@ class ElMatchBuilder {
}
public boolean isMatch(T bean) {
return (null != elGetValue.elGetValue(bean));
return (null != elGetValue.elGetValue((EntityBean)bean));
}
}
@@ -173,7 +175,7 @@ class ElMatchBuilder {
public boolean isMatch(T bean) {
Object value = elGetValue.elGetValue(bean);
Object value = elGetValue.elGetValue((EntityBean)bean);
if (value == null){
return false;
}
@@ -156,7 +156,7 @@ public class ElPropertyChain implements ElPropertyValue {
return lastElPropertyValue.isLocalEncrypted();
}
public Object[] getAssocOneIdValues(Object bean) {
public Object[] getAssocOneIdValues(EntityBean bean) {
// Don't navigate the object graph as bean
// is assumed to be the appropriate type
return lastElPropertyValue.getAssocOneIdValues(bean);
@@ -231,10 +231,10 @@ public class ElPropertyChain implements ElPropertyValue {
return lastElPropertyValue.elConvertType(value);
}
public Object elGetValue(Object bean) {
public Object elGetValue(EntityBean bean) {
for (int i = 0; i < chain.length; i++) {
bean = chain[i].elGetValue(bean);
bean = (EntityBean)chain[i].elGetValue(bean);
if (bean == null) {
return null;
}
@@ -243,24 +243,22 @@ public class ElPropertyChain implements ElPropertyValue {
return bean;
}
public Object elGetReference(Object bean) {
public Object elGetReference(EntityBean bean) {
Object prevBean = bean;
EntityBean prevBean = bean;
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = chain[i].elGetReference(prevBean);
prevBean = (EntityBean)chain[i].elGetReference(prevBean);
}
// try the last step in the chain
bean = chain[last].elGetValue(prevBean);
return bean;
return chain[last].elGetValue(prevBean);
}
public void elSetLoaded(Object bean) {
public void elSetLoaded(EntityBean bean) {
for (int i = 0; i < last; i++) {
bean = chain[i].elGetValue(bean);
bean = (EntityBean)chain[i].elGetValue(bean);
if (bean == null){
break;
}
@@ -270,10 +268,10 @@ public class ElPropertyChain implements ElPropertyValue {
}
}
public void elSetReference(Object bean) {
public void elSetReference(EntityBean bean) {
for (int i = 0; i < last; i++) {
bean = chain[i].elGetValue(bean);
bean = (EntityBean)chain[i].elGetValue(bean);
if (bean == null){
break;
}
@@ -283,18 +281,18 @@ public class ElPropertyChain implements ElPropertyValue {
}
}
public void elSetValue(Object bean, Object value, boolean populate, boolean reference){
public void elSetValue(EntityBean bean, Object value, boolean populate, boolean reference){
Object prevBean = bean;
EntityBean prevBean = bean;
if (populate){
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = chain[i].elGetReference(prevBean);
prevBean = (EntityBean)chain[i].elGetReference(prevBean);
}
} else {
for (int i = 0; i < last; i++) {
// always return non null prevBean
prevBean = chain[i].elGetValue(prevBean);
prevBean = (EntityBean)chain[i].elGetValue(prevBean);
if (prevBean == null){
break;
}
@@ -1,5 +1,6 @@
package com.avaje.ebeaninternal.server.el;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.text.StringFormatter;
import com.avaje.ebean.text.StringParser;
@@ -14,7 +15,7 @@ public interface ElPropertyValue extends ElPropertyDeploy {
/**
* Return the Id values for the given bean value.
*/
public Object[] getAssocOneIdValues(Object bean);
public Object[] getAssocOneIdValues(EntityBean bean);
/**
* Return the Id expression string.
@@ -89,13 +90,13 @@ public interface ElPropertyValue extends ElPropertyDeploy {
/**
* Return the value from a given entity bean.
*/
public Object elGetValue(Object bean);
public Object elGetValue(EntityBean bean);
/**
* Return the value ensuring objects prior to the top scalar property are
* automatically populated.
*/
public Object elGetReference(Object bean);
public Object elGetReference(EntityBean bean);
/**
* Set a value given a root level bean.
@@ -103,12 +104,12 @@ public interface ElPropertyValue extends ElPropertyDeploy {
* If populate then
* </p>
*/
public void elSetValue(Object bean, Object value, boolean populate, boolean reference);
public void elSetValue(EntityBean bean, Object value, boolean populate, boolean reference);
/**
* Make the owning bean of this property a reference (as in not new/dirty).
*/
public void elSetReference(Object bean);
public void elSetReference(EntityBean bean);
/**
* Convert the value to the expected type.