chore: clean codes

hantsy · Nov 4, 2023 · 5c134a6 · 5c134a6
1 parent 12b5694
commit 5c134a6
Show file tree

Hide file tree

Showing 144 changed files with 14,287 additions and 397 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -71,14 +71,6 @@ updates:
     directory: "/graphql-spqr"
     schedule:
       interval: weekly
-    ignore: 
-      - dependency-name: "com.graphql-java:graphql-java"
-        update-types: ["version-update:semver-major"]  
-
-  - package-ecosystem: "gradle"
-    directory: "/graphql-java"
-    schedule:
-      interval: weekly
   - package-ecosystem: "gradle"
     directory: "/graphql-kotlin"
     schedule:

diff --git a/.github/workflows/dgs-subscription-ui.yml b/.github/workflows/dgs-subscription-ui.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "16"
 

diff --git a/.github/workflows/graphql-java.yml → .github/workflows/legacy-graphql-java.yml b/.github/workflows/graphql-java.yml → .github/workflows/legacy-graphql-java.yml
@@ -1,16 +1,16 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: graphql-java
+name: legacy-graphql-java
 
 on:
   push:
     paths:
-      - "graphql-java/**"
+      - "legacy/graphql-java/**"
     branches: [ master ]
   pull_request:
     paths:
-      - "graphql-java/**"  
+      - "legacy/graphql-java/**"  
     types:
       - opened
       - synchronize
@@ -34,7 +34,7 @@ jobs:
         docker ps -a
     - name: Build with Gradle
       run: |
-        cd graphql-java
+        cd legacy/graphql-java
         chmod +x gradlew
         ./gradlew build
 

diff --git a/dgs-client/build.gradle b/dgs-client/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'org.springframework.boot' version '3.1.4'
+    id 'org.springframework.boot' version '3.2.0-RC2'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
-    id "com.netflix.dgs.codegen" version "6.0.2" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
+    id "com.netflix.dgs.codegen" version "6.0.3" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
 }
 
 group = 'com.example'
@@ -12,10 +12,18 @@ sourceCompatibility = '17'
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
+    maven { url "https://repo.spring.io/snapshot" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.5.3"))
+    //implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation "com.netflix.graphql.dgs:graphql-dgs-client"
 
     //spring boot starter

diff --git a/dgs-client/gradle/wrapper/gradle-wrapper.jar b/dgs-client/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-client/gradle/wrapper/gradle-wrapper.properties b/dgs-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-client/settings.gradle b/dgs-client/settings.gradle
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'dgs-client-example'
diff --git a/dgs-client/src/main/java/com/example/demo/DemoApplication.java b/dgs-client/src/main/java/com/example/demo/DemoApplication.java
@@ -2,12 +2,11 @@
 
 import com.example.demo.gql.client.AllPostsGraphQLQuery;
 import com.example.demo.gql.client.AllPostsProjectionRoot;
+import com.example.demo.gql.client.AuthorProjection;
+import com.example.demo.gql.client.PostProjection;
 import com.example.demo.gql.types.Post;
 import com.jayway.jsonpath.TypeRef;
-import com.netflix.graphql.dgs.client.DefaultGraphQLClient;
-import com.netflix.graphql.dgs.client.GraphQLClient;
-import com.netflix.graphql.dgs.client.GraphQLResponse;
-import com.netflix.graphql.dgs.client.HttpResponse;
+import com.netflix.graphql.dgs.client.*;
 import com.netflix.graphql.dgs.client.codegen.GraphQLQueryRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -88,7 +87,7 @@ public void run(ApplicationArguments args) throws Exception {
         GraphQLQueryRequest graphQLQueryRequest =
                 new GraphQLQueryRequest(
                         new AllPostsGraphQLQuery(),
-                        new AllPostsProjectionRoot()
+                        new AllPostsProjectionRoot<AuthorProjection<?,?>,PostProjection<?,?>>()
                                 .id()
                                 .title()
                                 .content()
@@ -100,11 +99,10 @@ public void run(ApplicationArguments args) throws Exception {
                 );
 
         String query = graphQLQueryRequest.serialize();
-        GraphQLClient client = new DefaultGraphQLClient(url);
-        GraphQLResponse response = client.executeQuery(query, new HashMap<>(), DemoApplication::execute);
+        GraphQLClient client = new CustomGraphQLClient(url, DemoApplication::execute);
+        GraphQLResponse response = client.executeQuery(query, new HashMap<>() );
 
-        var data = response.extractValueAsObject("allPosts", new TypeRef<List<Post>>() {
-        });
+        var data = response.extractValueAsObject("allPosts", new TypeRef<List<Post>>() {  });
         log.info("fetched all posts from client: {}", data);
     }
 }
diff --git a/dgs-codegen/build.gradle b/dgs-codegen/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '3.1.4'
+    id 'org.springframework.boot' version '3.2.0-RC2'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
     id "com.netflix.dgs.codegen" version "6.0.3" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
@@ -13,10 +13,18 @@ sourceCompatibility = '17'
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
+    maven { url "https://repo.spring.io/snapshot" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.5.3"))
+    // implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation "com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter", {
         exclude group: 'org.yaml', module: 'snakeyaml'
     }

diff --git a/dgs-codegen/gradle/wrapper/gradle-wrapper.jar b/dgs-codegen/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-codegen/gradle/wrapper/gradle-wrapper.properties b/dgs-codegen/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-codegen/settings.gradle b/dgs-codegen/settings.gradle
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'dgs-codegen'
diff --git a/dgs-codegen/src/main/java/com/example/demo/gql/CustomDataFetchingExceptionHandler.java b/dgs-codegen/src/main/java/com/example/demo/gql/CustomDataFetchingExceptionHandler.java
@@ -12,13 +12,14 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 @Component
 public class CustomDataFetchingExceptionHandler implements DataFetcherExceptionHandler {
     private final DefaultDataFetcherExceptionHandler defaultHandler = new DefaultDataFetcherExceptionHandler();
 
     @Override
-    public DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandlerParameters handlerParameters) {
+    public CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters handlerParameters) {
         Throwable exception = handlerParameters.getException();
         if (exception instanceof AuthorNotFoundException || exception instanceof PostNotFoundException) {
             Map<String, Object> debugInfo = new HashMap<>();
@@ -28,11 +29,13 @@ public DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandler
                     .debugInfo(debugInfo)
                     .path(handlerParameters.getPath())
                     .build();
-            return DataFetcherExceptionHandlerResult.newResult()
-                    .error(graphqlError)
-                    .build();
+            return CompletableFuture.completedFuture(
+                    DataFetcherExceptionHandlerResult.newResult()
+                            .error(graphqlError)
+                            .build()
+            );
         } else {
-            return defaultHandler.onException(handlerParameters);
+            return defaultHandler.handleException(handlerParameters);
         }
     }
 }
diff --git a/dgs-fileupload/build.gradle b/dgs-fileupload/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '3.1.4'
+    id 'org.springframework.boot' version '3.2.0-RC2'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
 }
@@ -13,10 +13,18 @@ sourceCompatibility = '17'
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
+    maven { url "https://repo.spring.io/snapshot" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.6.0"))
+    //implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation "com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter", {
         exclude group: 'org.yaml', module: 'snakeyaml'
     }

diff --git a/dgs-fileupload/gradle/wrapper/gradle-wrapper.jar b/dgs-fileupload/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-fileupload/gradle/wrapper/gradle-wrapper.properties b/dgs-fileupload/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-fileupload/settings.gradle b/dgs-fileupload/settings.gradle
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'dgs-fileupload'
diff --git a/dgs-kotlin-co/build.gradle.kts b/dgs-kotlin-co/build.gradle.kts
@@ -2,11 +2,11 @@ import com.netflix.graphql.dgs.codegen.gradle.GenerateJavaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.1.4"
+    id("org.springframework.boot") version "3.2.0-RC2"
     id("io.spring.dependency-management") version "1.1.3"
-    kotlin("jvm") version "1.9.10"
-    kotlin("plugin.spring") version "1.9.10"
-    id("com.netflix.dgs.codegen") version "6.0.2" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
+    kotlin("jvm") version "1.9.20"
+    kotlin("plugin.spring") version "1.9.20"
+    id("com.netflix.dgs.codegen") version "6.0.3" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
 }
 
 // extra["graphql-java.version"] = "19.2"
@@ -17,10 +17,18 @@ java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
+    maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.6.0"))
+    //implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation("com.netflix.graphql.dgs:graphql-dgs-webflux-starter") {
         exclude("org.yaml", "snakeyaml")
     }
@@ -52,9 +60,9 @@ dependencies {
     testImplementation("com.ninja-squad:springmockk:4.0.2"){
         exclude(module = "mockk")
     }
-    testImplementation("io.kotest:kotest-runner-junit5-jvm:5.7.2")
-    testImplementation("io.kotest:kotest-assertions-core-jvm:5.7.2")
-    testImplementation("io.kotest:kotest-framework-concurrency:5.7.2")
+    testImplementation("io.kotest:kotest-runner-junit5-jvm:5.8.0")
+    testImplementation("io.kotest:kotest-assertions-core-jvm:5.8.0")
+    testImplementation("io.kotest:kotest-framework-concurrency:5.8.0")
 }
 
 tasks.withType<GenerateJavaTask> {

diff --git a/dgs-kotlin-co/gradle/wrapper/gradle-wrapper.jar b/dgs-kotlin-co/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-kotlin-co/gradle/wrapper/gradle-wrapper.properties b/dgs-kotlin-co/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-kotlin-co/settings.gradle.kts b/dgs-kotlin-co/settings.gradle.kts
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url = uri("https://repo.spring.io/milestone") }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = "dgs-kotlin-co"
diff --git a/dgs-kotlin-co/src/main/kotlin/com/example/demo/DemoApplication.kt b/dgs-kotlin-co/src/main/kotlin/com/example/demo/DemoApplication.kt
@@ -36,7 +36,7 @@ class DataInitializer(val posts: PostRepository, val comments: CommentRepository
         runBlocking {
             comments.deleteAll()
             posts.deleteAll()
-            
+
             val saved = posts.saveAll(data).toList()
             saved.forEach { log.debug("saved: {}", it) }
         }
@@ -51,8 +51,7 @@ class SecurityConfig {
     fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
         return http
             .csrf { it.disable() }
-            .httpBasic()
-            .and()
+            .httpBasic{}
             .securityMatcher(PathPatternParserServerWebExchangeMatcher("/graphql"))
             .build()
     }

diff --git a/dgs-kotlin-co/src/main/kotlin/com/example/demo/gql/ExceptionHandlers.kt b/dgs-kotlin-co/src/main/kotlin/com/example/demo/gql/ExceptionHandlers.kt
@@ -8,24 +8,28 @@ import graphql.execution.DataFetcherExceptionHandler
 import graphql.execution.DataFetcherExceptionHandlerParameters
 import graphql.execution.DataFetcherExceptionHandlerResult
 import org.springframework.stereotype.Component
+import java.util.concurrent.CompletableFuture
 
 @Component
 class ExceptionHandlers : DataFetcherExceptionHandler {
     val defaultHandler = DefaultDataFetcherExceptionHandler()
 
-    override fun onException(handlerParameters: DataFetcherExceptionHandlerParameters): DataFetcherExceptionHandlerResult =
+    override fun handleException(handlerParameters: DataFetcherExceptionHandlerParameters): CompletableFuture<DataFetcherExceptionHandlerResult>? =
         when (val exception = handlerParameters.exception) {
             is PostNotFoundException, is AuthorNotFoundException -> {
                 val graphqlError = TypedGraphQLError.newNotFoundBuilder()
                     .message(exception.message)
                     .path(handlerParameters.path)
                     .build();
-                DataFetcherExceptionHandlerResult.newResult()
-                    .error(graphqlError)
-                    .build();
+                CompletableFuture.completedFuture(
+                    DataFetcherExceptionHandlerResult.newResult()
+                        .error(graphqlError)
+                        .build()
+                )
             }
+
             else -> {
-                defaultHandler.onException(handlerParameters);
+                defaultHandler.handleException(handlerParameters)
             }
         }
 }