Migrate from javax to jakarta

kokuwaio · Jul 12, 2023 · 8116c01 · 8116c01
1 parent a0387fd
commit 8116c01
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 28 deletions.
diff --git a/src/test/java/io/kokuwa/keycloak/FailoverIT.java b/src/test/java/io/kokuwa/keycloak/FailoverIT.java
@@ -5,8 +5,6 @@
 
 import java.util.stream.IntStream;
 
-import javax.ws.rs.NotAuthorizedException;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,6 +13,7 @@
 import io.kokuwa.keycloak.k8s.KubernetesExtension;
 import io.kokuwa.keycloak.keycloak.KeycloakExtension;
 import io.kokuwa.keycloak.keycloak.OpenIDConnect;
+import jakarta.ws.rs.NotAuthorizedException;
 
 @DisplayName("failover")
 @ExtendWith(KubernetesExtension.class)

diff --git a/src/test/java/io/kokuwa/keycloak/K3sIT.java b/src/test/java/io/kokuwa/keycloak/K3sIT.java
@@ -11,8 +11,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.NotAuthorizedException;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25,6 +23,7 @@
 import io.kokuwa.keycloak.keycloak.Prometheus;
 import io.kokuwa.keycloak.mailhog.Mailhog;
 import io.kokuwa.keycloak.mailhog.MailhogExtension;
+import jakarta.ws.rs.NotAuthorizedException;
 
 @DisplayName("k3s")
 @ExtendWith(KeycloakExtension.class)

diff --git a/src/test/java/io/kokuwa/keycloak/keycloak/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/keycloak/KeycloakExtension.java
@@ -2,14 +2,14 @@
 
 import java.util.Set;
 
-import javax.ws.rs.client.ClientBuilder;
-
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.keycloak.admin.client.Keycloak;
 
+import jakarta.ws.rs.client.ClientBuilder;
+
 public class KeycloakExtension implements ParameterResolver {
 
 	private static final Keycloak keycloak = Keycloak.getInstance(

diff --git a/src/test/java/io/kokuwa/keycloak/keycloak/PrometheusClient.java b/src/test/java/io/kokuwa/keycloak/keycloak/PrometheusClient.java
@@ -1,9 +1,9 @@
 package io.kokuwa.keycloak.keycloak;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * JAX-RS client for prometheus endpoint.

diff --git a/src/test/java/io/kokuwa/keycloak/keycloak/TokenClient.java b/src/test/java/io/kokuwa/keycloak/keycloak/TokenClient.java
@@ -1,20 +1,20 @@
 package io.kokuwa.keycloak.keycloak;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
 import org.keycloak.OAuth2Constants;
 import org.keycloak.representations.AccessTokenResponse;
 import org.keycloak.representations.UserInfo;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 public interface TokenClient {
 
 	@POST

diff --git a/src/test/java/io/kokuwa/keycloak/mailhog/Mailhog.java b/src/test/java/io/kokuwa/keycloak/mailhog/Mailhog.java
@@ -1,10 +1,10 @@
 package io.kokuwa.keycloak.mailhog;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("http://mail.127.0.0.1.nip.io:8080")
 public interface Mailhog {

diff --git a/src/test/java/io/kokuwa/keycloak/mailhog/MailhogExtension.java b/src/test/java/io/kokuwa/keycloak/mailhog/MailhogExtension.java
@@ -1,12 +1,12 @@
 package io.kokuwa.keycloak.mailhog;
 
-import javax.ws.rs.client.ClientBuilder;
-
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
 
+import jakarta.ws.rs.client.ClientBuilder;
+
 public class MailhogExtension implements ParameterResolver {
 
 	private static final Mailhog mailhog = ((ResteasyClient) ClientBuilder.newClient()).target("").proxy(Mailhog.class);