From 6356061f3e25c3b92d914eac483a31c23c8cffc3 Mon Sep 17 00:00:00 2001 From: Wallace Wadge Date: Thu, 19 May 2016 23:26:42 +0200 Subject: [PATCH] QueryDSL v4.x support. --- build.gradle | 5 ++++ gradle/wrapper/gradle-wrapper.properties | 5 ++-- gradlew | 0 .../rsql-querydsl-all/build.gradle | 8 +++---- .../querydsl/DefaultQuerydslRqlParser.java | 4 ++-- .../rql/querydsl/QuerydslMappingParam.java | 5 ++-- .../rql/querydsl/QuerydslMappingResult.java | 8 +++---- .../querydsl/rql/QuerydslRqlParserTest.java | 13 ++++------ .../rsql-querydsl-filter/build.gradle | 8 +++---- .../filter/QueryDslFilterContext.java | 4 ++-- .../filter/QuerydslFilterBuilder.java | 2 +- .../querydsl/filter/QuerydslFilterParam.java | 2 +- .../querydsl/filter/QuerydslRsqlVisitor.java | 13 +++++----- .../UnsupportedRqlOperatorException.java | 3 ++- .../AbstractCollectionPathConverter.java | 8 +++---- .../AbstractTimeRangePathConverter.java | 4 ++-- .../converter/BooleanPathConverter.java | 4 ++-- .../filter/converter/DatePathConverter.java | 2 +- .../converter/DateTimePathConverter.java | 2 +- .../DefaultCollectionPathConverter.java | 5 ++-- .../filter/converter/EnumPathConverter.java | 4 ++-- .../filter/converter/NumberPathConverter.java | 4 ++-- .../filter/converter/PathConverter.java | 4 ++-- .../converter/PathConverterContext.java | 10 ++++---- .../filter/converter/StringPathConverter.java | 6 ++--- .../filter/converter/TimePathConverter.java | 2 +- .../UnsupportedFieldClassException.java | 3 ++- .../rql/querydsl/filter/CustomNumber.java | 7 +++++- ...uerydslFilterBuilder_BooleanPath_Test.java | 6 ++--- ...ydslFilterBuilder_CollectionPath_Test.java | 6 ++--- .../QuerydslFilterBuilder_DatePath_Test.java | 15 ++++++------ ...erydslFilterBuilder_DateTimePath_Test.java | 14 +++++------ .../QuerydslFilterBuilder_EnumPath_Test.java | 12 +++++----- .../QuerydslFilterBuilder_ListPath_Test.java | 9 ++++--- .../QuerydslFilterBuilder_Multiple_Test.java | 10 ++++---- ...QuerydslFilterBuilder_NumberPath_Test.java | 12 +++++----- .../QuerydslFilterBuilder_SetPath_Test.java | 6 ++--- ...QuerydslFilterBuilder_StringPath_Test.java | 12 +++++----- .../QuerydslFilterBuilder_TimePath_Test.java | 14 +++++------ .../rql/querydsl/util/FilterAssertUtil.java | 21 ++++++++-------- .../querydsl/util/PathConstructorInfo.java | 3 ++- .../build.gradle | 24 +++++++++++-------- .../rql/querydsl/test/jpa/dao/UserDao.java | 2 +- .../rql/querydsl/test/jpa/entity/User.java | 23 +++++++++++++++++- .../test/mongo/dao/ContactMongoDao.java | 2 +- .../querydsl/test/jpa/dao/UserDaoTest.java | 23 +++++++++++------- .../querydsl/test/mongo/dao/MongoDaoTest.java | 4 ++-- .../rsql-querydsl-page/build.gradle | 8 +++---- .../querydsl/page/QuerydslPageBuilder.java | 2 +- .../querydsl/page/QuerydslPageContext.java | 3 ++- .../rql/querydsl/page/QuerydslPageParser.java | 2 +- .../page/QuerydslPageContextTest.java | 3 +-- .../rsql-querydsl-select/build.gradle | 8 +++---- .../select/QuerydslSelectBuilder.java | 8 +++---- .../select/QuerydslSelectContext.java | 6 ++--- .../querydsl/select/QuerydslSelectParam.java | 4 ++-- .../select/QuerydslSelectContextTest.java | 6 ++--- .../rsql-querydsl-sort/build.gradle | 8 +++---- .../rql/querydsl/sort/OrderSpecifierList.java | 3 ++- .../querydsl/sort/QuerydslSortBuilder.java | 6 ++--- .../querydsl/sort/QuerydslSortContext.java | 2 +- .../rql/querydsl/sort/QuerydslSortParam.java | 2 +- .../sort/QuerydslSortContextTest.java | 8 +++---- .../rsql-querydsl-spring/build.gradle | 8 +++---- .../rql/querydsl/spring/SpringUtil.java | 4 ++-- .../rql/querydsl/spring/SpringUtilTest.java | 10 ++++---- .../rsql-querydsl-test/build.gradle | 14 +++++------ .../rql/querydsl/test/jpa/Employee.java | 2 +- 68 files changed, 261 insertions(+), 219 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index d52e338..a783a4b 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,8 @@ buildscript { dependencies { classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' + classpath("org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE") + } } @@ -35,7 +37,10 @@ allprojects { maven { url 'http://repo.spring.io/plugins-release' } + maven {url 'https://repo.spring.io/libs-milestone'} maven { url "https://plugins.gradle.org/m2/" } + maven { url "https://repository.jboss.org/nexus/content/repositories/releases" } + maven { url 'https://jitpack.io' } jcenter() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1b1765..c138767 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ -#Thu Mar 24 17:59:59 PHT 2016 +#Thu May 19 21:17:54 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip -org.gradle.daemon=true +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/rsql-querydsl-parent/rsql-querydsl-all/build.gradle b/rsql-querydsl-parent/rsql-querydsl-all/build.gradle index 18fbf96..38e99a2 100644 --- a/rsql-querydsl-parent/rsql-querydsl-all/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-all/build.gradle @@ -7,12 +7,12 @@ dependencies { compile project(':rsql-querydsl-parent:rsql-querydsl-filter') compile project(':rsql-querydsl-parent:rsql-querydsl-page') compile project(':rsql-querydsl-parent:rsql-querydsl-sort') - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' testCompile project(':rsql-querydsl-parent:rsql-querydsl-test') testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } diff --git a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/DefaultQuerydslRqlParser.java b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/DefaultQuerydslRqlParser.java index abfa365..1c430c6 100644 --- a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/DefaultQuerydslRqlParser.java +++ b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/DefaultQuerydslRqlParser.java @@ -25,10 +25,10 @@ package com.github.vineey.rql.querydsl; import com.github.vineey.rql.RqlInput; +import com.github.vineey.rql.core.util.StringUtils; import com.github.vineey.rql.filter.parser.DefaultFilterParser; import com.github.vineey.rql.filter.parser.FilterParser; import com.github.vineey.rql.querydsl.filter.QueryDslFilterContext; -import com.github.vineey.rql.core.util.StringUtils; import com.github.vineey.rql.querydsl.page.QuerydslPageParser; import com.github.vineey.rql.querydsl.select.QuerydslSelectContext; import com.github.vineey.rql.querydsl.sort.QuerydslSortContext; @@ -36,7 +36,7 @@ import com.github.vineey.rql.select.parser.SelectParser; import com.github.vineey.rql.sort.parser.DefaultSortParser; import com.github.vineey.rql.sort.parser.SortParser; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingParam.java b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingParam.java index 1ad3e0d..89108b2 100644 --- a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingParam.java +++ b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingParam.java @@ -24,8 +24,9 @@ */ package com.github.vineey.rql.querydsl; -import com.mysema.query.types.EntityPath; -import com.mysema.query.types.Path; + +import com.querydsl.core.types.EntityPath; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingResult.java b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingResult.java index b430944..f5f6a5a 100644 --- a/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingResult.java +++ b/rsql-querydsl-parent/rsql-querydsl-all/src/main/java/com/github/vineey/rql/querydsl/QuerydslMappingResult.java @@ -24,10 +24,10 @@ */ package com.github.vineey.rql.querydsl; -import com.mysema.query.QueryModifiers; -import com.mysema.query.types.Expression; -import com.mysema.query.types.OrderSpecifier; -import com.mysema.query.types.Predicate; +import com.querydsl.core.QueryModifiers; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Predicate; import java.util.List; diff --git a/rsql-querydsl-parent/rsql-querydsl-all/src/test/java/com/github/vineey/querydsl/rql/QuerydslRqlParserTest.java b/rsql-querydsl-parent/rsql-querydsl-all/src/test/java/com/github/vineey/querydsl/rql/QuerydslRqlParserTest.java index 23a61ae..6db0a24 100644 --- a/rsql-querydsl-parent/rsql-querydsl-all/src/test/java/com/github/vineey/querydsl/rql/QuerydslRqlParserTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-all/src/test/java/com/github/vineey/querydsl/rql/QuerydslRqlParserTest.java @@ -29,11 +29,12 @@ import com.github.vineey.rql.querydsl.QuerydslMappingParam; import com.github.vineey.rql.querydsl.QuerydslMappingResult; import com.github.vineey.rql.querydsl.QuerydslRqlParser; +import com.github.vineey.rql.querydsl.test.jpa.QEmployee; import com.github.vineey.rql.querydsl.test.mongo.QContactDocument; import com.google.common.collect.ImmutableMap; -import com.mysema.query.QueryModifiers; -import com.mysema.query.types.*; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.QueryModifiers; +import com.querydsl.core.types.*; +import com.querydsl.core.types.dsl.BooleanOperation; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,11 +44,7 @@ import java.util.List; import java.util.Map; -import com.github.vineey.rql.querydsl.test.jpa.QEmployee; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * @author vrustia - 4/24/16. */ diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/build.gradle b/rsql-querydsl-parent/rsql-querydsl-filter/build.gradle index a73be51..6f205ee 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-filter/build.gradle @@ -2,13 +2,13 @@ description = 'Querydsl integration for rsql filter' dependencies { compile project(':rsql-api-parent:rsql-api-filter') - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' testCompile project(':rsql-querydsl-parent:rsql-querydsl-test') testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } \ No newline at end of file diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QueryDslFilterContext.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QueryDslFilterContext.java index 05e2c84..f35c570 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QueryDslFilterContext.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QueryDslFilterContext.java @@ -22,8 +22,8 @@ package com.github.vineey.rql.querydsl.filter; import com.github.vineey.rql.filter.FilterContext; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder.java index 03ff4c9..d84945c 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder.java @@ -22,7 +22,7 @@ package com.github.vineey.rql.querydsl.filter; import com.github.vineey.rql.filter.FilterBuilder; -import com.mysema.query.types.Predicate; +import com.querydsl.core.types.Predicate; import cz.jirutka.rsql.parser.ast.Node; /** diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterParam.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterParam.java index 43c599a..fd16bdf 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterParam.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterParam.java @@ -22,7 +22,7 @@ package com.github.vineey.rql.querydsl.filter; import com.github.vineey.rql.filter.FilterParam; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslRsqlVisitor.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslRsqlVisitor.java index 39a3a34..d1d4dd0 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslRsqlVisitor.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/QuerydslRsqlVisitor.java @@ -23,11 +23,10 @@ import com.github.vineey.rql.querydsl.filter.converter.PathConverterContext; import com.google.common.collect.Lists; -import com.mysema.query.types.Operator; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanExpression; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanExpression; import cz.jirutka.rsql.parser.ast.*; import java.util.List; @@ -47,7 +46,7 @@ public Predicate visit(AndNode node, QuerydslFilterParam param) { return evaluateLogicalExpression(node, param, Ops.AND); } - private BooleanExpression evaluateLogicalExpression(LogicalNode node, QuerydslFilterParam param, Operator logicalOperator) { + private BooleanExpression evaluateLogicalExpression(LogicalNode node, QuerydslFilterParam param, Ops logicalOperator) { List children = Lists.newArrayList(node.getChildren()); Node firstNode = children.remove(0); @@ -59,7 +58,7 @@ private BooleanExpression evaluateLogicalExpression(LogicalNode node, QuerydslFi return predicate; } - private BooleanExpression combineByLogicalExpression(Operator logicalOperator, BooleanExpression predicate, Predicate subPredicate) { + private BooleanExpression combineByLogicalExpression(Ops logicalOperator, BooleanExpression predicate, Predicate subPredicate) { BooleanExpression combinedPredicate = predicate; if (Ops.AND.equals(logicalOperator)) { combinedPredicate = predicate.and(subPredicate); diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/UnsupportedRqlOperatorException.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/UnsupportedRqlOperatorException.java index b9f18f4..997e49a 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/UnsupportedRqlOperatorException.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/UnsupportedRqlOperatorException.java @@ -21,7 +21,8 @@ */ package com.github.vineey.rql.querydsl.filter; -import com.mysema.query.types.Expression; + +import com.querydsl.core.types.Expression; import cz.jirutka.rsql.parser.ast.ComparisonNode; /** diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractCollectionPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractCollectionPathConverter.java index 056aa1c..e2c59b2 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractCollectionPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractCollectionPathConverter.java @@ -17,11 +17,11 @@ * SOFTWARE. * */ package com.github.vineey.rql.querydsl.filter.converter; -import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; import com.github.vineey.rql.core.util.CollectionUtils; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.expr.SimpleExpression; -import com.mysema.query.types.path.CollectionPathBase; +import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CollectionPathBase; +import com.querydsl.core.types.dsl.SimpleExpression; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractTimeRangePathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractTimeRangePathConverter.java index 3b38bcc..edb7442 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractTimeRangePathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/AbstractTimeRangePathConverter.java @@ -19,8 +19,8 @@ import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; import com.google.common.collect.Lists; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.expr.TemporalExpression; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.TemporalExpression; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/BooleanPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/BooleanPathConverter.java index 7b47b20..43b92dd 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/BooleanPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/BooleanPathConverter.java @@ -18,8 +18,8 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.path.BooleanPath; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.BooleanPath; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DatePathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DatePathConverter.java index 718e125..3be83eb 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DatePathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DatePathConverter.java @@ -18,7 +18,7 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.github.vineey.rql.querydsl.filter.util.DateUtil; -import com.mysema.query.types.path.DatePath; +import com.querydsl.core.types.dsl.DatePath; import java.time.LocalDate; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DateTimePathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DateTimePathConverter.java index 83cee13..d25864e 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DateTimePathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DateTimePathConverter.java @@ -22,7 +22,7 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.github.vineey.rql.querydsl.filter.util.DateUtil; -import com.mysema.query.types.path.DateTimePath; +import com.querydsl.core.types.dsl.DateTimePath; import java.time.LocalDateTime; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DefaultCollectionPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DefaultCollectionPathConverter.java index 28b678f..a38ccbd 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DefaultCollectionPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/DefaultCollectionPathConverter.java @@ -21,8 +21,9 @@ */ package com.github.vineey.rql.querydsl.filter.converter; -import com.mysema.query.types.expr.SimpleExpression; -import com.mysema.query.types.path.CollectionPathBase; + +import com.querydsl.core.types.dsl.CollectionPathBase; +import com.querydsl.core.types.dsl.SimpleExpression; import java.util.Collection; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/EnumPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/EnumPathConverter.java index c1b0b5f..21dcb10 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/EnumPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/EnumPathConverter.java @@ -23,8 +23,8 @@ import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; import com.github.vineey.rql.querydsl.filter.util.Enums; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.path.EnumPath; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.EnumPath; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/NumberPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/NumberPathConverter.java index 7c40086..1ec4750 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/NumberPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/NumberPathConverter.java @@ -24,8 +24,8 @@ import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; import com.github.vineey.rql.querydsl.filter.util.ConverterUtil; import com.google.common.collect.Lists; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.path.NumberPath; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.NumberPath; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverter.java index 1672508..fb19f25 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverter.java @@ -21,8 +21,8 @@ */ package com.github.vineey.rql.querydsl.filter.converter; -import com.mysema.query.types.Expression; -import com.mysema.query.types.expr.BooleanExpression; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.dsl.BooleanExpression; import cz.jirutka.rsql.parser.ast.ComparisonNode; /** diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverterContext.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverterContext.java index d60918c..ddea830 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverterContext.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/PathConverterContext.java @@ -22,9 +22,8 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; -import com.mysema.query.types.expr.SimpleExpression; -import com.mysema.query.types.path.*; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.*; import java.util.Collection; @@ -39,7 +38,10 @@ public final class PathConverterContext { private static final TimePathConverter TIME_PATH_CONVERTER = new TimePathConverter(); private static final DateTimePathConverter DATE_TIME_PATH_CONVERTER = new DateTimePathConverter(); private static final DatePathConverter DATE_PATH_CONVERTER = new DatePathConverter(); - private static final DefaultCollectionPathConverter, Collection, CollectionPathBase, Object, SimpleExpression>> DEFAULT_COLLECTION_PATH_CONVERTER = new DefaultCollectionPathConverter<>(); + private static final DefaultCollectionPathConverter, + Collection, CollectionPathBase, + Object, + SimpleExpression>> DEFAULT_COLLECTION_PATH_CONVERTER = new DefaultCollectionPathConverter<>(); private final static ImmutableMap, PathConverter> map = ImmutableMap., PathConverter>builder() .put(StringPath.class, STRING_PATH_CONVERTER) .put(EnumPath.class, ENUM_PATH_CONVERTER) diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/StringPathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/StringPathConverter.java index fbce63d..d13abd8 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/StringPathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/StringPathConverter.java @@ -22,9 +22,9 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.github.vineey.rql.querydsl.filter.UnsupportedRqlOperatorException; -import com.mysema.query.types.expr.BooleanExpression; -import com.mysema.query.types.expr.StringExpression; -import com.mysema.query.types.path.StringPath; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.StringExpression; +import com.querydsl.core.types.dsl.StringPath; import cz.jirutka.rsql.parser.ast.ComparisonNode; import cz.jirutka.rsql.parser.ast.ComparisonOperator; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/TimePathConverter.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/TimePathConverter.java index c92a9e1..19d7e50 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/TimePathConverter.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/TimePathConverter.java @@ -22,7 +22,7 @@ package com.github.vineey.rql.querydsl.filter.converter; import com.github.vineey.rql.querydsl.filter.util.DateUtil; -import com.mysema.query.types.path.TimePath; +import com.querydsl.core.types.dsl.TimePath; import java.time.LocalTime; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/UnsupportedFieldClassException.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/UnsupportedFieldClassException.java index 2097446..d1238b6 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/UnsupportedFieldClassException.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/main/java/com/github/vineey/rql/querydsl/filter/converter/UnsupportedFieldClassException.java @@ -21,7 +21,8 @@ */ package com.github.vineey.rql.querydsl.filter.converter; -import com.mysema.query.types.Path; + +import com.querydsl.core.types.Path; /** * @author vrustia on 10/10/2015. diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/CustomNumber.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/CustomNumber.java index 34f4de3..2aba943 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/CustomNumber.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/CustomNumber.java @@ -27,7 +27,7 @@ /** * @author vrustia - 4/17/16. */ -public class CustomNumber extends Number { +public class CustomNumber extends Number implements Comparable { @Override public double doubleValue() { return 0; @@ -47,4 +47,9 @@ public long longValue() { public float floatValue() { return 0; } + + @Override + public int compareTo(Object o) { + return 0; + } } diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_BooleanPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_BooleanPath_Test.java index af706d0..3855cc1 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_BooleanPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_BooleanPath_Test.java @@ -22,9 +22,9 @@ import com.github.vineey.rql.filter.parser.FilterParser; import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.github.vineey.rql.querydsl.util.FilterAssertUtil; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_CollectionPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_CollectionPath_Test.java index 9d53ad6..6969361 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_CollectionPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_CollectionPath_Test.java @@ -24,9 +24,9 @@ import com.github.vineey.rql.filter.parser.DefaultFilterParser; import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DatePath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DatePath_Test.java index 13fbca8..5a33682 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DatePath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DatePath_Test.java @@ -30,13 +30,12 @@ import com.github.vineey.rql.querydsl.util.FilterAssertUtil; import com.github.vineey.rql.querydsl.util.PathTestUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.ConstantImpl; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.DatePath; -import com.mysema.query.types.path.TimePath; +import com.querydsl.core.types.ConstantImpl; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; @@ -266,7 +265,7 @@ private QuerydslFilterParam createFilterParam(Class number QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); Map mapping = Maps.newHashMap(); for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new DatePath(numberClass, pathSelector)); + mapping.put(pathSelector, Expressions.datePath(numberClass, pathSelector)); querydslFilterParam.setMapping(mapping); return querydslFilterParam; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DateTimePath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DateTimePath_Test.java index 8529ab6..d766e6d 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DateTimePath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_DateTimePath_Test.java @@ -30,12 +30,12 @@ import com.github.vineey.rql.querydsl.util.FilterAssertUtil; import com.github.vineey.rql.querydsl.util.PathTestUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.ConstantImpl; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.DateTimePath; +import com.querydsl.core.types.ConstantImpl; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; @@ -272,7 +272,7 @@ private QuerydslFilterParam createFilterParam(Class number QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); Map mapping = Maps.newHashMap(); for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new DateTimePath(numberClass, pathSelector)); + mapping.put(pathSelector, Expressions.dateTimePath(numberClass, pathSelector)); querydslFilterParam.setMapping(mapping); return querydslFilterParam; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_EnumPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_EnumPath_Test.java index 0e664e4..11edec6 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_EnumPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_EnumPath_Test.java @@ -26,11 +26,11 @@ import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.github.vineey.rql.querydsl.util.PathTestUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.EnumPath; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; @@ -182,7 +182,7 @@ private QuerydslFilterParam createFilterParam(String... pathSelectors) { QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); HashMap mapping = Maps.newHashMap(); for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new EnumPath(Status.class, pathSelector)); + mapping.put(pathSelector, Expressions.enumPath(Status.class, pathSelector)); querydslFilterParam.setMapping(mapping); return querydslFilterParam; } diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_ListPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_ListPath_Test.java index 491ffe6..ebcfd52 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_ListPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_ListPath_Test.java @@ -22,10 +22,11 @@ package com.github.vineey.rql.querydsl.filter; import com.github.vineey.rql.filter.parser.DefaultFilterParser; +import com.github.vineey.rql.querydsl.test.jpa.QEmployee; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,8 +36,6 @@ import static com.github.vineey.rql.filter.FilterContext.withBuilderAndParam; import static org.junit.Assert.assertNotNull; - -import com.github.vineey.rql.querydsl.test.jpa.QEmployee; /** * @author vrustia - 3/25/16. */ diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_Multiple_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_Multiple_Test.java index 2fd377b..a4b6016 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_Multiple_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_Multiple_Test.java @@ -23,11 +23,11 @@ import com.github.vineey.rql.filter.parser.DefaultFilterParser; import com.github.vineey.rql.filter.parser.FilterParser; -import com.mysema.query.types.Expression; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.PredicateOperation; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.PredicateOperation; +import com.querydsl.core.types.dsl.BooleanOperation; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_NumberPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_NumberPath_Test.java index a1fbe65..a15c13e 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_NumberPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_NumberPath_Test.java @@ -24,11 +24,10 @@ import com.github.vineey.rql.filter.operator.QRSQLOperators; import com.github.vineey.rql.filter.parser.DefaultFilterParser; import com.github.vineey.rql.filter.parser.FilterParser; -import com.github.vineey.rql.querydsl.filter.converter.UnsupportedFieldClassException; import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.Path; -import com.mysema.query.types.path.NumberPath; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Rule; import org.junit.Test; @@ -151,11 +150,12 @@ public void testParse_Number_NotSupportedOperator() { } - private QuerydslFilterParam createFilterParam(Class numberClass, String... pathSelectors) { + private > QuerydslFilterParam createFilterParam(Class numberClass, String... pathSelectors) { QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); Map mapping = Maps.newHashMap(); - for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new NumberPath(numberClass, pathSelector)); + for (String pathSelector : pathSelectors) { + mapping.put(pathSelector, Expressions.numberPath(numberClass, pathSelector)); + } querydslFilterParam.setMapping(mapping); return querydslFilterParam; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_SetPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_SetPath_Test.java index 8466655..c62eaf4 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_SetPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_SetPath_Test.java @@ -23,9 +23,9 @@ import com.github.vineey.rql.filter.parser.DefaultFilterParser; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_StringPath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_StringPath_Test.java index 9f9da38..d99da0d 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_StringPath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_StringPath_Test.java @@ -25,11 +25,11 @@ import com.github.vineey.rql.filter.parser.FilterParser; import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.StringPath; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.junit.Rule; @@ -329,7 +329,7 @@ private QuerydslFilterParam createFilterParam(String... pathSelectors) { QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); HashMap mapping = Maps.newHashMap(); for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new StringPath(pathSelector)); + mapping.put(pathSelector, Expressions.stringPath(pathSelector)); querydslFilterParam.setMapping(mapping); return querydslFilterParam; } diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_TimePath_Test.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_TimePath_Test.java index 78fcc20..0462d53 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_TimePath_Test.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/filter/QuerydslFilterBuilder_TimePath_Test.java @@ -28,12 +28,12 @@ import com.github.vineey.rql.querydsl.filter.util.DateUtil; import com.github.vineey.rql.querydsl.util.FilterAssertUtil; import com.google.common.collect.Maps; -import com.mysema.query.types.ConstantImpl; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.TimePath; +import com.querydsl.core.types.ConstantImpl; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.BooleanOperation; +import com.querydsl.core.types.dsl.Expressions; import cz.jirutka.rsql.parser.RSQLParserException; import cz.jirutka.rsql.parser.ast.ComparisonOperator; import cz.jirutka.rsql.parser.ast.RSQLOperators; @@ -327,7 +327,7 @@ private QuerydslFilterParam createFilterParam(Class number QuerydslFilterParam querydslFilterParam = new QuerydslFilterParam(); Map mapping = Maps.newHashMap(); for (String pathSelector : pathSelectors) - mapping.put(pathSelector, new TimePath(numberClass, pathSelector)); + mapping.put(pathSelector, Expressions.timePath(numberClass, pathSelector)); querydslFilterParam.setMapping(mapping); return querydslFilterParam; diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/FilterAssertUtil.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/FilterAssertUtil.java index 3428530..bafa559 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/FilterAssertUtil.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/FilterAssertUtil.java @@ -28,18 +28,17 @@ import com.github.vineey.rql.querydsl.filter.util.RSQLUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Operator; -import com.mysema.query.types.Ops; -import com.mysema.query.types.Path; -import com.mysema.query.types.Predicate; -import com.mysema.query.types.expr.BooleanOperation; -import com.mysema.query.types.path.*; +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.dsl.*; import cz.jirutka.rsql.parser.ast.ComparisonOperator; import cz.jirutka.rsql.parser.ast.RSQLOperators; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.time.LocalDate; @@ -57,8 +56,8 @@ */ public final class FilterAssertUtil { - private static final ImmutableMap operatorMapping = ImmutableMap - .builder() + private static final ImmutableMap operatorMapping = ImmutableMap + .builder() .put(RSQLOperators.EQUAL, Ops.EQ) .put(RSQLOperators.NOT_EQUAL, Ops.NE) .put(RSQLOperators.IN, Ops.IN) @@ -102,7 +101,7 @@ public static void assertFilter(Class fieldType, String selector, ComparisonO } } - public static Operator getOpMapping(ComparisonOperator operator) { + public static Ops getOpMapping(ComparisonOperator operator) { return operatorMapping.get(operator); } @@ -170,7 +169,9 @@ private static Map buildMapping(List> sel Class[] constructorDef = withConstructorDef(subClass); try { Object[] constructorParam = withConstructorParam(subClass, pathSelector); - pathMappings.put(pathSelector, pathClass.getConstructor(constructorDef).newInstance(constructorParam)); + Constructor constructor = pathClass.getDeclaredConstructor(constructorDef); + constructor.setAccessible(true); + pathMappings.put(pathSelector, constructor.newInstance(constructorParam)); } catch (InstantiationException e) { e.printStackTrace(); } catch (IllegalAccessException e) { diff --git a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/PathConstructorInfo.java b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/PathConstructorInfo.java index f867dca..00927e1 100644 --- a/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/PathConstructorInfo.java +++ b/rsql-querydsl-parent/rsql-querydsl-filter/src/test/java/com/github/vineey/rql/querydsl/util/PathConstructorInfo.java @@ -21,7 +21,8 @@ */ package com.github.vineey.rql.querydsl.util; -import com.mysema.query.types.Path; + +import com.querydsl.core.types.Path; /** * @author vrustia on 10/10/2015. diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/build.gradle b/rsql-querydsl-parent/rsql-querydsl-integrationtest/build.gradle index 06ff8f1..3400b84 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.3.2.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE") } } @@ -21,17 +21,19 @@ sourceSets { } } +ext['spring-data-releasetrain.version'] = 'Hopper-SR1' + description = 'Integration test for all rsql querydsl modules' dependencies { - compile 'com.mysema.querydsl:querydsl-core:3.7.2' - compile "com.mysema.querydsl:querydsl-jpa:3.7.2" - compile 'com.mysema.querydsl:querydsl-sql:3.7.2' - compile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + compile 'com.querydsl:querydsl-core:4.1.1' + compile "com.querydsl:querydsl-jpa:4.1.1" + compile 'com.querydsl:querydsl-sql:4.1.1' + compile 'com.querydsl:querydsl-mongodb:4.1.1' compile 'org.hibernate:hibernate-core:5.1.0.Final' compile 'org.hibernate:hibernate-entitymanager:5.1.0.Final' - compile("org.springframework.boot:spring-boot-starter-data-jpa:1.3.2.RELEASE") - compile("org.springframework.boot:spring-boot-starter-data-mongodb:1.3.2.RELEASE") + compile("org.springframework.boot:spring-boot-starter-data-jpa") + compile("org.springframework.boot:spring-boot-starter-data-mongodb") compile("com.h2database:h2") compile "javax.validation:validation-api:1.1.0.Final" compile "org.hibernate:hibernate-validator:5.2.4.Final" @@ -39,11 +41,13 @@ dependencies { compile project(':rsql-querydsl-parent:rsql-querydsl-all') compile project(':rsql-querydsl-parent:rsql-querydsl-spring') compile 'com.google.guava:guava:19.0' - querydslapt 'com.mysema.querydsl:querydsl-apt:3.7.2' + compile "org.springframework.data:spring-data-mongodb:1.9.1.RELEASE" + querydslapt 'com.querydsl:querydsl-apt:4.1.1' + compile 'org.springframework.data:spring-data-commons:1.12.1.RELEASE' testCompile 'com.github.fakemongo:fongo:1.6.4' testCompile("junit:junit") - testCompile("org.springframework.boot:spring-boot-starter-test:1.3.2.RELEASE") + testCompile("org.springframework.boot:spring-boot-starter-test") testCompile "com.github.springtestdbunit:spring-test-dbunit:1.3.0" testCompile "org.dbunit:dbunit:2.5.2" testCompile "com.lordofthejars:nosqlunit-mongodb:0.9.0" @@ -66,7 +70,7 @@ task generateQueryDSLJPA(type: JavaCompile, group: 'build', description: 'Genera classpath = configurations.compile + configurations.querydslapt options.compilerArgs = [ "-proc:only", - "-processor", "com.mysema.query.apt.jpa.JPAAnnotationProcessor" + "-processor", "com.querydsl.apt.jpa.JPAAnnotationProcessor" ] destinationDir = sourceSets.generated.java.srcDirs.iterator().next() } diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDao.java b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDao.java index fe3815f..e67622b 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDao.java +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDao.java @@ -27,7 +27,7 @@ import com.github.vineey.rql.querydsl.test.jpa.entity.QUser; import com.github.vineey.rql.querydsl.test.jpa.entity.User; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.querydsl.QueryDslPredicateExecutor; diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/entity/User.java b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/entity/User.java index b124a87..4c90889 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/entity/User.java +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/jpa/entity/User.java @@ -24,7 +24,10 @@ */ package com.github.vineey.rql.querydsl.test.jpa.entity; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import java.time.LocalDate; /** @@ -42,6 +45,24 @@ public class User { private LocalDate bday; + public User(Long id, String name, String username, LocalDate bday) { + this.id = id; + this.username = username; + this.name = name; + this.bday = bday; + } + + public User() { + + } + + public User(User user) { + this.id = user.getId(); + this.username = user.getUsername(); + this.bday = user.getBday(); + this.name = user.getName(); + } + public LocalDate getBday() { return bday; } diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/mongo/dao/ContactMongoDao.java b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/mongo/dao/ContactMongoDao.java index 4dc4563..bd8e77b 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/mongo/dao/ContactMongoDao.java +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/main/java/com/github/vineey/rql/querydsl/test/mongo/dao/ContactMongoDao.java @@ -27,7 +27,7 @@ import com.github.vineey.rql.querydsl.test.mongo.entity.Contact; import com.github.vineey.rql.querydsl.test.mongo.entity.QContact; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.querydsl.QueryDslPredicateExecutor; diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDaoTest.java b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDaoTest.java index d69aa30..eafd3b5 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDaoTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/jpa/dao/UserDaoTest.java @@ -34,9 +34,10 @@ import com.github.vineey.rql.querydsl.QuerydslRqlParser; import com.github.vineey.rql.querydsl.test.Application; import com.github.vineey.rql.querydsl.test.jpa.entity.User; -import com.mysema.query.QueryModifiers; -import com.mysema.query.jpa.impl.JPAQuery; -import com.mysema.query.types.OrderSpecifier; +import com.querydsl.core.QueryModifiers; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQuery; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; @@ -85,14 +86,14 @@ public void rqlJpa() { QuerydslMappingResult querydslMappingResult = querydslRqlParser.parse(rqlInput, new QuerydslMappingParam().setRootPath(user).setPathMapping(UserDao.PATH_MAP)); - JPAQuery jpaQuery = new JPAQuery(entityManager); + JPAQuery jpaQuery = new JPAQuery(entityManager); QueryModifiers page = querydslMappingResult.getPage(); - List users = jpaQuery.from(user) + List users = jpaQuery.select(Projections.constructor(User.class, querydslMappingResult.getProjection())).from(user) .where(querydslMappingResult.getPredicate()) .offset(page.getOffset()) .limit(page.getLimit()) .orderBy(querydslMappingResult.getOrderSpecifiers().toArray(new OrderSpecifier[]{})) - .list(querydslMappingResult.getProjection()); + .fetch(); assertNotNull(users); assertEquals(1, users.size()); @@ -116,13 +117,17 @@ public void rqlJpaAll() { QuerydslMappingResult querydslMappingResult = querydslRqlParser.parse(rqlInput, new QuerydslMappingParam().setRootPath(user).setPathMapping(UserDao.PATH_MAP)); - JPAQuery jpaQuery = new JPAQuery(entityManager); + JPAQuery jpaQuery = new JPAQuery(entityManager); QueryModifiers page = querydslMappingResult.getPage(); - List users = jpaQuery.from(user) + List users = jpaQuery.select(Projections.constructor(User.class, querydslMappingResult.getProjection())).from(user) + .where(querydslMappingResult.getPredicate()) .offset(page.getOffset()) .limit(page.getLimit()) .orderBy(querydslMappingResult.getOrderSpecifiers().toArray(new OrderSpecifier[]{})) - .list(querydslMappingResult.getProjection()); + .fetch(); + + + assertNotNull(users); assertEquals(3, users.size()); diff --git a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/mongo/dao/MongoDaoTest.java b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/mongo/dao/MongoDaoTest.java index 7df945f..405e661 100644 --- a/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/mongo/dao/MongoDaoTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-integrationtest/src/test/java/com/github/vineey/rql/querydsl/test/mongo/dao/MongoDaoTest.java @@ -37,8 +37,8 @@ import com.lordofthejars.nosqlunit.annotation.UsingDataSet; import com.lordofthejars.nosqlunit.core.LoadStrategyEnum; import com.lordofthejars.nosqlunit.mongodb.MongoDbRule; -import com.mysema.query.QueryModifiers; -import com.mysema.query.types.OrderSpecifier; +import com.querydsl.core.QueryModifiers; +import com.querydsl.core.types.OrderSpecifier; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/rsql-querydsl-parent/rsql-querydsl-page/build.gradle b/rsql-querydsl-parent/rsql-querydsl-page/build.gradle index a48c693..d4cdd0f 100644 --- a/rsql-querydsl-parent/rsql-querydsl-page/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-page/build.gradle @@ -2,11 +2,11 @@ description = 'Querydsl integration for rsql limit' dependencies { compile project(':rsql-api-parent:rsql-api-page') - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } diff --git a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageBuilder.java b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageBuilder.java index 5759a9b..5d25817 100644 --- a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageBuilder.java +++ b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageBuilder.java @@ -26,7 +26,7 @@ import com.github.vineey.rql.page.PageBuilder; import com.github.vineey.rql.page.parser.ast.PageNode; -import com.mysema.query.QueryModifiers; +import com.querydsl.core.QueryModifiers; /** * @author vrustia - 4/9/16. diff --git a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageContext.java b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageContext.java index 3c74049..87d83a0 100644 --- a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageContext.java +++ b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageContext.java @@ -24,8 +24,9 @@ */ package com.github.vineey.rql.querydsl.page; + import com.github.vineey.rql.page.PageContext; -import com.mysema.query.QueryModifiers; +import com.querydsl.core.QueryModifiers; /** * @author vrustia - 4/9/16. diff --git a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageParser.java b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageParser.java index 3a8ef4c..fcbadcb 100644 --- a/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageParser.java +++ b/rsql-querydsl-parent/rsql-querydsl-page/src/main/java/com/github/vineey/rql/querydsl/page/QuerydslPageParser.java @@ -25,7 +25,7 @@ package com.github.vineey.rql.querydsl.page; import com.github.vineey.rql.page.parser.DefaultPageParser; -import com.mysema.query.QueryModifiers; +import com.querydsl.core.QueryModifiers; import static com.github.vineey.rql.querydsl.page.QuerydslPageContext.withDefault; diff --git a/rsql-querydsl-parent/rsql-querydsl-page/src/test/java/com/github/vineey/rql/querydsl/page/QuerydslPageContextTest.java b/rsql-querydsl-parent/rsql-querydsl-page/src/test/java/com/github/vineey/rql/querydsl/page/QuerydslPageContextTest.java index 899224a..28decda 100644 --- a/rsql-querydsl-parent/rsql-querydsl-page/src/test/java/com/github/vineey/rql/querydsl/page/QuerydslPageContextTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-page/src/test/java/com/github/vineey/rql/querydsl/page/QuerydslPageContextTest.java @@ -25,8 +25,7 @@ package com.github.vineey.rql.querydsl.page; import com.github.vineey.rql.page.parser.DefaultPageParser; -import com.mysema.query.QueryModifiers; -import org.junit.BeforeClass; +import com.querydsl.core.QueryModifiers; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/rsql-querydsl-parent/rsql-querydsl-select/build.gradle b/rsql-querydsl-parent/rsql-querydsl-select/build.gradle index eb2c7e7..dc6dd57 100644 --- a/rsql-querydsl-parent/rsql-querydsl-select/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-select/build.gradle @@ -2,14 +2,14 @@ description = 'Querydsl integration for rsql select' dependencies { compile project(':rsql-api-parent:rsql-api-select') - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' testCompile project(':rsql-querydsl-parent:rsql-querydsl-test') testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } diff --git a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectBuilder.java b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectBuilder.java index 19cf14c..bf8dda3 100644 --- a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectBuilder.java +++ b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectBuilder.java @@ -26,10 +26,10 @@ import com.github.vineey.rql.select.SelectBuilder; import com.github.vineey.rql.select.parser.ast.SelectNodeList; -import com.mysema.query.types.EntityPath; -import com.mysema.query.types.Expression; -import com.mysema.query.types.Path; -import com.mysema.query.types.Projections; +import com.querydsl.core.types.EntityPath; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Projections; import java.util.ArrayList; import java.util.List; diff --git a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContext.java b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContext.java index dea1fcf..a6d75ff 100644 --- a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContext.java +++ b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContext.java @@ -25,9 +25,9 @@ package com.github.vineey.rql.querydsl.select; import com.github.vineey.rql.select.SelectContext; -import com.mysema.query.types.EntityPath; -import com.mysema.query.types.Expression; -import com.mysema.query.types.Path; +import com.querydsl.core.types.EntityPath; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectParam.java b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectParam.java index 6591d0b..38258ad 100644 --- a/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectParam.java +++ b/rsql-querydsl-parent/rsql-querydsl-select/src/main/java/com/github/vineey/rql/querydsl/select/QuerydslSelectParam.java @@ -25,8 +25,8 @@ package com.github.vineey.rql.querydsl.select; import com.github.vineey.rql.select.SelectParam; -import com.mysema.query.types.EntityPath; -import com.mysema.query.types.Path; +import com.querydsl.core.types.EntityPath; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-select/src/test/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContextTest.java b/rsql-querydsl-parent/rsql-querydsl-select/src/test/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContextTest.java index 2f40a6d..0b89390 100644 --- a/rsql-querydsl-parent/rsql-querydsl-select/src/test/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContextTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-select/src/test/java/com/github/vineey/rql/querydsl/select/QuerydslSelectContextTest.java @@ -28,9 +28,9 @@ import com.github.vineey.rql.querydsl.test.mongo.QContactDocument; import com.github.vineey.rql.select.parser.DefaultSelectParser; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Expression; -import com.mysema.query.types.Path; -import com.mysema.query.types.Projections; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.Projections; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/build.gradle b/rsql-querydsl-parent/rsql-querydsl-sort/build.gradle index 6bf8d56..4111a80 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-sort/build.gradle @@ -2,14 +2,14 @@ description = 'Querydsl integration for rsql sort' dependencies { compile project(':rsql-api-parent:rsql-api-sort') - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' testCompile project(':rsql-querydsl-parent:rsql-querydsl-test') testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/OrderSpecifierList.java b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/OrderSpecifierList.java index d36fdbd..458becd 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/OrderSpecifierList.java +++ b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/OrderSpecifierList.java @@ -24,7 +24,8 @@ */ package com.github.vineey.rql.querydsl.sort; -import com.mysema.query.types.OrderSpecifier; + +import com.querydsl.core.types.OrderSpecifier; import java.util.List; diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortBuilder.java b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortBuilder.java index d664492..6690a07 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortBuilder.java +++ b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortBuilder.java @@ -27,9 +27,9 @@ import com.github.vineey.rql.sort.SortBuilder; import com.github.vineey.rql.sort.parser.ast.SortNode; import com.github.vineey.rql.sort.parser.ast.SortNodeList; -import com.mysema.query.types.Order; -import com.mysema.query.types.OrderSpecifier; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Order; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Path; import java.util.ArrayList; import java.util.List; diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContext.java b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContext.java index e0d6f36..e9bd65f 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContext.java +++ b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContext.java @@ -25,7 +25,7 @@ package com.github.vineey.rql.querydsl.sort; import com.github.vineey.rql.sort.SortContext; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortParam.java b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortParam.java index 636bf40..8423b55 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortParam.java +++ b/rsql-querydsl-parent/rsql-querydsl-sort/src/main/java/com/github/vineey/rql/querydsl/sort/QuerydslSortParam.java @@ -25,7 +25,7 @@ package com.github.vineey.rql.querydsl.sort; import com.github.vineey.rql.sort.SortParam; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import java.util.Map; diff --git a/rsql-querydsl-parent/rsql-querydsl-sort/src/test/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContextTest.java b/rsql-querydsl-parent/rsql-querydsl-sort/src/test/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContextTest.java index 02eb13f..1c24fa3 100644 --- a/rsql-querydsl-parent/rsql-querydsl-sort/src/test/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContextTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-sort/src/test/java/com/github/vineey/rql/querydsl/sort/QuerydslSortContextTest.java @@ -24,11 +24,12 @@ */ package com.github.vineey.rql.querydsl.sort; +import com.github.vineey.rql.querydsl.test.jpa.QEmployee; import com.github.vineey.rql.sort.parser.DefaultSortParser; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Order; -import com.mysema.query.types.OrderSpecifier; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Order; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Path; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -38,7 +39,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.github.vineey.rql.querydsl.test.jpa.QEmployee; /** * @author vrustia - 4/17/16. */ diff --git a/rsql-querydsl-parent/rsql-querydsl-spring/build.gradle b/rsql-querydsl-parent/rsql-querydsl-spring/build.gradle index b80c379..16645d7 100644 --- a/rsql-querydsl-parent/rsql-querydsl-spring/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-spring/build.gradle @@ -2,15 +2,15 @@ description = 'Spring integration with querydsl page and sort modules' dependencies { - provided 'com.mysema.querydsl:querydsl-core:3.7.2' + provided 'com.querydsl:querydsl-core:4.1.1' provided 'org.springframework.data:spring-data-commons:1.9.4.RELEASE' testCompile project(':rsql-querydsl-parent:rsql-querydsl-test') testCompile project(':rsql-querydsl-parent:rsql-querydsl-all') testCompile "org.hibernate:hibernate-entitymanager:4.3.5.Final" - testCompile "com.mysema.querydsl:querydsl-jpa:3.7.2" - testCompile 'com.mysema.querydsl:querydsl-sql:3.7.2' - testCompile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' + testCompile "com.querydsl:querydsl-jpa:4.1.1" + testCompile 'com.querydsl:querydsl-sql:4.1.1' + testCompile 'com.querydsl:querydsl-mongodb:4.1.1' testCompile 'com.google.guava:guava:19.0' } diff --git a/rsql-querydsl-parent/rsql-querydsl-spring/src/main/java/com/github/vineey/rql/querydsl/spring/SpringUtil.java b/rsql-querydsl-parent/rsql-querydsl-spring/src/main/java/com/github/vineey/rql/querydsl/spring/SpringUtil.java index 56a3413..43eaa57 100644 --- a/rsql-querydsl-parent/rsql-querydsl-spring/src/main/java/com/github/vineey/rql/querydsl/spring/SpringUtil.java +++ b/rsql-querydsl-parent/rsql-querydsl-spring/src/main/java/com/github/vineey/rql/querydsl/spring/SpringUtil.java @@ -24,8 +24,8 @@ */ package com.github.vineey.rql.querydsl.spring; -import com.mysema.query.QueryModifiers; -import com.mysema.query.types.OrderSpecifier; +import com.querydsl.core.QueryModifiers; +import com.querydsl.core.types.OrderSpecifier; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/rsql-querydsl-parent/rsql-querydsl-spring/src/test/java/com/github/vineey/rql/querydsl/spring/SpringUtilTest.java b/rsql-querydsl-parent/rsql-querydsl-spring/src/test/java/com/github/vineey/rql/querydsl/spring/SpringUtilTest.java index b437052..1158ea4 100644 --- a/rsql-querydsl-parent/rsql-querydsl-spring/src/test/java/com/github/vineey/rql/querydsl/spring/SpringUtilTest.java +++ b/rsql-querydsl-parent/rsql-querydsl-spring/src/test/java/com/github/vineey/rql/querydsl/spring/SpringUtilTest.java @@ -24,23 +24,23 @@ */ package com.github.vineey.rql.querydsl.spring; +import com.github.vineey.rql.RqlInput; import com.github.vineey.rql.querydsl.DefaultQuerydslRqlParser; import com.github.vineey.rql.querydsl.QuerydslMappingParam; import com.github.vineey.rql.querydsl.QuerydslMappingResult; import com.github.vineey.rql.querydsl.QuerydslRqlParser; +import com.github.vineey.rql.querydsl.test.jpa.QEmployee; import com.google.common.collect.ImmutableMap; -import com.mysema.query.types.Path; +import com.querydsl.core.types.Path; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; - -import java.util.Map; -import com.github.vineey.rql.RqlInput; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import com.github.vineey.rql.querydsl.test.jpa.QEmployee; + +import java.util.Map; /** * @author vrustia - 4/24/16. */ diff --git a/rsql-querydsl-parent/rsql-querydsl-test/build.gradle b/rsql-querydsl-parent/rsql-querydsl-test/build.gradle index d335ede..3b32ec7 100644 --- a/rsql-querydsl-parent/rsql-querydsl-test/build.gradle +++ b/rsql-querydsl-parent/rsql-querydsl-test/build.gradle @@ -14,15 +14,15 @@ configurations { dependencies { - compile 'com.mysema.querydsl:querydsl-core:3.7.2' - querydslapt ('com.mysema.querydsl:querydsl-apt:3.7.2') + compile 'com.querydsl:querydsl-core:4.1.1' + querydslapt ('com.querydsl:querydsl-apt:4.1.1') compile group: 'junit', name: 'junit', version: '4.12' compile "org.hibernate:hibernate-entitymanager:4.3.11.Final" - compile "com.mysema.querydsl:querydsl-jpa:3.7.2" - compile 'com.mysema.querydsl:querydsl-sql:3.7.2' - compile 'com.mysema.querydsl:querydsl-mongodb:3.7.2' - compile 'org.springframework.data:spring-data-mongodb:1.8.2.RELEASE' + compile "com.querydsl:querydsl-jpa:4.1.1" + compile 'com.querydsl:querydsl-sql:4.1.1' + compile 'com.querydsl:querydsl-mongodb:4.1.1' + compile 'org.springframework.data:spring-data-mongodb:1.9.1.RELEASE' compile 'com.google.guava:guava:19.0' } @@ -31,7 +31,7 @@ task generateQueryDSLJPA(type: JavaCompile, group: 'build', description: 'Genera classpath = configurations.compile + configurations.querydslapt options.compilerArgs = [ "-proc:only", - "-processor", "com.mysema.query.apt.jpa.JPAAnnotationProcessor" + "-processor", "com.querydsl.apt.jpa.JPAAnnotationProcessor" ] destinationDir = sourceSets.generated.java.srcDirs.iterator().next() } diff --git a/rsql-querydsl-parent/rsql-querydsl-test/src/main/java/com/github/vineey/rql/querydsl/test/jpa/Employee.java b/rsql-querydsl-parent/rsql-querydsl-test/src/main/java/com/github/vineey/rql/querydsl/test/jpa/Employee.java index ea38e84..1f2dd30 100644 --- a/rsql-querydsl-parent/rsql-querydsl-test/src/main/java/com/github/vineey/rql/querydsl/test/jpa/Employee.java +++ b/rsql-querydsl-parent/rsql-querydsl-test/src/main/java/com/github/vineey/rql/querydsl/test/jpa/Employee.java @@ -21,7 +21,7 @@ */ package com.github.vineey.rql.querydsl.test.jpa; -import com.mysema.query.annotations.QueryInit; +import com.querydsl.core.annotations.QueryInit; import javax.persistence.Entity; import java.util.Collection;