Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated dependencies and codebase for Querydsl 4.

Browse Source
This commit is contained in:
Oliver Gierke
2016-02-12 10:35:06 +01:00
parent 35ba3bb5e1
commit 62b2d644cc
11 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jpa/example/pom.xml
View File

@@ -13,9 +13,6 @@
<name>Spring Data JPA - Example</name>
<description>Small sample project showing the usage of Spring Data JPA.</description>
<properties>
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
</properties>
<build>
<plugins>
@@ -31,4 +28,4 @@
</plugins>
</build>
</project>
</project>

6
jpa/showcase/pom.xml
View File

@@ -81,7 +81,7 @@
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<version>${querydsl.version}</version>
</dependency>
@@ -96,7 +96,7 @@
<version>${apt.version}</version>
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
</dependency>
@@ -109,7 +109,7 @@
</goals>
<configuration>
<outputDirectory>target/generated-sources/queries</outputDirectory>
<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
<logOnlyOnError>true</logOnlyOnError>
</configuration>
</execution>

10
jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2014 the original author or authors.
* Copyright 2011-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
*/
package example.springdata.jpa.showcase.snippets;
import org.joda.time.LocalDate;
import com.mysema.query.types.expr.BooleanExpression;
import example.springdata.jpa.showcase.core.Account;
import example.springdata.jpa.showcase.core.QAccount;
import org.joda.time.LocalDate;
import com.querydsl.core.types.dsl.BooleanExpression;
/**
* Predicates for {@link Account}s.
*

2
mongodb/example/pom.xml
View File

@@ -42,4 +42,4 @@
</plugins>
</build>
</project>
</project>

3
pom.xml
View File

@@ -34,7 +34,8 @@
<apt.version>1.1.3</apt.version>
<java.version>1.8</java.version>
<querydsl.version>3.6.9</querydsl.version>
<querydsl.version>4.0.8</querydsl.version>
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
</properties>

4
rest/starbucks/pom.xml
View File

@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
</dependency>
@@ -102,7 +102,7 @@
<version>${apt.version}</version>
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
</dependency>

4
rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java
View File

@@ -15,12 +15,12 @@
*/
package example.springdata.rest.stores;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.batch.item.file.mapping.DefaultLineMapper;

6
rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java
View File

@@ -20,12 +20,11 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Point;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
import org.springframework.data.querydsl.binding.QuerydslBindings;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.rest.core.annotation.RestResource;
import com.mysema.query.types.path.StringPath;
import com.querydsl.core.types.dsl.StringPath;
/**
* Repository interface for out-of-the-box paginating access to {@link Store}s and a query method to find stores by
@@ -33,8 +32,7 @@ import com.mysema.query.types.path.StringPath;
*
* @author Oliver Gierke
*/
public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store>,
QuerydslBinderCustomizer<QStore> {
public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store> {
@RestResource(rel = "by-location")
Page<Store> findByAddressLocationNear(Point location, Distance distance, Pageable pageable);

3
rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java
View File

@@ -19,6 +19,7 @@ import static org.springframework.data.geo.Metrics.*;
import example.springdata.rest.stores.Store;
import example.springdata.rest.stores.StoreRepository;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
import java.util.Collections;
@@ -27,8 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

4
rest/uri-customization/pom.xml
View File

@@ -12,10 +12,6 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
</properties>
<dependencies>
<dependency>

4
web/querydsl/pom.xml
View File

@@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
</dependency>
@@ -87,7 +87,7 @@
<version>${apt.version}</version>
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
</dependency>