Skip to content

Commit 7fea873

Browse files
mp911derstoyanchev
authored andcommitted
Migrate QuerydslDataFetcher to use fluent Querydsl API
Remove supporting classes for external projection as projections are handled by Spring Data directly. See gh-168
1 parent eecddb3 commit 7fea873

File tree

8 files changed

+191
-287
lines changed

8 files changed

+191
-287
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ configure(moduleProjects) {
5959
mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
6060
mavenBom "io.projectreactor:reactor-bom:2020.0.11"
6161
mavenBom "org.springframework:spring-framework-bom:5.3.10"
62-
mavenBom "org.springframework.data:spring-data-bom:2021.0.5"
62+
mavenBom "org.springframework.data:spring-data-bom:2021.1.0-RC1"
6363
mavenBom "org.springframework.security:spring-security-bom:5.5.2"
6464
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
6565
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"

samples/webmvc-http/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ dependencies {
1313
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
1414
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
1515
implementation 'org.springframework.boot:spring-boot-starter-actuator'
16+
// TODO: Remove after upgrade to Spring Boot 2.6
17+
implementation 'org.springframework.data:spring-data-commons:2.6.0-RC1'
18+
implementation 'org.springframework.data:spring-data-jpa:2.6.0-RC1'
1619
implementation 'com.querydsl:querydsl-core'
1720
implementation 'com.querydsl:querydsl-jpa'
1821
developmentOnly 'org.springframework.boot:spring-boot-devtools'

spring-graphql/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ dependencies {
3131
testImplementation 'org.springframework:spring-websocket'
3232
testImplementation 'org.springframework:spring-test'
3333
testImplementation 'org.springframework.data:spring-data-commons'
34+
testImplementation 'org.springframework.data:spring-data-keyvalue'
3435
testImplementation 'com.querydsl:querydsl-core'
36+
testImplementation 'com.querydsl:querydsl-collections'
3537
testImplementation 'javax.servlet:javax.servlet-api'
3638
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
3739

spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoInstantiatingConverter.java

-99
This file was deleted.

spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoMappingContext.java

-84
This file was deleted.

0 commit comments

Comments
 (0)