cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject git commit: cleanup
Date Sun, 02 Nov 2014 10:44:44 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master f24b81b17 -> 6e982b5a6


cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/6e982b5a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/6e982b5a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/6e982b5a

Branch: refs/heads/master
Commit: 6e982b5a69b5fc0e69f419ebba87fdaedd9f99aa
Parents: f24b81b
Author: aadamchik <aadamchik@apache.org>
Authored: Sun Nov 2 13:21:01 2014 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Sun Nov 2 13:44:31 2014 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/cayenne/exp/Expression.java     | 8 +++-----
 .../src/main/java/org/apache/cayenne/query/SelectQuery.java  | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/6e982b5a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
index b272243..41aabc0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
@@ -353,13 +353,11 @@ public abstract class Expression implements Serializable, XMLSerializable
{
 	 *         real values, or null if the whole expression was pruned, due to
 	 *         the missing parameters.
 	 * 
-	 * @deprecated since 4.0 use {@link #params(Map)} or
-	 *             {@link #paramsNoPrune(Map)}.
+	 * @deprecated since 4.0 use {@link #params(Map, boolean)} instead.
 	 */
 	@Deprecated
-	public Expression expWithParameters(Map<String, ?> parameters,
-			boolean pruneMissing) {
-		return transform(new NamedParamTransformer(parameters, pruneMissing));
+	public Expression expWithParameters(Map<String, ?> parameters, boolean pruneMissing)
{
+		return params(parameters, pruneMissing);
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/cayenne/blob/6e982b5a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
index b6decbc..8046a8c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
@@ -43,6 +43,8 @@ import org.apache.cayenne.util.XMLSerializable;
  */
 public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery, XMLSerializable,
Select<T> {
 
+	private static final long serialVersionUID = 5486418811888197559L;
+	
 	public static final String DISTINCT_PROPERTY = "cayenne.SelectQuery.distinct";
 	public static final boolean DISTINCT_DEFAULT = false;
 
@@ -471,7 +473,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
 
 		// substitute qualifier parameters
 		if (qualifier != null) {
-			query.setQualifier(qualifier.expWithParameters(parameters, pruneMissing));
+			query.setQualifier(qualifier.params(parameters, pruneMissing));
 		}
 
 		return query;


Mime
View raw message