major upgrades
This commit is contained in:
parent
83615aadf0
commit
205a84d834
|
@ -248,8 +248,8 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
|
<org.springframework.version>4.3.4.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
|
||||||
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
|
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
|
||||||
<jackson.version>2.7.8</jackson.version>
|
<jackson.version>2.7.8</jackson.version>
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>1.3.8.RELEASE</version>
|
<version>1.4.2.RELEASE</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -109,14 +109,12 @@
|
||||||
<!-- Querydsl -->
|
<!-- Querydsl -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mysema.querydsl</groupId>
|
<groupId>com.querydsl</groupId>
|
||||||
<artifactId>querydsl-apt</artifactId>
|
<artifactId>querydsl-apt</artifactId>
|
||||||
<version>${querydsl.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mysema.querydsl</groupId>
|
<groupId>com.querydsl</groupId>
|
||||||
<artifactId>querydsl-jpa</artifactId>
|
<artifactId>querydsl-jpa</artifactId>
|
||||||
<version>${querydsl.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Rsql -->
|
<!-- Rsql -->
|
||||||
|
@ -161,7 +159,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xml-apis</groupId>
|
<groupId>xml-apis</groupId>
|
||||||
<artifactId>xml-apis</artifactId>
|
<artifactId>xml-apis</artifactId>
|
||||||
<version>${xml-apis.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.javassist</groupId>
|
<groupId>org.javassist</groupId>
|
||||||
|
@ -358,7 +355,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outputDirectory>target/generated-sources/java</outputDirectory>
|
<outputDirectory>target/generated-sources/java</outputDirectory>
|
||||||
<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
|
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
@ -467,16 +464,13 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
|
|
||||||
<org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
|
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.11.Final</hibernate.version>
|
<hibernate.version>4.3.11.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.40</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.8.2.RELEASE</spring-data-jpa.version>
|
|
||||||
|
|
||||||
<rsql.version>2.0.0</rsql.version>
|
<rsql.version>2.0.0</rsql.version>
|
||||||
<querydsl.version>3.6.2</querydsl.version>
|
<querydsl.version>4.1.4</querydsl.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<jackson.version>2.7.8</jackson.version>
|
<jackson.version>2.7.8</jackson.version>
|
||||||
|
@ -505,7 +499,7 @@
|
||||||
<rest-assured.version>2.9.0</rest-assured.version>
|
<rest-assured.version>2.9.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
|
||||||
|
|
|
@ -3,10 +3,10 @@ package org.baeldung.persistence.dao;
|
||||||
import org.baeldung.persistence.model.MyUser;
|
import org.baeldung.persistence.model.MyUser;
|
||||||
import org.baeldung.web.util.SearchCriteria;
|
import org.baeldung.web.util.SearchCriteria;
|
||||||
|
|
||||||
import com.mysema.query.types.expr.BooleanExpression;
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
||||||
import com.mysema.query.types.path.NumberPath;
|
import com.querydsl.core.types.dsl.NumberPath;
|
||||||
import com.mysema.query.types.path.PathBuilder;
|
import com.querydsl.core.types.dsl.PathBuilder;
|
||||||
import com.mysema.query.types.path.StringPath;
|
import com.querydsl.core.types.dsl.StringPath;
|
||||||
|
|
||||||
public class MyUserPredicate {
|
public class MyUserPredicate {
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import java.util.List;
|
||||||
|
|
||||||
import org.baeldung.web.util.SearchCriteria;
|
import org.baeldung.web.util.SearchCriteria;
|
||||||
|
|
||||||
import com.mysema.query.types.expr.BooleanExpression;
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
||||||
|
|
||||||
public final class MyUserPredicatesBuilder {
|
public final class MyUserPredicatesBuilder {
|
||||||
private final List<SearchCriteria> params;
|
private final List<SearchCriteria> params;
|
||||||
|
|
|
@ -7,7 +7,7 @@ import org.springframework.data.querydsl.QueryDslPredicateExecutor;
|
||||||
import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
|
import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
|
||||||
import org.springframework.data.querydsl.binding.QuerydslBindings;
|
import org.springframework.data.querydsl.binding.QuerydslBindings;
|
||||||
|
|
||||||
import com.mysema.query.types.path.StringPath;
|
import com.querydsl.core.types.dsl.StringPath;
|
||||||
|
|
||||||
public interface MyUserRepository extends JpaRepository<MyUser, Long>, QueryDslPredicateExecutor<MyUser>, QuerydslBinderCustomizer<QMyUser> {
|
public interface MyUserRepository extends JpaRepository<MyUser, Long>, QueryDslPredicateExecutor<MyUser>, QuerydslBinderCustomizer<QMyUser> {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -29,8 +29,8 @@ import org.springframework.web.bind.annotation.ResponseStatus;
|
||||||
|
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.mysema.query.types.Predicate;
|
import com.querydsl.core.types.Predicate;
|
||||||
import com.mysema.query.types.expr.BooleanExpression;
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
||||||
|
|
||||||
import cz.jirutka.rsql.parser.RSQLParser;
|
import cz.jirutka.rsql.parser.RSQLParser;
|
||||||
import cz.jirutka.rsql.parser.ast.Node;
|
import cz.jirutka.rsql.parser.ast.Node;
|
||||||
|
|
Loading…
Reference in New Issue