diff --git a/client-core/pom.xml b/client-core/pom.xml index 06fc6c56..6950b988 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -5,7 +5,7 @@ nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT client-core 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 index f3622e36..d6221841 100644 --- 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 index 07b86938..c678f7de 100644 --- a/client-extras/pom.xml +++ b/client-extras/pom.xml @@ -5,7 +5,7 @@ nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT client-extras 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 index 23b8d742..692de0f8 100644 --- 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/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaQuerySearchRepository.java b/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaQuerySearchRepository.java index 29444b10..d6323c70 100644 --- a/client-extras/src/main/java/nl/vpro/api/client/utils/ApiClientMediaQuerySearchRepository.java +++ b/client-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 index 822bcfd7..97bea7c4 100644 --- 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 index fa13296d..6839c8e6 100644 --- 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 index 1d682e02..67ad898f 100644 --- 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 index d3cafc50..72b20810 100644 --- 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 index 92559da2..895b764e 100644 --- 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 index 6d24a56a..cb59c80f 100644 --- 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 index 6d30a4ea..939ef2a7 100644 --- 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 index d22367b8..0cf54849 100644 --- 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 index 0a9813f6..59ba9f4a 100644 --- 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 index f11e91d6..97964bc6 100644 --- 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 index 95cc4429..0e5a1779 100644 --- 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 index 11be10c1..733dc654 100644 --- 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 index 8b366f54..e316a793 100644 --- 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 index d3600aae..42f74c50 100644 --- 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 index 188aa556..49fd43ab 100644 --- 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 index 306f4157..2112ac5f 100644 --- 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 index 1efef047..80dec517 100644 --- 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 index 0ce5b2f2..52bdf643 100644 --- 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 index 20d5eb5e..ab614fbc 100644 --- a/frontend-api-client/pom.xml +++ b/frontend-api-client/pom.xml @@ -5,7 +5,7 @@ nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT frontend-api-client diff --git a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/ApiAuthenticationRequestFilter.java b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/ApiAuthenticationRequestFilter.java index 23eea38d..1435a71b 100644 --- a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/ApiAuthenticationRequestFilter.java +++ b/frontend-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 index 724fcc86..d894a284 100644 --- 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 { + public static class Provider implements jakarta.inject.Provider { @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 index 78b1e05e..a2e570d0 100644 --- 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 index b7c28d81..470d3b47 100644 --- 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 index ae496ddd..19997fb3 100644 --- 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 index e8cac083..68d2fd94 100644 --- 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 index 3c4e4f46..4ae533c9 100644 --- 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; diff --git a/media-backend-api-client/pom.xml b/media-backend-api-client/pom.xml index 06cfd083..144b0cbd 100644 --- a/media-backend-api-client/pom.xml +++ b/media-backend-api-client/pom.xml @@ -5,7 +5,7 @@ nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT media-backend-api-client diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ContentTypeInterceptor.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ContentTypeInterceptor.java index 0e5ec3c9..f51939e9 100644 --- a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ContentTypeInterceptor.java +++ b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ContentTypeInterceptor.java @@ -6,10 +6,10 @@ import java.io.InputStream; import java.util.Collections; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.apache.commons.io.IOUtils; diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java index dcaca74f..51c5b7f4 100644 --- a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java +++ b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java @@ -10,12 +10,12 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.Response; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -190,7 +190,7 @@ public static class Builder { @SuppressWarnings({"SpringAutowiredFieldsWarningInspection", "OptionalUsedAsFieldOrParameterType", "unused"}) @Named - public static class Provider implements javax.inject.Provider { + public static class Provider implements jakarta.inject.Provider { @Inject @Named("npo-media_api_backend.baseUrl") @@ -401,7 +401,7 @@ public String getVersion() { if (v != null) { return VersionResult.builder().version(v).available(true).build(); } - } catch (javax.ws.rs.NotFoundException | ServiceUnavailableException nfe) { + } catch (jakarta.ws.rs.NotFoundException | ServiceUnavailableException nfe) { return VersionResult.builder().version("5.11.6").available(true).build(); } catch (Exception io) { log.warn(io.getClass().getName() + " " + io.getMessage()); diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClientAspect.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClientAspect.java index 821b4693..64b318a4 100644 --- a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClientAspect.java +++ b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClientAspect.java @@ -9,8 +9,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.*; -import javax.ws.rs.core.*; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.*; import org.meeuw.functional.TriFunction; @@ -93,7 +93,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl client.retryAfterWaitOrException(method.getName() + ": Internal Server error: " + isee.getMessage(), isee); // lets retry retry - } catch (javax.ws.rs.ProcessingException pe) { + } catch (jakarta.ws.rs.ProcessingException pe) { Throwable t = pe.getCause(); if (t instanceof SocketException) { client.retryAfterWaitOrException(method.getName() + ": SocketException: " + t.getMessage(), pe);// retry diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ResponseError.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ResponseError.java index 8b91d619..9b236036 100644 --- a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ResponseError.java +++ b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/ResponseError.java @@ -4,7 +4,7 @@ import java.lang.reflect.Method; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.google.common.base.MoreObjects; diff --git a/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientTest.java b/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientTest.java index 033c9f87..2f5fc308 100644 --- a/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientTest.java +++ b/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientTest.java @@ -6,8 +6,8 @@ import java.io.IOException; import java.time.*; -import javax.ws.rs.core.Response; -import javax.xml.bind.JAXB; +import jakarta.ws.rs.core.Response; +import jakarta.xml.bind.JAXB; import org.junit.jupiter.api.*; diff --git a/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientUploadITest.java b/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientUploadITest.java index 53119dc0..66b1c62f 100644 --- a/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientUploadITest.java +++ b/media-backend-api-client/src/test/java/nl/vpro/api/client/media/MediaRestClientUploadITest.java @@ -5,7 +5,7 @@ import java.io.*; import java.nio.file.Files; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.*; diff --git a/pages-backend-api-client/pom.xml b/pages-backend-api-client/pom.xml index f89249bc..52ab3044 100644 --- a/pages-backend-api-client/pom.xml +++ b/pages-backend-api-client/pom.xml @@ -5,7 +5,7 @@ nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT pages-backend-api-client diff --git a/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java b/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java index 2ecef13d..a2b51a69 100644 --- a/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java +++ b/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java @@ -15,11 +15,11 @@ import java.util.stream.Stream; import javax.crypto.SecretKey; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; @@ -67,7 +67,7 @@ public class PageUpdateApiClient extends AbstractApiClient { @SuppressWarnings({"SpringAutowiredFieldsWarningInspection", "OptionalUsedAsFieldOrParameterType"}) @Named - public static class Provider implements javax.inject.Provider { + public static class Provider implements jakarta.inject.Provider { @Inject @Named("npo-pages_publisher.baseUrl") diff --git a/pages-backend-api-client/src/test/java/nl/vpro/api/client/pages/PageUpdateApiClientITest.java b/pages-backend-api-client/src/test/java/nl/vpro/api/client/pages/PageUpdateApiClientITest.java index 7144e112..3215862b 100644 --- a/pages-backend-api-client/src/test/java/nl/vpro/api/client/pages/PageUpdateApiClientITest.java +++ b/pages-backend-api-client/src/test/java/nl/vpro/api/client/pages/PageUpdateApiClientITest.java @@ -4,7 +4,7 @@ import java.time.Instant; -import javax.xml.bind.JAXB; +import jakarta.xml.bind.JAXB; import org.junit.jupiter.api.*; diff --git a/pom.xml b/pom.xml index babb50f3..c7b69d44 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ nl.vpro.poms poms-parent - 7.11-SNAPSHOT + 8.0-SNAPSHOT nl.vpro.poms.api-clients api-client-parent - 7.12-SNAPSHOT + 8.0-SNAPSHOT pom Clients for NPO APIs @@ -23,7 +23,7 @@ 17 - 7.11-SNAPSHOT + 8.0-SNAPSHOT