Skip to content

Commit 62b2d64

Browse files
odrotbohmodrotbohm
committed
Updated dependencies and codebase for Querydsl 4.
1 parent 35ba3bb commit 62b2d64

File tree

11 files changed

+21
-30
lines changed

11 files changed

+21
-30
lines changed

‎jpa/example/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
<name>Spring Data JPA - Example</name>
1515
<description>Small sample project showing the usage of Spring Data JPA.</description>
16-
<properties>
17-
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
18-
</properties>
1916

2017
<build>
2118
<plugins>
@@ -31,4 +28,4 @@
3128
</plugins>
3229
</build>
3330

34-
</project>
31+
</project>

‎jpa/showcase/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependencies>
8282

8383
<dependency>
84-
<groupId>com.mysema.querydsl</groupId>
84+
<groupId>com.querydsl</groupId>
8585
<artifactId>querydsl-jpa</artifactId>
8686
<version>${querydsl.version}</version>
8787
</dependency>
@@ -96,7 +96,7 @@
9696
<version>${apt.version}</version>
9797
<dependencies>
9898
<dependency>
99-
<groupId>com.mysema.querydsl</groupId>
99+
<groupId>com.querydsl</groupId>
100100
<artifactId>querydsl-apt</artifactId>
101101
<version>${querydsl.version}</version>
102102
</dependency>
@@ -109,7 +109,7 @@
109109
</goals>
110110
<configuration>
111111
<outputDirectory>target/generated-sources/queries</outputDirectory>
112-
<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
112+
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
113113
<logOnlyOnError>true</logOnlyOnError>
114114
</configuration>
115115
</execution>

‎jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2011-2014 the original author or authors.
2+
* Copyright 2011-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
1515
*/
1616
package example.springdata.jpa.showcase.snippets;
1717

18-
import org.joda.time.LocalDate;
19-
20-
import com.mysema.query.types.expr.BooleanExpression;
21-
2218
import example.springdata.jpa.showcase.core.Account;
2319
import example.springdata.jpa.showcase.core.QAccount;
2420

21+
import org.joda.time.LocalDate;
22+
23+
import com.querydsl.core.types.dsl.BooleanExpression;
24+
2525
/**
2626
* Predicates for {@link Account}s.
2727
*

‎mongodb/example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@
4242
</plugins>
4343
</build>
4444

45-
</project>
45+
</project>

‎pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434

3535
<apt.version>1.1.3</apt.version>
3636
<java.version>1.8</java.version>
37-
<querydsl.version>3.6.9</querydsl.version>
37+
<querydsl.version>4.0.8</querydsl.version>
38+
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
3839

3940
</properties>
4041

‎rest/starbucks/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependency>
2727

2828
<dependency>
29-
<groupId>com.mysema.querydsl</groupId>
29+
<groupId>com.querydsl</groupId>
3030
<artifactId>querydsl-mongodb</artifactId>
3131
<version>${querydsl.version}</version>
3232
</dependency>
@@ -102,7 +102,7 @@
102102
<version>${apt.version}</version>
103103
<dependencies>
104104
<dependency>
105-
<groupId>com.mysema.querydsl</groupId>
105+
<groupId>com.querydsl</groupId>
106106
<artifactId>querydsl-apt</artifactId>
107107
<version>${querydsl.version}</version>
108108
</dependency>

‎rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package example.springdata.rest.stores;
1717

18+
import lombok.extern.slf4j.Slf4j;
19+
1820
import java.util.ArrayList;
1921
import java.util.List;
2022
import java.util.Scanner;
2123

22-
import lombok.extern.slf4j.Slf4j;
23-
2424
import org.springframework.batch.item.ExecutionContext;
2525
import org.springframework.batch.item.file.FlatFileItemReader;
2626
import org.springframework.batch.item.file.mapping.DefaultLineMapper;

‎rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,19 @@
2020
import org.springframework.data.geo.Distance;
2121
import org.springframework.data.geo.Point;
2222
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
23-
import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
2423
import org.springframework.data.querydsl.binding.QuerydslBindings;
2524
import org.springframework.data.repository.PagingAndSortingRepository;
2625
import org.springframework.data.rest.core.annotation.RestResource;
2726

28-
import com.mysema.query.types.path.StringPath;
27+
import com.querydsl.core.types.dsl.StringPath;
2928

3029
/**
3130
* Repository interface for out-of-the-box paginating access to {@link Store}s and a query method to find stores by
3231
* location and distance.
3332
*
3433
* @author Oliver Gierke
3534
*/
36-
public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store>,
37-
QuerydslBinderCustomizer<QStore> {
35+
public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store> {
3836

3937
@RestResource(rel = "by-location")
4038
Page<Store> findByAddressLocationNear(Point location, Distance distance, Pageable pageable);

‎rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import example.springdata.rest.stores.Store;
2121
import example.springdata.rest.stores.StoreRepository;
22+
import lombok.RequiredArgsConstructor;
2223

2324
import java.util.Arrays;
2425
import java.util.Collections;
@@ -27,8 +28,6 @@
2728
import java.util.Map;
2829
import java.util.Optional;
2930

30-
import lombok.RequiredArgsConstructor;
31-
3231
import org.springframework.beans.factory.annotation.Autowired;
3332
import org.springframework.data.domain.Page;
3433
import org.springframework.data.domain.Pageable;

‎rest/uri-customization/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<version>1.0.0.BUILD-SNAPSHOT</version>
1313
</parent>
1414

15-
<properties>
16-
<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
17-
</properties>
18-
1915
<dependencies>
2016

2117
<dependency>

‎web/querydsl/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</dependency>
2626

2727
<dependency>
28-
<groupId>com.mysema.querydsl</groupId>
28+
<groupId>com.querydsl</groupId>
2929
<artifactId>querydsl-mongodb</artifactId>
3030
<version>${querydsl.version}</version>
3131
</dependency>
@@ -87,7 +87,7 @@
8787
<version>${apt.version}</version>
8888
<dependencies>
8989
<dependency>
90-
<groupId>com.mysema.querydsl</groupId>
90+
<groupId>com.querydsl</groupId>
9191
<artifactId>querydsl-apt</artifactId>
9292
<version>${querydsl.version}</version>
9393
</dependency>

0 commit comments

Comments
 (0)