Permalink
Browse files

Explicit expression types

Updated DSL and tests to match reference manual and cookbook
Introduced Clauses
  • Loading branch information...
1 parent bf6571d commit 4ae0202b035790bd393a805e8756b3e4a9fb82da @rickardoberg rickardoberg committed Jun 26, 2012
Showing with 2,307 additions and 2,699 deletions.
  1. +6 −8 src/main/java/org/neo4j/cypherdsl/{querydsl/QueryDSLWhere.java → BooleanExpression.java}
  2. +5 −15 src/main/java/org/neo4j/cypherdsl/{query/QueryWith.java → CollectionExpression.java}
  3. +1 −3 src/main/java/org/neo4j/cypherdsl/Create.java
  4. +333 −479 src/main/java/org/neo4j/cypherdsl/CypherQuery.java
  5. +1 −3 src/main/java/org/neo4j/cypherdsl/Delete.java
  6. +10 −10 src/main/java/org/neo4j/cypherdsl/{query → }/Expression.java
  7. +1 −1 src/main/java/org/neo4j/cypherdsl/ForEach.java
  8. +12 −5 src/main/java/org/neo4j/cypherdsl/{query → }/ForEachStatement.java
  9. +4 −6 src/main/java/org/neo4j/cypherdsl/ForEachStatements.java
  10. +46 −0 src/main/java/org/neo4j/cypherdsl/LiteralCollection.java
  11. +2 −4 src/main/java/org/neo4j/cypherdsl/Match.java
  12. +6 −14 src/main/java/org/neo4j/cypherdsl/{query/IsNull.java → NodeExpression.java}
  13. +46 −0 src/main/java/org/neo4j/cypherdsl/NumericExpression.java
  14. +0 −2 src/main/java/org/neo4j/cypherdsl/OrderBy.java
  15. +29 −0 src/main/java/org/neo4j/cypherdsl/PathExpression.java
  16. +4 −6 ...ain/java/org/neo4j/cypherdsl/{querydsl/QueryDSLStartNext.java → PropertyContainerExpression.java}
  17. +29 −0 src/main/java/org/neo4j/cypherdsl/ReferenceExpression.java
  18. +1 −3 src/main/java/org/neo4j/cypherdsl/Relate.java
  19. +29 −0 src/main/java/org/neo4j/cypherdsl/RelationshipExpression.java
  20. +0 −3 src/main/java/org/neo4j/cypherdsl/Return.java
  21. +30 −0 src/main/java/org/neo4j/cypherdsl/ScalarExpression.java
  22. +49 −0 src/main/java/org/neo4j/cypherdsl/StringExpression.java
  23. +1 −3 src/main/java/org/neo4j/cypherdsl/Where.java
  24. +0 −2 src/main/java/org/neo4j/cypherdsl/With.java
  25. +85 −0 src/main/java/org/neo4j/cypherdsl/query/AbstractExpression.java
  26. +0 −243 src/main/java/org/neo4j/cypherdsl/query/AbstractPath.java
  27. +0 −40 src/main/java/org/neo4j/cypherdsl/query/BinaryPredicateExpression.java
  28. +0 −90 src/main/java/org/neo4j/cypherdsl/query/BooleanExpression.java
  29. +0 −62 src/main/java/org/neo4j/cypherdsl/query/CommonProperty.java
  30. +57 −0 src/main/java/org/neo4j/cypherdsl/query/Expressions.java
  31. +17 −6 src/main/java/org/neo4j/cypherdsl/query/{Has.java → Extract.java}
  32. +16 −6 src/main/java/org/neo4j/cypherdsl/query/{Link.java → Filter.java}
  33. +10 −111 src/main/java/org/neo4j/cypherdsl/query/FunctionExpression.java
  34. +35 −39 src/main/java/org/neo4j/cypherdsl/query/Identifier.java
  35. +6 −3 src/main/java/org/neo4j/cypherdsl/query/IterablePredicateExpression.java
  36. +30 −10 src/main/java/org/neo4j/cypherdsl/query/Literal.java
  37. +0 −109 src/main/java/org/neo4j/cypherdsl/query/MatchExpression.java
  38. +48 −0 src/main/java/org/neo4j/cypherdsl/query/NamedPath.java
  39. +0 −84 src/main/java/org/neo4j/cypherdsl/query/NumberProperty.java
  40. +18 −9 src/main/java/org/neo4j/cypherdsl/query/{BinaryOperatorExpression.java → Operator.java}
  41. +3 −2 src/main/java/org/neo4j/cypherdsl/query/OrderByExpression.java
  42. +19 −5 src/main/java/org/neo4j/cypherdsl/query/Parameter.java
  43. +82 −44 src/main/java/org/neo4j/cypherdsl/query/Path.java
  44. +170 −0 src/main/java/org/neo4j/cypherdsl/query/PathRelationship.java
  45. +0 −48 src/main/java/org/neo4j/cypherdsl/query/PredicateExpression.java
  46. +19 −80 src/main/java/org/neo4j/cypherdsl/query/Property.java
  47. +2 −0 src/main/java/org/neo4j/cypherdsl/query/PropertyValue.java
  48. +1 −1 src/main/java/org/neo4j/cypherdsl/query/PropertyValues.java
  49. +5 −3 src/main/java/org/neo4j/cypherdsl/query/Query.java
  50. +3 −1 src/main/java/org/neo4j/cypherdsl/query/Regexp.java
  51. +12 −4 src/main/java/org/neo4j/cypherdsl/query/ReturnExpression.java
  52. +4 −2 src/main/java/org/neo4j/cypherdsl/query/SetProperty.java
  53. +7 −7 src/main/java/org/neo4j/cypherdsl/query/StartExpression.java
  54. +0 −57 src/main/java/org/neo4j/cypherdsl/query/StringProperty.java
  55. +15 −6 src/main/java/org/neo4j/cypherdsl/query/{IsNotNull.java → SuffixFunctionExpression.java}
  56. +262 −0 src/main/java/org/neo4j/cypherdsl/query/Value.java
  57. +0 −150 src/main/java/org/neo4j/cypherdsl/query/WhereExpression.java
  58. +2 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/Clause.java
  59. +5 −4 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/CreateClause.java
  60. +6 −4 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/DeleteClause.java
  61. +12 −5 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/ForEachClause.java
  62. +1 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/LimitClause.java
  63. +5 −4 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/MatchClause.java
  64. +3 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/OrderByClause.java
  65. +5 −4 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/RelateClause.java
  66. +3 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/ReturnClause.java
  67. +2 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/SetClause.java
  68. +1 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/SkipClause.java
  69. +2 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/StartClause.java
  70. +5 −4 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/WhereClause.java
  71. +2 −1 src/main/java/org/neo4j/cypherdsl/query/{ → clause}/WithClause.java
  72. +3 −3 src/main/java/org/neo4j/cypherdsl/query/neo4j/StartExpressionNeo.java
  73. +149 −271 src/main/java/org/neo4j/cypherdsl/querydsl/CypherQueryDSL.java
  74. +0 −34 src/main/java/org/neo4j/cypherdsl/querydsl/QueryDSLMatch.java
  75. +0 −133 src/main/java/org/neo4j/cypherdsl/querydsl/QueryDSLMatchExpression.java
  76. +14 −13 src/test/java/org/neo4j/cypherdsl/CypherExecutionTest.java
  77. +25 −17 src/test/java/org/neo4j/cypherdsl/CypherQueryTest.java
  78. +8 −7 src/test/java/org/neo4j/cypherdsl/CypherQueryTest2.java
  79. +444 −370 src/test/java/org/neo4j/cypherdsl/CypherReferenceTest.java
  80. +2 −2 src/test/java/org/neo4j/cypherdsl/JSONSerializerTest.java
  81. +37 −27 src/test/java/org/neo4j/cypherdsl/querydsl/QueryDSLTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2002-2012 "Neo Technology,"
+ * Copyright (c) 2002-2011 "Neo Technology,"
* Network Engine for Objects in Lund AB [http://neotechnology.com]
*
* This file is part of Neo4j.
@@ -17,17 +17,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.neo4j.cypherdsl.querydsl;
-import com.mysema.query.types.Predicate;
-import org.neo4j.cypherdsl.Return;
-import org.neo4j.cypherdsl.Where;
+package org.neo4j.cypherdsl;
/**
* TODO
*/
-public interface QueryDSLWhere
- extends Where
+public interface BooleanExpression
+ extends ScalarExpression
{
- QueryDSLWhere where( Predicate predicate );
+ BooleanExpression and(BooleanExpression expression);
+ BooleanExpression or(BooleanExpression expression);
}
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2002-2012 "Neo Technology,"
+ * Copyright (c) 2002-2011 "Neo Technology,"
* Network Engine for Objects in Lund AB [http://neotechnology.com]
*
* This file is part of Neo4j.
@@ -18,23 +18,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.neo4j.cypherdsl.query;
+package org.neo4j.cypherdsl;
/**
* TODO
*/
-public class QueryWith
- implements AsString
+public interface CollectionExpression
+ extends Expression
{
- private Query query;
-
-
-
- @Override
- public void asString( StringBuilder builder )
- {
- query.asString( builder );
-
-
- }
+ CollectionExpression union(CollectionExpression expression);
}
@@ -20,12 +20,10 @@
package org.neo4j.cypherdsl;
-import org.neo4j.cypherdsl.query.AbstractPath;
-
/**
* TODO
*/
public interface Create
{
- UpdateNext create(AbstractPath<?>... paths);
+ UpdateNext create(PathExpression... paths);
}
Oops, something went wrong.

0 comments on commit 4ae0202

Please sign in to comment.