javax -> jakarta.

npo-poms · Feb 13, 2024 · 03b057e · 03b057e
1 parent cfe12ca
commit 03b057e
Show file tree

Hide file tree

Showing 42 changed files with 107 additions and 108 deletions.
diff --git a/client-core/pom.xml b/client-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.vpro.poms.api-clients</groupId>
     <artifactId>api-client-parent</artifactId>
-    <version>7.12-SNAPSHOT</version>
+    <version>8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>client-core</artifactId>

diff --git a/client-core/src/main/java/nl/vpro/api/client/utils/Swagger.java b/client-core/src/main/java/nl/vpro/api/client/utils/Swagger.java
@@ -48,7 +48,7 @@ public static VersionResult getVersionFromSwagger(String baseUrl, String default
         final URI url = URI.create(baseUrl + "/openapi.json");
         try {
             if (timeout == null) {
-                timeout = Duration.ofSeconds(3);
+                timeout = Duration.ofSeconds(30);
             }
             final ObjectMapper mapper = new ObjectMapper();
             final JsonFactory factory = new JsonFactory();

diff --git a/client-extras/pom.xml b/client-extras/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.vpro.poms.api-clients</groupId>
     <artifactId>api-client-parent</artifactId>
-    <version>7.12-SNAPSHOT</version>
+    <version>8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>client-extras</artifactId>

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/AbstractApiClientMediaRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/AbstractApiClientMediaRepository.java
@@ -8,9 +8,9 @@
 import java.util.*;
 import java.util.function.Predicate;
 
-import javax.inject.Inject;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.JAXB;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Response;
+import jakarta.xml.bind.JAXB;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/...nt-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaQuerySearchRepository.java b/...nt-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaQuerySearchRepository.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import nl.vpro.api.client.frontend.NpoApiClients;
 import nl.vpro.domain.api.SuggestResult;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaRepository.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import nl.vpro.domain.api.media.MediaRepository;
 

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaSearchRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaSearchRepository.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import nl.vpro.domain.api.media.*;
 import nl.vpro.domain.api.profile.ProfileDefinition;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientPageQuerySearchRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientPageQuerySearchRepository.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import nl.vpro.api.client.frontend.NpoApiClients;
 import nl.vpro.domain.api.SuggestResult;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientScheduleRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientScheduleRepository.java
@@ -3,8 +3,8 @@
 import java.time.Instant;
 import java.time.LocalDate;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiProfileServiceImpl.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiProfileServiceImpl.java
@@ -5,9 +5,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.validation.constraints.NotNull;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import  jakarta.validation.constraints.NotNull;
 
 import com.google.common.cache.*;
 

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/MediaRestClientUtils.java b/client-extras/src/main/java/nl/vpro/api/client/utils/MediaRestClientUtils.java
@@ -7,9 +7,9 @@
 import java.util.*;
 import java.util.function.Supplier;
 
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import  jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.io.IOUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiImageUtil.java b/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiImageUtil.java
@@ -10,9 +10,9 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.validation.constraints.NotNull;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import  jakarta.validation.constraints.NotNull;
 
 
 import nl.vpro.domain.media.support.ImageUrlService;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiMediaUtil.java b/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiMediaUtil.java
@@ -12,11 +12,11 @@
 import java.util.concurrent.*;
 import java.util.function.*;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import  jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.core.Response;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiPageUtil.java b/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiPageUtil.java
@@ -5,8 +5,8 @@
 import java.util.*;
 import java.util.function.Supplier;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import com.google.common.collect.Lists;
 

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiRateLimiter.java b/client-extras/src/main/java/nl/vpro/api/client/utils/NpoApiRateLimiter.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  * @author Michiel Meeuwissen

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/PageRestClientUtils.java b/client-extras/src/main/java/nl/vpro/api/client/utils/PageRestClientUtils.java
@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import nl.vpro.api.rs.v3.page.PageRestService;
 import nl.vpro.domain.api.page.PageForm;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/PageUpdateApiUtil.java b/client-extras/src/main/java/nl/vpro/api/client/utils/PageUpdateApiUtil.java
@@ -11,13 +11,13 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.inject.Inject;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import  jakarta.validation.Valid;
+import  jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.http.impl.execchain.RequestAbortedException;

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/PageUpdateRateLimiter.java b/client-extras/src/main/java/nl/vpro/api/client/utils/PageUpdateRateLimiter.java
@@ -1,7 +1,7 @@
 package nl.vpro.api.client.utils;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 /**
  * @author Michiel Meeuwissen

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/Result.java b/client-extras/src/main/java/nl/vpro/api/client/utils/Result.java
@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * @author Michiel Meeuwissen

diff --git a/client-extras/src/main/java/nl/vpro/api/client/utils/XmlProfileServiceImpl.java b/client-extras/src/main/java/nl/vpro/api/client/utils/XmlProfileServiceImpl.java
@@ -3,9 +3,9 @@
 import java.io.InputStream;
 import java.util.*;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.JAXB;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.JAXB;
 
 import nl.vpro.domain.api.profile.*;
 import nl.vpro.domain.media.MediaObject;

diff --git a/client-extras/src/test/java/nl/vpro/api/client/utils/MediaRestClientUtilsTest.java b/client-extras/src/test/java/nl/vpro/api/client/utils/MediaRestClientUtilsTest.java
@@ -3,7 +3,7 @@
 import java.net.URL;
 import java.time.Instant;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

diff --git a/client-extras/src/test/java/nl/vpro/api/client/utils/NpoApiClientUtilTest.java b/client-extras/src/test/java/nl/vpro/api/client/utils/NpoApiClientUtilTest.java
@@ -9,8 +9,8 @@
 import java.time.Instant;
 import java.util.*;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.core.*;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.core.*;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.time.StopWatch;
@@ -284,7 +284,7 @@ public void badRequest() {
         /*String seriesRef = getSeriesRef(util.getClients().getMediaService().load("VPWON_1229797", null));
         System.out.println("" + seriesRef);*/
             System.out.println(util.getClients().getMediaService().findDescendants(new MediaForm(), "POMS_S_VPRO_522965", "vpro", "title,description,image", 0L, 1000).asList());
-        }).isInstanceOf(javax.ws.rs.NotFoundException.class);
+        }).isInstanceOf(jakarta.ws.rs.NotFoundException.class);
     }
 
     @Test

diff --git a/client-extras/src/test/java/nl/vpro/api/client/utils/PageUpdateApiClientUtilTest.java b/client-extras/src/test/java/nl/vpro/api/client/utils/PageUpdateApiClientUtilTest.java
@@ -4,8 +4,8 @@
 
 import java.io.StringReader;
 
-import javax.ws.rs.core.MediaType;
-import javax.xml.bind.JAXB;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.xml.bind.JAXB;
 
 import org.junit.jupiter.api.*;
 

diff --git a/frontend-api-client/pom.xml b/frontend-api-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.vpro.poms.api-clients</groupId>
     <artifactId>api-client-parent</artifactId>
-    <version>7.12-SNAPSHOT</version>
+    <version>8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>frontend-api-client</artifactId>

diff --git a/...-api-client/src/main/java/nl/vpro/api/client/frontend/ApiAuthenticationRequestFilter.java b/...-api-client/src/main/java/nl/vpro/api/client/frontend/ApiAuthenticationRequestFilter.java
@@ -9,9 +9,9 @@
 import java.net.URI;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.slf4j.*;
 

diff --git a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java
@@ -14,10 +14,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.meeuw.functional.TriFunction;
@@ -98,7 +98,7 @@ public class NpoApiClients extends AbstractApiClient {
 
     @SuppressWarnings({"SpringAutowiredFieldsWarningInspection", "unused", "OptionalUsedAsFieldOrParameterType"})
     @Named
-    public static class Provider implements javax.inject.Provider<NpoApiClients> {
+    public static class Provider implements jakarta.inject.Provider<NpoApiClients> {
         @Inject
         @Named("npo-api.baseUrl")
         String baseUrl;

diff --git a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClientsAspect.java b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClientsAspect.java
@@ -5,8 +5,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
 
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
 
 import static nl.vpro.domain.api.Constants.*;
 

diff --git a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClientsFilter.java b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClientsFilter.java
@@ -1,15 +1,14 @@
 package nl.vpro.api.client.frontend;
 
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.client.*;
+import jakarta.ws.rs.core.HttpHeaders;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.annotation.Priority;
-import javax.ws.rs.client.*;
-import javax.ws.rs.core.HttpHeaders;
-
 import nl.vpro.api.rs.v3.media.MediaRestService;
 import nl.vpro.api.rs.v3.page.PageRestService;
 import nl.vpro.jmx.CountAspect;

diff --git a/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/NpoApiClientsITest.java b/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/NpoApiClientsITest.java
@@ -11,9 +11,9 @@
 import java.time.*;
 import java.util.Locale;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.io.IOUtils;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
@@ -310,7 +310,7 @@ public void testTimeout() {
                 .httpEngine(httpClient);
             Response response = builder.build().target(url).request().get();
             log.info("{}", response);
-        }).isInstanceOf(javax.ws.rs.ProcessingException.class);
+        }).isInstanceOf(jakarta.ws.rs.ProcessingException.class);
     }
 
 
@@ -324,7 +324,7 @@ public void testTimeoutSocket() {
             Response response = builder.build().target(url).request().get();
             assertThat(response.getStatus()).isEqualTo(200);
             log.info(response.readEntity(String.class));
-        }).isInstanceOf(javax.ws.rs.ProcessingException.class);
+        }).isInstanceOf(jakarta.ws.rs.ProcessingException.class);
 
     }
 

diff --git a/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/NpoApiClientsSpringTest.java b/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/NpoApiClientsSpringTest.java
@@ -1,6 +1,6 @@
 package nl.vpro.api.client.frontend;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/ResteasyTest.java b/frontend-api-client/src/test/java/nl/vpro/api/client/frontend/ResteasyTest.java
@@ -2,8 +2,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.cache.BrowserCacheFeature;