Upgrade servlet to 11.0.0

Author: oliemansm

README.md

@@ -1,14 +1,14 @@
 # GraphQL and Graph*i*QL Spring Framework Boot Starters
 
-[![GitHub CI Workflow](https://github.com/graphql-java-kickstart/graphql-spring-boot/workflows/ci/badge.svg)](https://github.com/graphql-java-kickstart/graphql-spring-boot/actions?query=workflow%3ACI+branch%3Amaster)
 [![Maven Central](https://img.shields.io/maven-central/v/com.graphql-java-kickstart/graphql-spring-boot-starter.svg)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java-kickstart/graphql-spring-boot-starter)
-[![Chat on Spectrum](https://img.shields.io/badge/spectrum-join%20the%20community-%23800080)](https://spectrum.chat/graphql-java-kick)
+[![GitHub CI Workflow](https://github.com/graphql-java-kickstart/graphql-spring-boot/workflows/ci/badge.svg)](https://github.com/graphql-java-kickstart/graphql-spring-boot/actions?query=workflow%3ACI+branch%3Amaster)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=graphql-java-kickstart_graphql-spring-boot&metric=alert_status)](https://sonarcloud.io/dashboard?id=graphql-java-kickstart_graphql-spring-boot)
 
 #### We are looking for contributors!
 
 Are you interested in improving our documentation, working on the codebase, reviewing PRs?
 
-[Reach out to us on Spectrum](https://spectrum.chat/graphql-java-kick) and join the team!
+[Reach out to us on Discussions](https://github.com/graphql-java-kickstart/graphql-spring-boot/discussions) and join the team!
 
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
@@ -107,19 +107,19 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.graphql-java-kickstart:graphql-spring-boot-starter:8.0.0'
+  implementation 'com.graphql-java-kickstart:graphql-spring-boot-starter:8.1.0'
   
   // to embed Altair tool
-  runtimeOnly 'com.graphql-java-kickstart:altair-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:altair-spring-boot-starter:8.1.0'
 
   // to embed GraphiQL tool
-  runtimeOnly 'com.graphql-java-kickstart:graphiql-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:graphiql-spring-boot-starter:8.1.0'
 
   // to embed Voyager tool
-  runtimeOnly 'com.graphql-java-kickstart:voyager-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:voyager-spring-boot-starter:8.1.0'
   
   // testing facilities
-  testImplementation 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:8.0.0'
+  testImplementation 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:8.1.0'
 }
 ```
 
@@ -129,38 +129,38 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
 </dependency>
 
 <!-- to embed Altair tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>altair-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- testing facilities -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter-test</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>test</scope>
 </dependency>
 

build.gradle

@@ -51,11 +51,11 @@ subprojects {
     group "$PROJECT_GROUP"
 
     repositories {
+        maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" }
         mavenLocal()
         mavenCentral()
         jcenter()
         maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" }
-        maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" }
         maven { url "https://repo.spring.io/libs-milestone" }
     }
 

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomerResolver.java

@@ -1,9 +1,8 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import graphql.kickstart.tools.GraphQLResolver;
 import graphql.kickstart.execution.context.GraphQLContext;
+import graphql.kickstart.tools.GraphQLResolver;
 import graphql.schema.DataFetchingEnvironment;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderRegistry;
@@ -13,9 +12,9 @@
 public class CustomerResolver implements GraphQLResolver<Customer> {
 
   public CompletableFuture<String> getName(Customer customer, DataFetchingEnvironment dfe) {
-    Optional<DataLoaderRegistry> registry = ((GraphQLContext) dfe.getContext()).getDataLoaderRegistry();
-    if (registry.isPresent()) {
-      DataLoader<Integer, String> customerLoader = registry.get().getDataLoader("customerDataLoader");
+    DataLoaderRegistry registry = ((GraphQLContext) dfe.getContext()).getDataLoaderRegistry();
+    DataLoader<Integer, String> customerLoader = registry.getDataLoader("customerDataLoader");
+    if (customerLoader != null) {
       return customerLoader.load(customer.getCustomerId());
     }
     throw new IllegalStateException("No customer data loader found");

gradle.properties

@@ -16,7 +16,7 @@
 # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-version=8.1.0-SNAPSHOT
+version=11.0.0-SNAPSHOT
 ### Project Metadata
 PROJECT_GROUP=com.graphql-java-kickstart
 PROJECT_NAME=graphql-spring-boot
@@ -31,9 +31,9 @@ VCS=Git
 SOURCE_COMPATIBILITY=1.8
 TARGET_COMPATIBILITY=1.8
 ### Dependencies
-LIB_GRAPHQL_JAVA_VER=15.0
+LIB_GRAPHQL_JAVA_VER=16.1
 LIB_SPRING_BOOT_VER=2.3.6.RELEASE
-LIB_GRAPHQL_SERVLET_VER=10.1.0
+LIB_GRAPHQL_SERVLET_VER=11.0.0-SNAPSHOT
 LIB_GRAPHQL_JAVA_TOOLS_VER=6.3.0
 LIB_GRAPHQL_ANNOTATIONS_VER=8.2
 LIB_REFLECTIONS_VER=0.9.11