feat: replace javax with jakarta counterparts

Author: oliemansm

gradle.properties

@@ -31,8 +31,8 @@ TARGET_COMPATIBILITY=17
 ### Dependencies
 LIB_GRAPHQL_JAVA_VER=19.3
 LIB_EXTENDED_SCALARS_VER=19.1
-LIB_SPRING_BOOT_VER=2.7.6
-LIB_GRAPHQL_SERVLET_VER=14.0.0
+LIB_SPRING_BOOT_VER=3.0.0
+LIB_GRAPHQL_SERVLET_VER=15.0.0
 LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.2
 LIB_GRAPHQL_ANNOTATIONS_VER=9.1
 LIB_REFLECTIONS_VER=0.10.2

graphql-kickstart-spring-support/src/test/java/graphql/kickstart/spring/error/GraphQLErrorStartupListenerTest.java

@@ -34,6 +34,6 @@ private ApplicationReadyEvent getApplicationReadyEvent() {
         new AnnotationConfigWebApplicationContext();
     annotationConfigWebApplicationContext.refresh();
     return new ApplicationReadyEvent(
-        new SpringApplication(), new String[0], annotationConfigWebApplicationContext);
+        new SpringApplication(), new String[0], annotationConfigWebApplicationContext, null);
   }
 }

graphql-spring-boot-autoconfigure/build.gradle

@@ -19,8 +19,8 @@
 
 dependencies {
     api "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
-    api(project(":graphql-kickstart-spring-support"))
-    api(project(':graphql-kickstart-spring-webflux'))
+    api project(":graphql-kickstart-spring-support")
+    api project(':graphql-kickstart-spring-webflux')
     api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER"
     api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
@@ -46,7 +46,7 @@ dependencies {
     compileOnly "org.springframework.boot:spring-boot-configuration-processor"
     compileOnly "org.springframework.boot:spring-boot-starter-web"
 
-    testImplementation(project(":graphql-spring-boot-starter-test"))
+    testImplementation project(":graphql-spring-boot-starter-test")
     testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     testImplementation "org.springframework.boot:spring-boot-starter-web"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -57,7 +57,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-security"
     testImplementation "org.springframework.security:spring-security-test"
     testImplementation "io.projectreactor:reactor-core"
-    testImplementation "io.reactivex.rxjava2:rxjava"
+    testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
     testImplementation "org.jsoup:jsoup:$LIB_JSOUP_VER"
 }
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/annotations/GraphQLAnnotationsProperties.java

@@ -1,6 +1,6 @@
 package graphql.kickstart.autoconfigure.annotations;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/altair/AltairController.java

@@ -11,8 +11,8 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/ReactiveGraphiQLController.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/ServletGraphiQLController.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/ResourceSerializer.java

@@ -5,17 +5,17 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.springframework.boot.jackson.JsonComponent;
 import org.springframework.core.io.Resource;
+import org.springframework.util.StreamUtils;
 
 @JsonComponent
 public class ResourceSerializer extends JsonSerializer<Resource> {
   @Override
   public void serialize(
       final Resource value, final JsonGenerator gen, final SerializerProvider serializers)
       throws IOException {
-    final String content = Streams.asString(value.getInputStream(), StandardCharsets.UTF_8.name());
+    final String content = StreamUtils.copyToString(value.getInputStream(), StandardCharsets.UTF_8);
     gen.writeString(content);
   }
 }

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/PlaygroundCdn.java

@@ -1,6 +1,6 @@
 package graphql.kickstart.autoconfigure.editor.playground.properties;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/PlaygroundProperties.java

@@ -5,7 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/PlaygroundStaticPathSettings.java

@@ -1,6 +1,6 @@
 package graphql.kickstart.autoconfigure.editor.playground.properties;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/settings/PlaygroundPrettierSettings.java

@@ -1,7 +1,7 @@
 package graphql.kickstart.autoconfigure.editor.playground.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 
 @Data

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/settings/PlaygroundSchemaPollingSettings.java

@@ -1,7 +1,7 @@
 package graphql.kickstart.autoconfigure.editor.playground.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 
 @Data

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerController.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebAutoConfiguration.java

@@ -57,23 +57,23 @@
 import graphql.kickstart.spring.error.ErrorHandlerSupplier;
 import graphql.kickstart.spring.error.GraphQLErrorStartupListener;
 import graphql.schema.GraphQLSchema;
+import jakarta.servlet.MultipartConfigElement;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Executor;
-import javax.servlet.MultipartConfigElement;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -95,7 +95,6 @@
 import org.springframework.web.util.UrlPathHelper;
 
 /** @author <a href="mailto:[email protected]">oEmbedler Inc.</a> */
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
@@ -359,11 +358,9 @@ public ServletRegistrationBean<AbstractGraphQLHttpServlet> graphQLServletRegistr
       @Autowired(required = false) MultipartConfigElement multipartConfigElement) {
     ServletRegistrationBean<AbstractGraphQLHttpServlet> registration =
         new ServletRegistrationBean<>(servlet, graphQLServletProperties.getServletMapping());
-    if (multipartConfigElement != null) {
-      registration.setMultipartConfig(multipartConfigElement);
-    } else {
-      registration.setMultipartConfig(new MultipartConfigElement(""));
-    }
+    registration.setMultipartConfig(
+        Objects.requireNonNullElseGet(
+            multipartConfigElement, () -> new MultipartConfigElement("")));
     registration.setAsyncSupported(asyncServletProperties.isEnabled());
     return registration;
   }

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebsocketAutoConfiguration.java

@@ -13,7 +13,7 @@
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import javax.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerContainer;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWsServerEndpointRegistration.java

@@ -1,9 +1,9 @@
 package graphql.kickstart.autoconfigure.web.servlet;
 
 import graphql.kickstart.servlet.GraphQLWebsocketServlet;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
 import org.springframework.context.Lifecycle;
 import org.springframework.web.socket.server.standard.ServerEndpointRegistration;
 

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/PermitAllWebSecurity.java

@@ -1,16 +1,18 @@
 package graphql.kickstart.autoconfigure;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
 @EnableWebSecurity
-public class PermitAllWebSecurity extends WebSecurityConfigurerAdapter {
+public class PermitAllWebSecurity {
 
-  @Override
-  protected void configure(final HttpSecurity http) throws Exception {
-    http.authorizeRequests().anyRequest().permitAll();
+  @Bean
+  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests().anyRequest().permitAll();
+    return http.build();
   }
 }

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/AbstractAutoConfigurationTest.java

@@ -2,8 +2,8 @@
 
 import static org.mockito.Mockito.mock;
 
-import javax.servlet.ServletContext;
-import javax.websocket.server.ServerContainer;
+import jakarta.servlet.ServletContext;
+import jakarta.websocket.server.ServerContainer;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -65,7 +65,7 @@ private void loadServletContext() {
     if (context instanceof AnnotationConfigWebApplicationContext) {
       ServerContainer serverContainer = mock(ServerContainer.class);
       ServletContext servletContext = new MockServletContext();
-      servletContext.setAttribute("javax.websocket.server.ServerContainer", serverContainer);
+      servletContext.setAttribute("jakarta.websocket.server.ServerContainer", serverContainer);
       ((AnnotationConfigWebApplicationContext) context).setServletContext(servletContext);
     }
   }

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/AbstractAutoConfigurationTest.java

@@ -2,8 +2,8 @@
 
 import static org.mockito.Mockito.mock;
 
-import javax.servlet.ServletContext;
-import javax.websocket.server.ServerContainer;
+import jakarta.servlet.ServletContext;
+import jakarta.websocket.server.ServerContainer;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -61,14 +61,14 @@ protected void load(Class<?> config, String... environment) {
     getContext().refresh();
     getContext()
         .publishEvent(
-            new ApplicationReadyEvent(new SpringApplication(), new String[0], getContext()));
+            new ApplicationReadyEvent(new SpringApplication(), new String[0], getContext(), null));
   }
 
   private void loadServletContext() {
     if (context instanceof AnnotationConfigWebApplicationContext) {
       ServerContainer serverContainer = mock(ServerContainer.class);
       ServletContext servletContext = new MockServletContext();
-      servletContext.setAttribute("javax.websocket.server.ServerContainer", serverContainer);
+      servletContext.setAttribute("jakarta.websocket.server.ServerContainer", serverContainer);
       ((AnnotationConfigWebApplicationContext) context).setServletContext(servletContext);
     }
   }

graphql-spring-boot-test-autoconfigure/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-websocket")
     implementation("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
 
-    testImplementation "io.reactivex.rxjava2:rxjava"
+    testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
 }
 
 compileJava.dependsOn(processResources)

graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java

@@ -31,7 +31,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.MultipartConfigElement;
+import jakarta.servlet.MultipartConfigElement;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

graphql-spring-boot-test/build.gradle

@@ -27,5 +27,5 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-web")
     testImplementation "org.springframework.boot:spring-boot-starter-websocket"
     testImplementation project(":graphql-spring-boot-starter")
-    testImplementation "io.reactivex.rxjava2:rxjava"
+    testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
 }

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/GraphQLResponse.java

@@ -65,7 +65,7 @@ public boolean isOk() {
   }
 
   public HttpStatus getStatusCode() {
-    return responseEntity.getStatusCode();
+    return HttpStatus.resolve(responseEntity.getStatusCode().value());
   }
 
   public ResponseEntity<String> getRawResponse() {

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/GraphQLTestSubscription.java

@@ -22,15 +22,15 @@
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

graphql-spring-boot-test/src/test/java/com/graphql/spring/boot/test/beans/DummyMutation.java

@@ -6,7 +6,7 @@
 import graphql.schema.GraphQLScalarType;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 

graphql-spring-boot-test/src/test/java/com/graphql/spring/boot/test/beans/DummyQuery.java

@@ -3,7 +3,7 @@
 import graphql.kickstart.tools.GraphQLQueryResolver;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Service;
 
 @Service