From 6ba126d59c60d930038009e8613b2a298beccf54 Mon Sep 17 00:00:00 2001 From: Dustin Kut Moy Cheung Date: Wed, 5 Feb 2025 15:51:08 -0500 Subject: [PATCH] Migrate to Quarkus 3 --- pom.xml | 28 ++++++++----------- .../ApplicationLifecycle.java | 4 +-- .../pnc/repositorydriver/BeanFactory.java | 10 +++---- .../pnc/repositorydriver/Configuration.java | 2 +- .../jboss/pnc/repositorydriver/Driver.java | 8 +++--- .../TrackingReportProcessor.java | 11 ++++---- .../artifactfilter/ArtifactFilterArchive.java | 6 ++-- .../ArtifactFilterDatabase.java | 6 ++-- .../ArtifactFilterPromotion.java | 6 ++-- .../repositorydriver/endpoints/Public.java | 20 ++++++------- .../endpoints/ServiceHealth.java | 2 +- .../indy/IndyPNCOAuthBearerAuthenticator.java | 4 +-- .../runtime/ApplicationLifecycle.java | 4 +-- .../runtime/BifrostLogUploaderProducer.java | 7 ++--- .../runtime/DefaultExceptionMapper.java | 20 ++++--------- .../runtime/LoggingFilter.java | 16 +++++------ .../runtime/StoppingExceptionMapper.java | 6 ++-- .../pnc/repositorydriver/BeanFactoryMock.java | 2 +- .../pnc/repositorydriver/DriverTest.java | 6 ++-- .../pnc/repositorydriver/MockOidcClient.java | 14 ++++++++-- .../TrackingReportProcessorTest.java | 2 +- .../pnc/repositorydriver/WithSidecarTest.java | 4 +-- .../invokerserver/CallbackHandler.java | 6 ++-- .../invokerserver/HttpServer.java | 4 +-- .../invokerserver/ServletInstanceFactory.java | 2 +- .../runtime/TokensProducerMock.java | 13 +++++++-- 26 files changed, 107 insertions(+), 106 deletions(-) diff --git a/pom.xml b/pom.xml index 27689c5..0d1eec7 100644 --- a/pom.xml +++ b/pom.xml @@ -63,10 +63,9 @@ 1.0.6 quarkus-bom io.quarkus.platform - 2.16.12.Final + 3.18.2 3.13.0 3.5.2 - uber-jar 3.3.3 2.35.2 @@ -75,6 +74,7 @@ 3.11.2 3.3.1 + uber-jar @@ -127,20 +127,16 @@ io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - io.quarkus - quarkus-mutiny - - - io.quarkus - quarkus-resteasy-mutiny + quarkus-rest-jackson + + + + + + + + io.quarkus quarkus-arc @@ -167,7 +163,7 @@ io.quarkus - quarkus-opentelemetry-exporter-otlp + quarkus-opentelemetry org.commonjava.indy diff --git a/src/main/java/org/jboss/pnc/repositorydriver/ApplicationLifecycle.java b/src/main/java/org/jboss/pnc/repositorydriver/ApplicationLifecycle.java index eacf520..11e311a 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/ApplicationLifecycle.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/ApplicationLifecycle.java @@ -4,8 +4,8 @@ import io.quarkus.runtime.StartupEvent; import lombok.extern.slf4j.Slf4j; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped @Slf4j diff --git a/src/main/java/org/jboss/pnc/repositorydriver/BeanFactory.java b/src/main/java/org/jboss/pnc/repositorydriver/BeanFactory.java index cb3f5d5..5eb50f3 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/BeanFactory.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/BeanFactory.java @@ -5,13 +5,13 @@ import java.time.Duration; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import javax.net.ssl.SSLContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.commons.lang.StringUtils; import org.commonjava.cdi.util.weft.config.DefaultWeftConfig; import org.commonjava.cdi.util.weft.config.WeftConfig; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/Configuration.java b/src/main/java/org/jboss/pnc/repositorydriver/Configuration.java index 0b33ac6..9573238 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/Configuration.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/Configuration.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/Driver.java b/src/main/java/org/jboss/pnc/repositorydriver/Driver.java index fab287a..526a946 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/Driver.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/Driver.java @@ -74,8 +74,8 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import java.net.MalformedURLException; import java.net.URI; @@ -591,7 +591,7 @@ private HttpRequest getNotifyHttpRequest(Request callback, String body) { callback.getHeaders().forEach(h -> builder.header(h.getName(), h.getValue())); // Add the service account's access token. We use a fresh one instead of serviceTokens since serviceTokens might // already be closed to expiry when we hit this method inside the executor - builder.header(javax.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken()); + builder.header(jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken()); return builder.build(); } @@ -981,7 +981,7 @@ private Runnable heartBeatSender(Request heartBeat) { .method(heartBeat.getMethod().name(), HttpRequest.BodyPublishers.noBody()) .timeout(Duration.ofSeconds(configuration.getHttpClientRequestTimeout())); heartBeat.getHeaders().forEach(h -> builder.header(h.getName(), h.getValue())); - builder.header(javax.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken()); + builder.header(jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken()); HttpRequest request = builder.build(); CompletableFuture> response = httpClient diff --git a/src/main/java/org/jboss/pnc/repositorydriver/TrackingReportProcessor.java b/src/main/java/org/jboss/pnc/repositorydriver/TrackingReportProcessor.java index f1209f3..24dfc5b 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/TrackingReportProcessor.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/TrackingReportProcessor.java @@ -6,7 +6,7 @@ import com.github.packageurl.MalformedPackageURLException; import com.github.packageurl.PackageURL; import com.github.packageurl.PackageURLBuilder; - +import jakarta.annotation.PostConstruct; import org.apache.commons.lang.StringUtils; import org.commonjava.atlas.maven.ident.ref.ArtifactRef; import org.commonjava.atlas.maven.ident.ref.SimpleArtifactRef; @@ -33,11 +33,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; import java.io.File; import java.net.MalformedURLException; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterArchive.java b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterArchive.java index 50bb2f2..15d2239 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterArchive.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterArchive.java @@ -17,13 +17,13 @@ */ package org.jboss.pnc.repositorydriver.artifactfilter; +import jakarta.annotation.PostConstruct; import org.commonjava.indy.folo.dto.TrackedContentEntryDTO; import org.commonjava.indy.model.core.StoreKey; import org.jboss.pnc.repositorydriver.Configuration; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.Collections; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterDatabase.java b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterDatabase.java index 48e0539..239cc67 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterDatabase.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterDatabase.java @@ -17,13 +17,13 @@ */ package org.jboss.pnc.repositorydriver.artifactfilter; +import jakarta.annotation.PostConstruct; import org.commonjava.indy.folo.dto.TrackedContentEntryDTO; import org.commonjava.indy.model.core.StoreKey; import org.jboss.pnc.repositorydriver.Configuration; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import static org.commonjava.indy.model.core.GenericPackageTypeDescriptor.GENERIC_PKG_KEY; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterPromotion.java b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterPromotion.java index ec9f08c..4fb0234 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterPromotion.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterPromotion.java @@ -17,13 +17,13 @@ */ package org.jboss.pnc.repositorydriver.artifactfilter; +import jakarta.annotation.PostConstruct; import org.commonjava.indy.folo.dto.TrackedContentEntryDTO; import org.commonjava.indy.model.core.StoreKey; import org.jboss.pnc.repositorydriver.Configuration; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import static org.commonjava.indy.model.core.GenericPackageTypeDescriptor.GENERIC_PKG_KEY; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/endpoints/Public.java b/src/main/java/org/jboss/pnc/repositorydriver/endpoints/Public.java index ed0610a..166a90e 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/endpoints/Public.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/endpoints/Public.java @@ -18,17 +18,17 @@ package org.jboss.pnc.repositorydriver.endpoints; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.pnc.api.dto.ComponentVersion; import org.jboss.pnc.api.repositorydriver.dto.ArchiveRequest; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/endpoints/ServiceHealth.java b/src/main/java/org/jboss/pnc/repositorydriver/endpoints/ServiceHealth.java index d15fd3d..8206e58 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/endpoints/ServiceHealth.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/endpoints/ServiceHealth.java @@ -1,6 +1,6 @@ package org.jboss.pnc.repositorydriver.endpoints; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/indy/IndyPNCOAuthBearerAuthenticator.java b/src/main/java/org/jboss/pnc/repositorydriver/indy/IndyPNCOAuthBearerAuthenticator.java index f71a66c..f963772 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/indy/IndyPNCOAuthBearerAuthenticator.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/indy/IndyPNCOAuthBearerAuthenticator.java @@ -8,8 +8,8 @@ import org.commonjava.indy.client.core.auth.IndyClientAuthenticator; import org.commonjava.util.jhttpc.JHttpCException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class IndyPNCOAuthBearerAuthenticator extends IndyClientAuthenticator { diff --git a/src/main/java/org/jboss/pnc/repositorydriver/runtime/ApplicationLifecycle.java b/src/main/java/org/jboss/pnc/repositorydriver/runtime/ApplicationLifecycle.java index 63cea96..dc6e233 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/runtime/ApplicationLifecycle.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/runtime/ApplicationLifecycle.java @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/runtime/BifrostLogUploaderProducer.java b/src/main/java/org/jboss/pnc/repositorydriver/runtime/BifrostLogUploaderProducer.java index 45e2661..d4440ad 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/runtime/BifrostLogUploaderProducer.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/runtime/BifrostLogUploaderProducer.java @@ -21,10 +21,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.pnc.bifrost.upload.BifrostLogUploader; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import java.net.URI; @ApplicationScoped diff --git a/src/main/java/org/jboss/pnc/repositorydriver/runtime/DefaultExceptionMapper.java b/src/main/java/org/jboss/pnc/repositorydriver/runtime/DefaultExceptionMapper.java index d5120b8..00c1155 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/runtime/DefaultExceptionMapper.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/runtime/DefaultExceptionMapper.java @@ -20,15 +20,14 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.pnc.api.dto.ErrorResponse; -import org.jboss.resteasy.spi.Failure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,13 +54,6 @@ public Response toResponse(Throwable e) { return response; // In case of 404 we want to return the empty body. } logger.debug("A WebApplicationExceptio occurred when processing REST response", e); - } else if (e instanceof Failure) { // Resteasy support - Failure failure = ((Failure) e); - if (failure.getErrorCode() > 0) { - status = failure.getErrorCode(); - } - response = failure.getResponse(); - logger.debug("A Failure occurred when processing REST response", e); } else { logger.error("An exception occurred when processing REST response", e); } diff --git a/src/main/java/org/jboss/pnc/repositorydriver/runtime/LoggingFilter.java b/src/main/java/org/jboss/pnc/repositorydriver/runtime/LoggingFilter.java index c19ff7e..d839906 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/runtime/LoggingFilter.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/runtime/LoggingFilter.java @@ -27,14 +27,14 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/jboss/pnc/repositorydriver/runtime/StoppingExceptionMapper.java b/src/main/java/org/jboss/pnc/repositorydriver/runtime/StoppingExceptionMapper.java index b613f92..7e5d2ad 100644 --- a/src/main/java/org/jboss/pnc/repositorydriver/runtime/StoppingExceptionMapper.java +++ b/src/main/java/org/jboss/pnc/repositorydriver/runtime/StoppingExceptionMapper.java @@ -17,9 +17,9 @@ */ package org.jboss.pnc.repositorydriver.runtime; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.pnc.repositorydriver.StoppingException; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/BeanFactoryMock.java b/src/test/java/org/jboss/pnc/repositorydriver/BeanFactoryMock.java index 4f71d1a..1d6e9ec 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/BeanFactoryMock.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/BeanFactoryMock.java @@ -1,6 +1,6 @@ package org.jboss.pnc.repositorydriver; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import io.quarkus.test.Mock; import org.commonjava.indy.client.core.Indy; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/DriverTest.java b/src/test/java/org/jboss/pnc/repositorydriver/DriverTest.java index 31c98e5..6714f04 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/DriverTest.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/DriverTest.java @@ -8,9 +8,9 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/MockOidcClient.java b/src/test/java/org/jboss/pnc/repositorydriver/MockOidcClient.java index a242ad1..734706a 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/MockOidcClient.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/MockOidcClient.java @@ -16,16 +16,24 @@ public class MockOidcClient implements OidcClient { @Override public Uni getTokens(Map additionalGrantParameters) { return Uni.createFrom() - .item(new Tokens("accessToken", 1L, Duration.of(5, ChronoUnit.MINUTES), "refreshToken", 1L, null)); + .item( + new Tokens( + "accessToken", + 1L, + Duration.of(5, ChronoUnit.MINUTES), + "refreshToken", + 1L, + null, + "client-id")); } @Override - public Uni refreshTokens(String refreshToken) { + public Uni refreshTokens(String refreshToken, Map something) { return null; } @Override - public Uni revokeAccessToken(String accessToken) { + public Uni revokeAccessToken(String accessToken, Map something) { return null; } diff --git a/src/test/java/org/jboss/pnc/repositorydriver/TrackingReportProcessorTest.java b/src/test/java/org/jboss/pnc/repositorydriver/TrackingReportProcessorTest.java index a8f53cf..3b74cac 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/TrackingReportProcessorTest.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/TrackingReportProcessorTest.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.junit.QuarkusTest; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/WithSidecarTest.java b/src/test/java/org/jboss/pnc/repositorydriver/WithSidecarTest.java index 6fe9229..19ec4fd 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/WithSidecarTest.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/WithSidecarTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; import static io.restassured.RestAssured.given; import static org.jboss.pnc.repositorydriver.DriverTest.requestHeaders; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/CallbackHandler.java b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/CallbackHandler.java index 7ceb0f5..ceab5f7 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/CallbackHandler.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/CallbackHandler.java @@ -23,9 +23,9 @@ import java.util.Collections; import java.util.function.Consumer; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.pnc.api.dto.Request; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/HttpServer.java b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/HttpServer.java index 4747ccd..19012d9 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/HttpServer.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/HttpServer.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.Servlet; -import javax.servlet.ServletException; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; import io.undertow.Undertow; import io.undertow.server.HttpHandler; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/ServletInstanceFactory.java b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/ServletInstanceFactory.java index 546e33f..0cfcce4 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/ServletInstanceFactory.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/invokerserver/ServletInstanceFactory.java @@ -18,7 +18,7 @@ package org.jboss.pnc.repositorydriver.invokerserver; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import io.undertow.servlet.api.InstanceFactory; import io.undertow.servlet.api.InstanceHandle; diff --git a/src/test/java/org/jboss/pnc/repositorydriver/runtime/TokensProducerMock.java b/src/test/java/org/jboss/pnc/repositorydriver/runtime/TokensProducerMock.java index 62d7f11..baaaf77 100644 --- a/src/test/java/org/jboss/pnc/repositorydriver/runtime/TokensProducerMock.java +++ b/src/test/java/org/jboss/pnc/repositorydriver/runtime/TokensProducerMock.java @@ -1,8 +1,8 @@ package org.jboss.pnc.repositorydriver.runtime; import java.time.Duration; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; import io.quarkus.oidc.client.Tokens; import io.quarkus.test.Mock; @@ -16,7 +16,14 @@ public class TokensProducerMock { @Produces @RequestScoped public Tokens produceTokens() { - Tokens tokens = new Tokens("theToken", Long.MAX_VALUE, Duration.ofDays(1), "refreshToken", null, null); + Tokens tokens = new Tokens( + "theToken", + Long.MAX_VALUE, + Duration.ofDays(1), + "refreshToken", + null, + null, + "client-id"); return tokens; }