#616 - No effective change - rename methods

This commit is contained in:
Robin Bygrave committed 2016-03-23 18:11:25 +13:00
1 parent a227f8c469
commit 6fe557e237
10 files changed
+22 -22

No files matched your search

@@ -46,7 +46,7 @@ class InExpression extends AbstractExpression {
} else {
// extract the id values from the bean
Object[] ids = prop.getAssocOneIdValues((EntityBean) values[i]);
Object[] ids = prop.getAssocIdValues((EntityBean) values[i]);
if (ids != null) {
for (int j = 0; j < ids.length; j++) {
request.addBindValue(ids[j]);
@@ -39,7 +39,7 @@ class NullExpression extends AbstractExpression {
ElPropertyValue prop = getElProp(request);
if (prop != null && prop.isAssocId()) {
request.append(prop.getAssocOneIdExpr(propertyName, nullExpr));
request.append(prop.getAssocIdExpression(propertyName, nullExpr));
return;
}
@@ -28,8 +28,8 @@ public class SimpleExpression extends AbstractExpression {
}
ExpressionPath prop = context.getExpressionPath(propName);
if (prop != null && prop.isAssocId()) {
String idName = prop.getAssocOneIdExpr(propName, "");
Object[] ids = prop.getAssocOneIdValues((EntityBean) value);
String idName = prop.getAssocIdExpression(propName, "");
Object[] ids = prop.getAssocIdValues((EntityBean) value);
if (ids == null || ids.length != 1) {
throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + ids);
}
@@ -57,7 +57,7 @@ public class SimpleExpression extends AbstractExpression {
ElPropertyValue prop = getElProp(request);
if (prop != null) {
if (prop.isAssocId()) {
Object[] ids = prop.getAssocOneIdValues((EntityBean) value);
Object[] ids = prop.getAssocIdValues((EntityBean) value);
if (ids != null) {
for (int i = 0; i < ids.length; i++) {
request.addBindValue(ids[i]);
@@ -84,7 +84,7 @@ public class SimpleExpression extends AbstractExpression {
ElPropertyValue prop = getElProp(request);
if (prop != null) {
if (prop.isAssocId()) {
request.append(prop.getAssocOneIdExpr(propName, type.bind()));
request.append(prop.getAssocIdExpression(propName, type.bind()));
return;
}
if (prop.isDbEncrypted()) {