Merge branch 'master' into renovate/org.codehaus.groovy-groovy-all-3.x

Author: oliemansm

graphql-java-servlet/build.gradle

@@ -16,15 +16,15 @@ dependencies {
     api(project(':graphql-java-kickstart'))
 
     // Servlet
-    api 'javax.servlet:javax.servlet-api:3.1.0'
+    api 'javax.servlet:javax.servlet-api:4.0.1'
     api 'javax.websocket:javax.websocket-api:1.1'
     implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.6.0'
-    compileOnly 'org.osgi:org.osgi.service.component:1.3.0'
-    compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
+    compileOnly 'org.osgi:org.osgi.service.component:1.4.0'
+    compileOnly 'org.osgi:org.osgi.service.component.annotations:1.4.0'
     compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.4.0'
     compileOnly 'org.osgi:org.osgi.annotation:6.0.0'
 
@@ -33,7 +33,7 @@ dependencies {
     // Unit testing
     testImplementation "org.codehaus.groovy:groovy-all:3.0.8"
     testImplementation "org.spockframework:spock-core:2.0-M5-groovy-3.0"
-    testRuntimeOnly "cglib:cglib-nodep:3.2.4"
+    testRuntimeOnly "cglib:cglib-nodep:3.3.0"
     testRuntimeOnly "org.objenesis:objenesis:3.2"
     testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
     testImplementation 'org.springframework:spring-test:5.3.6'

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/BatchedQueryResponseWriter.java

@@ -27,7 +27,7 @@ public void write(HttpServletRequest request, HttpServletResponse response) thro
     // GiB of memory allocation during large response processing.
     List<byte[]> serializedResults = new ArrayList<>(2 * results.size() + 1);
 
-    if (results.size() > 0) {
+    if (!results.isEmpty()) {
       serializedResults.add("[".getBytes(StandardCharsets.UTF_8));
     } else {
       serializedResults.add("[]".getBytes(StandardCharsets.UTF_8));