From 6393b030314e729821eae20b490ad99ceff89e30 Mon Sep 17 00:00:00 2001 From: Wenjie Guo Date: Wed, 10 Jan 2024 10:36:18 +0800 Subject: [PATCH] Upgrade service parent to version 5-SNAPSHOT --- pom.xml | 11 +++---- .../indy/service/httprox/HttpProxy.java | 6 ++-- .../service/httprox/client/Classifier.java | 5 ++- .../content/ContentRetrievalService.java | 6 ++-- .../client/repository/RepositoryService.java | 4 +-- .../httprox/config/KeycloakConfig.java | 2 +- .../httprox/config/ProxyConfiguration.java | 2 +- .../httprox/config/ProxyWeftConfig.java | 4 +-- .../httprox/config/ServiceProxyConfig.java | 4 +-- .../httprox/handler/ProxyAcceptHandler.java | 11 ++++--- .../httprox/handler/ProxyMITMSSLServer.java | 4 +-- .../httprox/handler/ProxyResponseWriter.java | 5 +-- .../handler/ProxyTransfersExecutor.java | 31 ++++++++----------- .../handler/TransferStreamingOutput.java | 4 +-- .../keycloak/KeycloakProxyAuthenticator.java | 4 +-- .../service/httprox/stats/StatsHandler.java | 12 +++---- .../service/httprox/stats/Versioning.java | 4 +-- .../httprox/stats/VersioningProvider.java | 6 ++-- .../service/httprox/util/CacheProducer.java | 4 +-- .../util/CustomClientRequestFilter.java | 14 ++++----- .../service/httprox/util/OtelAdapter.java | 2 +- .../httprox/util/ProxyResponseHelper.java | 4 +-- .../httprox/util/WebClientAdapter.java | 2 +- .../service/httprox/HttpProxyTest.java | 4 +-- .../httprox/client/RepositoryServiceTest.java | 4 +-- .../client/mock/DTOStreamingOutput.java | 4 +-- .../mock/MockableRepositoryService.java | 8 ++--- 27 files changed, 83 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index 390002e..b67a05d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.commonjava service-parent - 2 + 5-SNAPSHOT 4.0.0 org.commonjava.indy.service @@ -41,11 +41,10 @@ 4.4.9 4.5.13 1.5-SNAPSHOT - 2.3.0.Final 1.22 22.0.3 uber-jar - 12.1.11.Final + 14.0.21.Final @@ -172,12 +171,12 @@ org.infinispan - infinispan-core + infinispan-core-jakarta ${infinispanVersion} org.infinispan - infinispan-commons + infinispan-commons-jakarta ${infinispanVersion} @@ -196,7 +195,7 @@ - io.quarkus + io.quarkus.platform quarkus-maven-plugin diff --git a/src/main/java/org/commonjava/indy/service/httprox/HttpProxy.java b/src/main/java/org/commonjava/indy/service/httprox/HttpProxy.java index 912ead4..58ee2e1 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/HttpProxy.java +++ b/src/main/java/org/commonjava/indy/service/httprox/HttpProxy.java @@ -26,9 +26,9 @@ import org.xnio.*; import org.xnio.channels.AcceptingChannel; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/src/main/java/org/commonjava/indy/service/httprox/client/Classifier.java b/src/main/java/org/commonjava/indy/service/httprox/client/Classifier.java index 5cc53af..81a3630 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/client/Classifier.java +++ b/src/main/java/org/commonjava/indy/service/httprox/client/Classifier.java @@ -26,9 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import javax.management.ServiceNotFoundException; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/commonjava/indy/service/httprox/client/content/ContentRetrievalService.java b/src/main/java/org/commonjava/indy/service/httprox/client/content/ContentRetrievalService.java index 6c974d8..b37bf74 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/client/content/ContentRetrievalService.java +++ b/src/main/java/org/commonjava/indy/service/httprox/client/content/ContentRetrievalService.java @@ -24,10 +24,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.commonjava.indy.service.httprox.util.ProxyUtils.normalizePathAnd; @ApplicationScoped diff --git a/src/main/java/org/commonjava/indy/service/httprox/client/repository/RepositoryService.java b/src/main/java/org/commonjava/indy/service/httprox/client/repository/RepositoryService.java index af626a4..8df1649 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/client/repository/RepositoryService.java +++ b/src/main/java/org/commonjava/indy/service/httprox/client/repository/RepositoryService.java @@ -19,8 +19,8 @@ import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; @Path("/api/admin/stores") @RegisterRestClient(configKey="repo-service-api") diff --git a/src/main/java/org/commonjava/indy/service/httprox/config/KeycloakConfig.java b/src/main/java/org/commonjava/indy/service/httprox/config/KeycloakConfig.java index 2f40f63..8367fd5 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/config/KeycloakConfig.java +++ b/src/main/java/org/commonjava/indy/service/httprox/config/KeycloakConfig.java @@ -18,7 +18,7 @@ import io.quarkus.runtime.Startup; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Properties; @Startup diff --git a/src/main/java/org/commonjava/indy/service/httprox/config/ProxyConfiguration.java b/src/main/java/org/commonjava/indy/service/httprox/config/ProxyConfiguration.java index fadf655..88dfec2 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/config/ProxyConfiguration.java +++ b/src/main/java/org/commonjava/indy/service/httprox/config/ProxyConfiguration.java @@ -20,7 +20,7 @@ import org.commonjava.indy.service.httprox.model.TrackingType; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Optional; @Startup diff --git a/src/main/java/org/commonjava/indy/service/httprox/config/ProxyWeftConfig.java b/src/main/java/org/commonjava/indy/service/httprox/config/ProxyWeftConfig.java index 9d3deb8..26e5030 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/config/ProxyWeftConfig.java +++ b/src/main/java/org/commonjava/indy/service/httprox/config/ProxyWeftConfig.java @@ -18,8 +18,8 @@ import org.commonjava.cdi.util.weft.config.DefaultWeftConfig; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; public class ProxyWeftConfig { diff --git a/src/main/java/org/commonjava/indy/service/httprox/config/ServiceProxyConfig.java b/src/main/java/org/commonjava/indy/service/httprox/config/ServiceProxyConfig.java index cd2474f..390f4e6 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/config/ServiceProxyConfig.java +++ b/src/main/java/org/commonjava/indy/service/httprox/config/ServiceProxyConfig.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyAcceptHandler.java b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyAcceptHandler.java index 384c699..32a878b 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyAcceptHandler.java +++ b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyAcceptHandler.java @@ -24,6 +24,7 @@ import org.commonjava.indy.service.httprox.util.CacheProducer; import org.commonjava.indy.service.httprox.util.OtelAdapter; import org.commonjava.indy.service.httprox.util.RepoCreator; +import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +34,9 @@ import org.xnio.conduits.ConduitStreamSinkChannel; import org.xnio.conduits.ConduitStreamSourceChannel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.IOException; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_GENERIC_HTTP; @@ -60,7 +61,7 @@ public class ProxyAcceptHandler implements ChannelListener channel) { ProxyRepositoryCreator repoCreator = new RepoCreator( config ); final ProxyResponseWriter writer = - new ProxyResponseWriter( config, repoCreator, accepted, repositoryService, contentRetrievalService, proxyExecutor.getExecutor(), proxyAuthenticator, objectMapper, cacheProducer, start, otel ); + new ProxyResponseWriter( config, repoCreator, accepted, repositoryService, contentRetrievalService, proxyExecutor, proxyAuthenticator, objectMapper, cacheProducer, start, otel ); logger.debug("Setting writer: {}", writer); sink.getWriteSetter().set(writer); diff --git a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyMITMSSLServer.java b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyMITMSSLServer.java index 615fb73..f6bf1ad 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyMITMSSLServer.java +++ b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyMITMSSLServer.java @@ -39,8 +39,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import static javax.ws.rs.HttpMethod.GET; -import static javax.ws.rs.HttpMethod.HEAD; +import static jakarta.ws.rs.HttpMethod.GET; +import static jakarta.ws.rs.HttpMethod.HEAD; import static org.commonjava.indy.service.httprox.util.CertUtils.*; import static org.commonjava.indy.service.httprox.util.HttpProxyConstants.GET_METHOD; import static org.commonjava.indy.service.httprox.util.PortFinder.findOpenPort; diff --git a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyResponseWriter.java b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyResponseWriter.java index fe9e1c1..59dd4c4 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyResponseWriter.java +++ b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyResponseWriter.java @@ -28,6 +28,7 @@ import org.commonjava.indy.service.httprox.model.TrackingKey; import org.commonjava.indy.service.httprox.model.TrackingType; import org.commonjava.indy.service.httprox.util.*; +import org.eclipse.microprofile.context.ManagedExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xnio.ChannelListener; @@ -68,7 +69,7 @@ public final class ProxyResponseWriter private boolean directed = false; private ProxyRequestReader proxyRequestReader; - private final WeftExecutorService tunnelAndMITMExecutor; + private final ManagedExecutor tunnelAndMITMExecutor; private KeycloakProxyAuthenticator proxyAuthenticator; @@ -82,7 +83,7 @@ public final class ProxyResponseWriter public ProxyResponseWriter(final ProxyConfiguration config, final ProxyRepositoryCreator repoCreator, final StreamConnection accepted, final RepositoryService repositoryService, - final ContentRetrievalService contentRetrievalService, final WeftExecutorService executor, + final ContentRetrievalService contentRetrievalService, final ManagedExecutor executor, final KeycloakProxyAuthenticator proxyAuthenticator, final IndyObjectMapper indyObjectMapper, final CacheProducer cacheProducer, final long start, final OtelAdapter otel) { diff --git a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyTransfersExecutor.java b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyTransfersExecutor.java index 0d0944c..4237ecf 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyTransfersExecutor.java +++ b/src/main/java/org/commonjava/indy/service/httprox/handler/ProxyTransfersExecutor.java @@ -15,34 +15,29 @@ */ package org.commonjava.indy.service.httprox.handler; +import jakarta.inject.Named; +import jakarta.ws.rs.Produces; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.WeftExecutorService; import org.commonjava.cdi.util.weft.WeftManaged; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import org.eclipse.microprofile.context.ManagedExecutor; import static org.commonjava.cdi.util.weft.ExecutorConfig.BooleanLiteral.FALSE; -@ApplicationScoped -public class ProxyTransfersExecutor { - - @Inject - @WeftManaged - @ExecutorConfig( named = "mitm-transfers", threads = 0, priority = 5, loadSensitive = FALSE ) - WeftExecutorService executor; - protected ProxyTransfersExecutor() - { - } +public class ProxyTransfersExecutor { - public ProxyTransfersExecutor(WeftExecutorService exec) + @Named("mitm-transfers") + @ApplicationScoped + @Produces + public ManagedExecutor getExecutor() { - this.executor = exec; - } - public WeftExecutorService getExecutor() - { - return executor; + return ManagedExecutor.builder().maxAsync(100) + .maxQueued(200) + .build(); } } diff --git a/src/main/java/org/commonjava/indy/service/httprox/handler/TransferStreamingOutput.java b/src/main/java/org/commonjava/indy/service/httprox/handler/TransferStreamingOutput.java index 561f6bd..84a8543 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/handler/TransferStreamingOutput.java +++ b/src/main/java/org/commonjava/indy/service/httprox/handler/TransferStreamingOutput.java @@ -20,8 +20,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.StreamingOutput; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/org/commonjava/indy/service/httprox/keycloak/KeycloakProxyAuthenticator.java b/src/main/java/org/commonjava/indy/service/httprox/keycloak/KeycloakProxyAuthenticator.java index d429393..83844bf 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/keycloak/KeycloakProxyAuthenticator.java +++ b/src/main/java/org/commonjava/indy/service/httprox/keycloak/KeycloakProxyAuthenticator.java @@ -32,8 +32,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/org/commonjava/indy/service/httprox/stats/StatsHandler.java b/src/main/java/org/commonjava/indy/service/httprox/stats/StatsHandler.java index 465d088..d24f16d 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/stats/StatsHandler.java +++ b/src/main/java/org/commonjava/indy/service/httprox/stats/StatsHandler.java @@ -15,13 +15,13 @@ */ package org.commonjava.indy.service.httprox.stats; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path( "/api/stats" ) public class StatsHandler diff --git a/src/main/java/org/commonjava/indy/service/httprox/stats/Versioning.java b/src/main/java/org/commonjava/indy/service/httprox/stats/Versioning.java index 4934f77..faf2dee 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/stats/Versioning.java +++ b/src/main/java/org/commonjava/indy/service/httprox/stats/Versioning.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.enterprise.inject.Alternative; -import javax.inject.Named; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Named; @Alternative @Named diff --git a/src/main/java/org/commonjava/indy/service/httprox/stats/VersioningProvider.java b/src/main/java/org/commonjava/indy/service/httprox/stats/VersioningProvider.java index 66d643b..390cf1e 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/stats/VersioningProvider.java +++ b/src/main/java/org/commonjava/indy/service/httprox/stats/VersioningProvider.java @@ -18,9 +18,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import java.io.IOException; import java.io.InputStream; import java.util.Properties; diff --git a/src/main/java/org/commonjava/indy/service/httprox/util/CacheProducer.java b/src/main/java/org/commonjava/indy/service/httprox/util/CacheProducer.java index dc0378c..9774053 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/util/CacheProducer.java +++ b/src/main/java/org/commonjava/indy/service/httprox/util/CacheProducer.java @@ -20,8 +20,8 @@ import org.infinispan.manager.DefaultCacheManager; import org.infinispan.manager.EmbeddedCacheManager; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/commonjava/indy/service/httprox/util/CustomClientRequestFilter.java b/src/main/java/org/commonjava/indy/service/httprox/util/CustomClientRequestFilter.java index 39fa9cf..7b79386 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/util/CustomClientRequestFilter.java +++ b/src/main/java/org/commonjava/indy/service/httprox/util/CustomClientRequestFilter.java @@ -18,13 +18,13 @@ import io.quarkus.oidc.client.OidcClient; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.ext.Provider; @Provider @Priority(Priorities.AUTHENTICATION) diff --git a/src/main/java/org/commonjava/indy/service/httprox/util/OtelAdapter.java b/src/main/java/org/commonjava/indy/service/httprox/util/OtelAdapter.java index 157f05c..d1910b0 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/util/OtelAdapter.java +++ b/src/main/java/org/commonjava/indy/service/httprox/util/OtelAdapter.java @@ -23,7 +23,7 @@ import okhttp3.Request; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class OtelAdapter diff --git a/src/main/java/org/commonjava/indy/service/httprox/util/ProxyResponseHelper.java b/src/main/java/org/commonjava/indy/service/httprox/util/ProxyResponseHelper.java index 23384aa..68dc6f7 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/util/ProxyResponseHelper.java +++ b/src/main/java/org/commonjava/indy/service/httprox/util/ProxyResponseHelper.java @@ -37,8 +37,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/src/main/java/org/commonjava/indy/service/httprox/util/WebClientAdapter.java b/src/main/java/org/commonjava/indy/service/httprox/util/WebClientAdapter.java index d34ee96..7decffb 100644 --- a/src/main/java/org/commonjava/indy/service/httprox/util/WebClientAdapter.java +++ b/src/main/java/org/commonjava/indy/service/httprox/util/WebClientAdapter.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import static javax.ws.rs.core.HttpHeaders.HOST; +import static jakarta.ws.rs.core.HttpHeaders.HOST; public class WebClientAdapter { diff --git a/src/test/java/org/commonjava/service/httprox/HttpProxyTest.java b/src/test/java/org/commonjava/service/httprox/HttpProxyTest.java index 7ae8c2a..d066387 100644 --- a/src/test/java/org/commonjava/service/httprox/HttpProxyTest.java +++ b/src/test/java/org/commonjava/service/httprox/HttpProxyTest.java @@ -34,8 +34,8 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/org/commonjava/service/httprox/client/RepositoryServiceTest.java b/src/test/java/org/commonjava/service/httprox/client/RepositoryServiceTest.java index 2c2e36a..9c68952 100644 --- a/src/test/java/org/commonjava/service/httprox/client/RepositoryServiceTest.java +++ b/src/test/java/org/commonjava/service/httprox/client/RepositoryServiceTest.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; @QuarkusTest public class RepositoryServiceTest diff --git a/src/test/java/org/commonjava/service/httprox/client/mock/DTOStreamingOutput.java b/src/test/java/org/commonjava/service/httprox/client/mock/DTOStreamingOutput.java index 0e0413c..678c78c 100644 --- a/src/test/java/org/commonjava/service/httprox/client/mock/DTOStreamingOutput.java +++ b/src/test/java/org/commonjava/service/httprox/client/mock/DTOStreamingOutput.java @@ -21,8 +21,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.StreamingOutput; import java.io.IOException; import java.io.OutputStream; diff --git a/src/test/java/org/commonjava/service/httprox/client/mock/MockableRepositoryService.java b/src/test/java/org/commonjava/service/httprox/client/mock/MockableRepositoryService.java index e79fbfa..f68d841 100644 --- a/src/test/java/org/commonjava/service/httprox/client/mock/MockableRepositoryService.java +++ b/src/test/java/org/commonjava/service/httprox/client/mock/MockableRepositoryService.java @@ -28,10 +28,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.ArrayList;