diff --git a/core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java b/core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java index 806a9ed..0b6b791 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java +++ b/core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java @@ -16,11 +16,10 @@ package com.abavilla.fpi.fw; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; - import io.quarkus.logging.Log; import io.quarkus.runtime.StartupEvent; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; /** * FPI Application starting point diff --git a/core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java b/core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java index a1a968e..bb94978 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java +++ b/core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java @@ -16,12 +16,11 @@ package com.abavilla.fpi.fw.config; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.enterprise.context.ApplicationScoped; /** * {@inheritDoc} diff --git a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java index 7e4a686..a3f8220 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java +++ b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java @@ -16,19 +16,18 @@ package com.abavilla.fpi.fw.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.abavilla.fpi.fw.dto.IDto; import com.abavilla.fpi.fw.dto.impl.RespDto; import com.abavilla.fpi.fw.entity.AbsItem; import com.abavilla.fpi.fw.exceptions.FPISvcEx; import com.abavilla.fpi.fw.service.AbsSvc; import com.abavilla.fpi.fw.util.DateUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; /** diff --git a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java index e42874c..6c630c4 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java +++ b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java @@ -18,21 +18,20 @@ import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - import com.abavilla.fpi.fw.dto.IDto; import com.abavilla.fpi.fw.dto.impl.PageDto; import com.abavilla.fpi.fw.entity.AbsItem; import com.abavilla.fpi.fw.service.AbsSvc; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; /** * REST API resource that's only capable or READ operations. diff --git a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java index 6bc3c74..f67e3be 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java +++ b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java @@ -16,21 +16,20 @@ package com.abavilla.fpi.fw.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.PATCH; -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 com.abavilla.fpi.fw.dto.IDto; import com.abavilla.fpi.fw.entity.AbsItem; import com.abavilla.fpi.fw.service.AbsSvc; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.PATCH; +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; /** * REST API resource with built-in CRUD operations. diff --git a/core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java index e5f85b9..b5fad35 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java +++ b/core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java @@ -16,10 +16,9 @@ package com.abavilla.fpi.fw.controller; -import javax.ws.rs.PathParam; - import com.abavilla.fpi.fw.dto.IDto; import io.smallrye.mutiny.Uni; +import jakarta.ws.rs.PathParam; /** * REST API resource capable of both reading and writing. diff --git a/core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java b/core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java index 38023b2..364a083 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java +++ b/core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java @@ -18,11 +18,10 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.abavilla.fpi.fw.service.IProviderSvc; import io.quarkus.arc.All; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Abstract Engine diff --git a/core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java index c35da2d..01c6a69 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java +++ b/core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java @@ -19,15 +19,12 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; - import com.abavilla.fpi.fw.exceptions.ApiSvcEx; import com.abavilla.fpi.fw.exceptions.AuthApiSvcEx; import com.abavilla.fpi.fw.util.FWConst; import com.fasterxml.jackson.databind.JsonNode; -import io.quarkus.arc.Priority; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; @@ -39,7 +36,6 @@ * * @author Vince Villamora */ -@Priority(Priorities.USER) public class ApiRepoExHandler implements ResponseExceptionMapper { diff --git a/core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java b/core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java index b8a2fdd..2868209 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java +++ b/core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java @@ -18,12 +18,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.abavilla.fpi.fw.entity.AbsItem; import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery; import io.quarkus.panache.common.Sort; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; import org.bson.types.ObjectId; @ApplicationScoped diff --git a/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java b/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java index 2015be1..6ba4865 100644 --- a/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java +++ b/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java @@ -16,8 +16,8 @@ package com.abavilla.fpi.fw.rest; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public abstract class AbsApiSecSvc