insert jakarta imports where javax import were positioned

commafeed-server/src/test/java/com/commafeed/DatabaseReset.java

@@ -1,5 +1,7 @@
 package com.commafeed;
 
+import jakarta.enterprise.inject.spi.CDI;
+
 import org.kohsuke.MetaInfServices;
 
 import com.commafeed.backend.service.db.DatabaseStartupService;
@@ -7,7 +9,6 @@ import com.commafeed.backend.service.db.DatabaseStartupService;
 import io.quarkus.liquibase.runtime.LiquibaseSchemaProvider;
 import io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
-import jakarta.enterprise.inject.spi.CDI;
 
 /**
  * Resets database between tests

commafeed-server/src/test/java/com/commafeed/frontend/ws/WebSocketSessionsTest.java

@@ -1,5 +1,7 @@
 package com.commafeed.frontend.ws;
 
+import jakarta.websocket.Session;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -11,8 +13,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.backend.model.User;
 
-import jakarta.websocket.Session;
-
 @ExtendWith(MockitoExtension.class)
 class WebSocketSessionsTest {
 

commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java

@@ -8,6 +8,10 @@ import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
 
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.HttpStatus;
 import org.awaitility.Awaitility;
@@ -24,9 +28,6 @@ import com.commafeed.frontend.model.request.SubscribeRequest;
 
 import io.restassured.RestAssured;
 import io.restassured.http.Header;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
 import lombok.Getter;
 
 @Getter

commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java

@@ -4,6 +4,9 @@ import java.net.HttpCookie;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -17,8 +20,6 @@ import com.commafeed.frontend.model.request.SubscribeRequest;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class SecurityIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java

@@ -11,6 +11,16 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
+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.Session;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
@@ -22,15 +32,6 @@ import com.commafeed.frontend.model.request.FeedModificationRequest;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-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.Session;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
 import lombok.extern.slf4j.Slf4j;
 
 @QuarkusTest

commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java

@@ -2,6 +2,8 @@ package com.commafeed.integration.rest;
 
 import java.util.List;
 
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -16,7 +18,6 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class AdminIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java

@@ -8,6 +8,9 @@ import java.time.LocalDate;
 import java.time.ZoneOffset;
 import java.util.Objects;
 
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.HttpStatus;
 import org.awaitility.Awaitility;
@@ -28,8 +31,6 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class FeedIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java

@@ -1,5 +1,7 @@
 package com.commafeed.integration.rest;
 
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -14,7 +16,6 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class FeverIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java

@@ -2,6 +2,9 @@ package com.commafeed.integration.rest;
 
 import java.util.List;
 
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,8 +17,6 @@ import io.quarkus.mailer.MockMailbox;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.vertx.ext.mail.MailMessage;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class UserIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java

@@ -1,5 +1,7 @@
 package com.commafeed.integration.servlet;
 
+import jakarta.ws.rs.core.MediaType;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.AfterEach;
@@ -11,7 +13,6 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
 class CustomCodeIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/servlet/LogoutIT.java

@@ -4,6 +4,8 @@ import java.net.HttpCookie;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -13,7 +15,6 @@ import com.commafeed.integration.BaseIT;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.Headers;
-import jakarta.ws.rs.core.HttpHeaders;
 
 @QuarkusTest
 class LogoutIT extends BaseIT {

commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java

@@ -1,5 +1,7 @@
 package com.commafeed.integration.servlet;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -9,7 +11,6 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import jakarta.ws.rs.core.HttpHeaders;
 
 @QuarkusTest
 class NextUnreadIT extends BaseIT {