From d990cd07a4e6131a0e8ebe37ad2ead389814aedb Mon Sep 17 00:00:00 2001 From: Grace Date: Thu, 8 Jun 2023 17:08:42 -0700 Subject: [PATCH 1/2] Migrate client API to v2 --- .idea/.gitignore | 8 ++++++++ .idea/dgs-federation-example.iml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ reviews-dgs/build.gradle.kts | 2 +- .../demo/datafetchers/ReviewsDatafetcherTest.java | 2 +- shows-dgs/build.gradle.kts | 2 +- .../example/demo/datafetchers/ShowsDataFetcherTest.kt | 2 +- 8 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/dgs-federation-example.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/dgs-federation-example.iml b/.idea/dgs-federation-example.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/dgs-federation-example.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..26854f7 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/reviews-dgs/build.gradle.kts b/reviews-dgs/build.gradle.kts index e6d19c4..ddba852 100644 --- a/reviews-dgs/build.gradle.kts +++ b/reviews-dgs/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { } tasks.withType { - generateClient = true + generateClientv2 = true packageName = "com.example.demo.generated" } diff --git a/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java b/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java index 3ba858f..51fb384 100644 --- a/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java +++ b/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java @@ -53,7 +53,7 @@ void shows() { @Test void showsWithEntitiesQueryBuilder() { EntitiesGraphQLQuery entitiesQuery = new EntitiesGraphQLQuery.Builder().addRepresentationAsVariable(ShowRepresentation.newBuilder().id("1").build()).build(); - GraphQLQueryRequest request = new GraphQLQueryRequest(entitiesQuery, new EntitiesProjectionRoot().onShow().reviews().starRating()); + GraphQLQueryRequest request = new GraphQLQueryRequest(entitiesQuery, new EntitiesProjectionRoot<>().onShow().reviews().starRating()); List reviewsList = dgsQueryExecutor.executeAndExtractJsonPathAsObject( request.serialize(), "data['_entities'][0].reviews", entitiesQuery.getVariables(), new TypeRef<>() { diff --git a/shows-dgs/build.gradle.kts b/shows-dgs/build.gradle.kts index 9924814..4fa77bd 100644 --- a/shows-dgs/build.gradle.kts +++ b/shows-dgs/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { @OptIn(kotlin.ExperimentalStdlibApi::class) tasks.withType { - generateClient = true + generateClientv2 = true packageName = "com.example.demo.generated" } diff --git a/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt b/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt index 2bfd3de..9cca519 100644 --- a/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt +++ b/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt @@ -82,7 +82,7 @@ class ShowsDataFetcherTest { GraphQLQueryRequest( ShowsGraphQLQuery.Builder() .build(), - ShowsProjectionRoot().title()) + ShowsProjectionRoot<>().title()) val titles = dgsQueryExecutor.executeAndExtractJsonPath>(graphQLQueryRequest.serialize(), "data.shows[*].title") assertThat(titles).contains("mock title") } From 65d1382e69f4d6dc7de648cd4434fb02d557f181 Mon Sep 17 00:00:00 2001 From: Grace Date: Thu, 8 Jun 2023 17:10:36 -0700 Subject: [PATCH 2/2] Update Codegen version --- reviews-dgs/build.gradle.kts | 2 +- shows-dgs/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reviews-dgs/build.gradle.kts b/reviews-dgs/build.gradle.kts index ddba852..c693b69 100644 --- a/reviews-dgs/build.gradle.kts +++ b/reviews-dgs/build.gradle.kts @@ -20,7 +20,7 @@ plugins { id("io.spring.dependency-management") version "1.0.12.RELEASE" kotlin("plugin.spring") version "1.6.21" id("java") - id("com.netflix.dgs.codegen") version "5.5.0" + id("com.netflix.dgs.codegen") version "5.11.1" } group = "com.example" diff --git a/shows-dgs/build.gradle.kts b/shows-dgs/build.gradle.kts index 4fa77bd..70951fc 100644 --- a/shows-dgs/build.gradle.kts +++ b/shows-dgs/build.gradle.kts @@ -21,7 +21,7 @@ plugins { id("io.spring.dependency-management") version "1.0.12.RELEASE" kotlin("jvm") version "1.7.10" kotlin("plugin.spring") version "1.6.21" - id("com.netflix.dgs.codegen") version "5.5.0" + id("com.netflix.dgs.codegen") version "5.11.1" } group = "com.example"