You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/08/28 10:05:57 UTC
[1/3] cayenne git commit: If the transformer returns PRUNED_NODE,
this cast fails which isn't correct
Repository: cayenne
Updated Branches:
refs/heads/master c58fced08 -> 0a084ed6b
If the transformer returns PRUNED_NODE, this cast fails which isn't correct
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1befbe67
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1befbe67
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1befbe67
Branch: refs/heads/master
Commit: 1befbe6722abe7baa127a6ee23909a11ce8d114b
Parents: 36faff5
Author: John Larson <la...@torqwrench.com>
Authored: Fri Aug 17 22:32:29 2018 -0500
Committer: John Larson <la...@torqwrench.com>
Committed: Fri Aug 17 22:32:29 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/cayenne/exp/Expression.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1befbe67/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 629549c..569416c 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
@@ -620,7 +620,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
}
// all the children are processed, only now transform this copy
- return (transformer != null) ? (Expression) transformer.apply(copy) : copy;
+ return (transformer != null) ? transformer.apply(copy) : copy;
}
/**
[3/3] cayenne git commit: CAY-2464 ClassCastException when returning
PRUNED_NODE in expression transformer test case and release notes
Posted by nt...@apache.org.
CAY-2464 ClassCastException when returning PRUNED_NODE in expression transformer
test case and release notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0a084ed6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0a084ed6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0a084ed6
Branch: refs/heads/master
Commit: 0a084ed6b2445b04d6408b314134311bc75d326c
Parents: f7c8acc
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Aug 28 13:00:53 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Aug 28 13:00:53 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../java/org/apache/cayenne/exp/ExpressionTest.java | 13 +++++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0a084ed6/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 9ea8f78..889ee0c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship
CAY-2454 Modeler: Unable to read validation message if it's truncated
CAY-2459 Modeler: DataMap paste function is not working
CAY-2463 Modeler: DB Schema generation doesn't work
+CAY-2464 ClassCastException when returning PRUNED_NODE in expression transformer
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0a084ed6/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTest.java
index cf56194..2d62312 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTest.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.List;
import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.exp.parser.ASTFalse;
import org.apache.cayenne.exp.parser.SimpleNode;
import org.apache.cayenne.testdo.testmap.Artist;
import org.junit.Test;
@@ -429,4 +430,16 @@ public class ExpressionTest {
assertEquals("a = enum:org.apache.cayenne.exp.ExpEnum1.TWO", buffer.toString());
}
+ @Test
+ public void testCustomPruneTransform() {
+ Expression exp = ExpressionFactory.exp("(false and true) and true");
+ Expression transformed = exp.transform(node -> {
+ if(node instanceof ASTFalse) {
+ return Expression.PRUNED_NODE;
+ }
+ return node;
+ });
+ assertEquals("true and true", transformed.toString());
+ }
+
}
[2/3] cayenne git commit: Merge PR #303
Posted by nt...@apache.org.
Merge PR #303
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f7c8acca
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f7c8acca
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f7c8acca
Branch: refs/heads/master
Commit: f7c8accab3133b0be19f03a6f771bbcf7ba3de5e
Parents: c58fced 1befbe6
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Aug 28 12:59:35 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Aug 28 12:59:35 2018 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/cayenne/exp/Expression.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------